From c3f56e912a29dbfa965eb4061dc22045c3abbd5a Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sat, 25 Jun 2016 21:36:44 +0200
Subject: [PATCH 001/899] Add nixpkgs documentation about how to create a
 derivation with Vim + plugins

---
 doc/default.nix                     |   4 ++
 doc/languages-frameworks/index.xml  |   1 +
 doc/languages-frameworks/vim.md     | 102 ++++++++++++++++++++++++++++
 pkgs/misc/vim-plugins/vim-utils.nix |   2 +
 4 files changed, 109 insertions(+)
 create mode 100644 doc/languages-frameworks/vim.md

diff --git a/doc/default.nix b/doc/default.nix
index 6a44587a31b..791ed28369a 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -64,6 +64,10 @@ stdenv.mkDerivation {
       inputFile = ./../pkgs/development/r-modules/README.md;
       outputFile = "languages-frameworks/r.xml";
     }
+  + toDocbook {
+      inputFile = ./languages-frameworks/vim.md;
+      outputFile = "./languages-frameworks/vim.xml";
+    }
   + ''
     echo ${nixpkgsVersion} > .version
 
diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml
index 8076c33f1b3..850da51e820 100644
--- a/doc/languages-frameworks/index.xml
+++ b/doc/languages-frameworks/index.xml
@@ -27,6 +27,7 @@ such as Perl or Haskell.  These are described in this chapter.</para>
 <xi:include href="r.xml" /> <!-- generated from ../../pkgs/development/r-modules/README.md  -->
 <xi:include href="ruby.xml" />
 <xi:include href="texlive.xml" />
+<xi:include href="vim.xml" />
 
 
 </chapter>
diff --git a/doc/languages-frameworks/vim.md b/doc/languages-frameworks/vim.md
new file mode 100644
index 00000000000..d0bcf92a54f
--- /dev/null
+++ b/doc/languages-frameworks/vim.md
@@ -0,0 +1,102 @@
+---
+title: User's Guide for Vim in Nixpkgs
+author: Peter Simons
+date: 2016-06-25
+---
+# User's Guide to Vim Plugins/Addons/Bundles/Scripts in Nixpkgs
+
+You'll get a vim(-your-suffix) in PATH also loading the plugins you want.
+Loading can be deferred, see example
+
+VAM (=vim-addon-manager) and Pathogen plugin managers are supported.
+Vundle,NeoBundle could be your turn.
+
+## dependencies by Vim plugins
+
+VAM introduced .json files supporting dependencies without versioning
+assuming that "using latest version" is ok most of the time.
+
+## HOWTO
+
+First create a vim-scripts file having one plugin name per line. Example:
+
+    "tlib"
+    {'name': 'vim-addon-sql'}
+    {'filetype_regex': '\%(vim)$', 'names': ['reload', 'vim-dev-plugin']}
+
+Such vim-scripts file can be read by VAM as well like this:
+
+    call vam#Scripts(expand('~/.vim-scripts'), {})
+
+Create a default.nix file:
+
+    { nixpkgs ? import <nixpkgs> {}, compiler ? "ghc7102" }:
+    nixpkgs.vim_configurable.customize { name = "vim"; vimrcConfig.vam.pluginDictionaries = [ "vim-addon-vim2nix" ]; }
+
+Create a generate.vim file:
+
+    ActivateAddons vim-addon-vim2nix
+    let vim_scripts = "vim-scripts"
+    call nix#ExportPluginsForNix({
+    \  'path_to_nixpkgs': eval('{"'.substitute(substitute(substitute($NIX_PATH, ':', ',', 'g'), '=',':', 'g'), '\([:,]\)', '"\1"',"g").'"}')["nixpkgs"],
+    \  'cache_file': '/tmp/vim2nix-cache',
+    \  'try_catch': 0,
+    \  'plugin_dictionaries': ["vim-addon-manager"]+map(readfile(vim_scripts), 'eval(v:val)')
+    \ })
+
+Then run
+
+    nix-shell -p vimUtils.vim_with_vim2nix --command "vim -c 'source generate.vim'"
+
+You should get a Vim buffer with the nix derivations (output1) and vam.pluginDictionaries (output2).
+You can add your vim to your system's configuration file like this and start it by "vim-my":
+
+    my-vim =
+     let plugins = let inherit (vimUtils) buildVimPluginFrom2Nix; in {
+          copy paste output1 here
+     }; in vim_configurable.customize {
+       name = "vim-my";
+
+       vimrcConfig.vam.knownPlugins = plugins; # optional
+       vimrcConfig.vam.pluginDictionaries = [
+          copy paste output2 here
+       ];
+
+       # Pathogen would be
+       # vimrcConfig.pathogen.knownPlugins = plugins; # plugins
+       # vimrcConfig.pathogen.pluginNames = ["tlib"];
+     };
+
+
+Sample output1:
+
+    "reload" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+      name = "reload";
+      src = fetchgit {
+        url = "git://github.com/xolox/vim-reload";
+        rev = "0a601a668727f5b675cb1ddc19f6861f3f7ab9e1";
+        sha256 = "0vb832l9yxj919f5hfg6qj6bn9ni57gnjd3bj7zpq7d4iv2s4wdh";
+      };
+      dependencies = ["nim-misc"];
+
+    };
+    [...]
+
+Sample output2:
+
+    [
+      ''vim-addon-manager''
+      ''tlib''
+      { "name" = ''vim-addon-sql''; }
+      { "filetype_regex" = ''\%(vim)$$''; "names" = [ ''reload'' ''vim-dev-plugin'' ]; }
+    ]
+
+
+## Important repositories
+
+- [vim-pi](https://bitbucket.org/vimcommunity/vim-pi) is a plugin repository
+  from VAM plugin manager meant to be used by others as well used by
+
+- [vim2nix](http://github.com/MarcWeber/vim-addon-vim2nix) which generates the
+  .nix code
+
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index f39d7093c73..bc9a1fceb19 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -366,6 +366,8 @@ rec {
       '';
     }));
 
+  vim_with_vim2nix = vim_configurable.customize { name = "vim"; vimrcConfig.vam.pluginDictionaries = [ "vim-addon-vim2nix" ]; };
+
   buildVimPluginFrom2Nix = a: buildVimPlugin ({
     buildPhase = ":";
     configurePhase =":";

From dd58d24fa612df73264bb69f82517e1c2bc6999a Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Fri, 7 Oct 2016 15:55:16 +0200
Subject: [PATCH 002/899] stdenv: document makeWrapper

Add function documentation to `makeWrapper`.
Also add user documentation to the nixpkgs manual.
---
 doc/stdenv.xml                                | 44 +++++++++++++++++++
 .../build-support/setup-hooks/make-wrapper.sh | 20 +++++++++
 2 files changed, 64 insertions(+)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 2e88d6b4154..b05b7cd2b3b 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -1091,7 +1091,35 @@ functions.</para>
 
 <variablelist>
 
+
+  <varlistentry xml:id='fun-makeWrapper'>
+    <term><function>makeWrapper</function>
+    <replaceable>executable</replaceable>
+    <replaceable>wrapperfile</replaceable>
+    <replaceable>args</replaceable></term>
+    <listitem><para>Constructs a wrapper for a program with various
+    possible arguments. For example:
+
+<programlisting>
+# adds `FOOBAR=baz` to `$out/bin/foo`’s environment
+makeWrapper $out/bin/foo $wrapperfile --set FOOBAR baz
+
+# prefixes the binary paths of `hello` and `git`
+# Be advised that paths often should be patched in directly
+# (via string replacements or in `configurePhase`).
+makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello git ]}
+</programlisting>
+
+    There’s many more kinds of arguments, they are documented in
+    <literal>nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh</literal>.</para>
+
+    <para><literal>wrapProgram</literal> is a convenience function you probably
+    want to use most of the time.</para>
+
+    </listitem>
+  </varlistentry>
   
+
   <varlistentry xml:id='fun-substitute'>
     <term><function>substitute</function>
     <replaceable>infile</replaceable>
@@ -1250,6 +1278,22 @@ someVar=$(stripHash $name; echo $strippedName)
 
     </para></listitem>
   </varlistentry>
+  
+
+  <varlistentry xml:id='fun-wrapProgram'>
+    <term><function>wrapProgram</function>
+    <replaceable>executable</replaceable>
+    <replaceable>makeWrapperArgs</replaceable></term>
+    <listitem><para>Convenience function for <literal>makeWrapper</literal>
+    that automatically creates a sane wrapper file
+
+    It takes all the same arguments as <literal>makeWrapper</literal>,
+    except for <literal>--argv0</literal>.</para>
+
+    <para>It cannot be applied multiple times, since it will overwrite the wrapper
+    file.</para>
+    </listitem>
+  </varlistentry>
 
   
 </variablelist>
diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh
index d922db5ccf5..086875976d3 100644
--- a/pkgs/build-support/setup-hooks/make-wrapper.sh
+++ b/pkgs/build-support/setup-hooks/make-wrapper.sh
@@ -1,3 +1,23 @@
+# construct an executable file that wraps the actual executable
+# makeWrapper EXECUTABLE ARGS
+
+# ARGS:
+# --argv0 NAME      : set name of executed process to NAME
+#                     (otherwise it’s called …-wrapped)
+# --set   VAR VAL   : add VAR with value VAL to the executable’s environment
+# --unset VAR       : remove VAR from the environment
+# --run   COMMAND   : run command before the executable
+#                     The command can push extra flags to a magic list variable
+#                     extraFlagsArray, which are then added to the invocation
+#                     of the executable
+# --add-flags FLAGS : add FLAGS to invocation of executable
+
+# --prefix          ENV SEP VAL   : suffix/prefix ENV with VAL, separated by SEP
+# --suffix
+# --suffix-each     ENV SEP VALS  : like --suffix, but VALS is a list
+# --prefix-contents ENV SEP FILES : like --suffix-each, but contents of FILES
+#                                   are read first and used as VALS
+# --suffix-contents
 makeWrapper() {
     local original=$1
     local wrapper=$2

From 5ae18574fcea525861e721fb6cb510630a3ad1ec Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Fri, 7 Oct 2016 15:56:07 +0200
Subject: [PATCH 003/899] stdenv/makeWrapper: make extraFlagsArray local

extraFlagsArray should not be exposed outside of `makeWrapper`, it
should only be possible to set it inside a script supplied via the
`--run` argument.
---
 pkgs/build-support/setup-hooks/make-wrapper.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh
index 086875976d3..4f55493ae48 100644
--- a/pkgs/build-support/setup-hooks/make-wrapper.sh
+++ b/pkgs/build-support/setup-hooks/make-wrapper.sh
@@ -22,7 +22,7 @@ makeWrapper() {
     local original=$1
     local wrapper=$2
     local params varName value command separator n fileNames
-    local argv0 flagsBefore flags
+    local argv0 flagsBefore flags extraFlagsArray
 
     mkdir -p "$(dirname $wrapper)"
 

From 41b2a376a3af7bc2afe5342c462a760f7e223101 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 26 Oct 2016 14:51:52 +0800
Subject: [PATCH 004/899] colord-kde: 2016-02-24 -> 0.5.0

---
 pkgs/tools/misc/colord-kde/0.5.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/colord-kde/0.5.nix b/pkgs/tools/misc/colord-kde/0.5.nix
index 9df8ace38f6..0c8e9d6bcee 100644
--- a/pkgs/tools/misc/colord-kde/0.5.nix
+++ b/pkgs/tools/misc/colord-kde/0.5.nix
@@ -1,16 +1,17 @@
-{ stdenv, lib, fetchgit
+{ stdenv, lib, fetchurl
 , extra-cmake-modules, ki18n
 , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils
 , kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem
 , kitemviews, lcms2, libXrandr, qtx11extras
 }:
 
-stdenv.mkDerivation {
-  name = "colord-kde-0.5.0.20160224";
-  src = fetchgit {
-    url = "git://anongit.kde.org/colord-kde";
-    rev = "3729d1348c57902b74283bc8280ffb5561b221db";
-    sha256 = "03ww8nskgxl38dwkbb39by18gxvrcm6w2zg9s7q05i76rpl6kkkw";
+stdenv.mkDerivation rec {
+  name = "colord-kde-${version}";
+  version = "0.5.0";
+
+  src = fetchurl {
+    url = "http://download.kde.org/stable/colord-kde/${version}/src/${name}.tar.xz";
+    sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c";
   };
 
   nativeBuildInputs = [ extra-cmake-modules ki18n ];

From 6fb8e668d951b0e375376d58c4bea6c6c379f9b8 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Wed, 18 Jan 2017 19:49:23 +0100
Subject: [PATCH 005/899] shaarli-material: init at 0.8.2

---
 .../web-apps/shaarli/material-theme.nix       | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/servers/web-apps/shaarli/material-theme.nix

diff --git a/pkgs/servers/web-apps/shaarli/material-theme.nix b/pkgs/servers/web-apps/shaarli/material-theme.nix
new file mode 100644
index 00000000000..59d16ac0e0f
--- /dev/null
+++ b/pkgs/servers/web-apps/shaarli/material-theme.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "shaarli-material-${version}";
+  version = "0.8.2";
+
+  src = fetchFromGitHub {
+    owner = "kalvn";
+    repo = "Shaarli-Material";
+    rev = "v${version}";
+    sha256 = "1gam080iwr8vd6k6liv0zmpb3zyw37a53nj1s4ywb4d2i68hjncd";
+  };
+
+  patchPhase = ''
+    for f in material/*.html
+    do
+      substituteInPlace $f \
+        --replace '.min.css"' '.min.css#"' \
+        --replace '.min.js"'  '.min.js#"' \
+        --replace '.png"'     '.png#"'
+    done
+
+    substituteInPlace material/loginform.html \
+        --replace '"ban_canLogin()"' '"ban_canLogin($conf)"' # PHP 7.1 fix (https://github.com/shaarli/Shaarli/issues/711)
+  '';
+
+  installPhase = ''
+    mv material/ $out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A theme base on Google's Material Design for Shaarli, the superfast delicious clone";
+    license = licenses.mit;
+    homepage = https://github.com/kalvn/Shaarli-Material;
+    maintainers = with maintainers; [ schneefux ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ec04e8e85c2..1a24f5c2e79 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10747,6 +10747,8 @@ in
 
   shaarli = callPackage ../servers/web-apps/shaarli { };
 
+  shaarli-material = callPackage ../servers/web-apps/shaarli/material-theme.nix { };
+
   axis2 = callPackage ../servers/http/tomcat/axis2 { };
 
   unifi = callPackage ../servers/unifi { };

From 43753eafd2c161d0f0213c3b375c7162894bf7a0 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 20 Jan 2017 12:55:45 +0100
Subject: [PATCH 006/899] pythonPackages.matplotlib: 1.5.3 -> 2.0.0

---
 .../python-modules/matplotlib/default.nix     | 26 ++++++++++---------
 pkgs/top-level/python-packages.nix            |  2 --
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index 5ba813deba6..9f85cb06d97 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, python, buildPythonPackage, pycairo
 , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado
-, freetype, libpng, pkgconfig, mock, pytz, pygobject3
+, freetype, libpng, pkgconfig, mock, pytz, pygobject3, functools32, subprocess32
 , enableGhostscript ? false, ghostscript ? null, gtk3
 , enableGtk2 ? false, pygtk ? null, gobjectIntrospection
 , enableGtk3 ? false, cairo
 , enableTk ? false, tcl ? null, tk ? null, tkinter ? null, libX11 ? null
-, Cocoa, Foundation, CoreData, cf-private, libobjc, libcxx
+, enableQt ? false, pyqt4
+, libcxx
 }:
 
 assert enableGhostscript -> ghostscript != null;
@@ -15,14 +16,15 @@ assert enableTk -> (tcl != null)
                 && (tkinter != null)
                 && (libX11 != null)
                 ;
+assert enableQt -> pyqt4 != null;
 
 buildPythonPackage rec {
   name = "matplotlib-${version}";
-  version = "1.5.3";
+  version = "2.0.0";
 
   src = fetchurl {
     url = "mirror://pypi/m/matplotlib/${name}.tar.gz";
-    sha256 = "1g7bhr6v3wdxyx29rfxgf57l9w19s79cdlpyi0h4y0c5ywwxr9d0";
+    sha256 = "04zqymd5dw6lxvfbxf1sycdnibjk5qky5rfsn6wb46lwha2hkkrn";
   };
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
@@ -30,17 +32,17 @@ buildPythonPackage rec {
   XDG_RUNTIME_DIR = "/tmp";
 
   buildInputs = [ python which sphinx stdenv ]
-    ++ stdenv.lib.optional enableGhostscript ghostscript
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation CoreData
-                                              cf-private libobjc ];
+    ++ stdenv.lib.optional enableGhostscript ghostscript;
 
   propagatedBuildInputs =
-    [ cycler dateutil nose numpy pyparsing tornado freetype 
-      libpng pkgconfig mock pytz  
+    [ cycler dateutil nose numpy pyparsing tornado freetype
+      libpng pkgconfig mock pytz
     ]
     ++ stdenv.lib.optional enableGtk2 pygtk
     ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobjectIntrospection pygobject3 ]
-    ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ];
+    ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ]
+    ++ stdenv.lib.optionals enableQt [ pyqt4 ]
+    ++ stdenv.lib.optionals (builtins.hasAttr "isPy2" python) [ functools32 subprocess32 ];
 
   patches =
     [ ./basedirlist.patch ] ++
@@ -64,8 +66,8 @@ buildPythonPackage rec {
     ${python.interpreter} tests.py
   '';
 
-  # The entry point for running tests, tests.py, is not included in the release.
-  # https://github.com/matplotlib/matplotlib/issues/6017
+  # Test data is not included in the distribution (the `tests` folder
+  # is missing)
   doCheck = false;
 
   prePatch = ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 385e079284f..1db36e131d5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14340,8 +14340,6 @@ in {
   matplotlib = callPackage ../development/python-modules/matplotlib/default.nix {
     stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv;
     enableGhostscript = true;
-    inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa Foundation CoreData;
-    inherit (pkgs.darwin) cf-private libobjc;
   };
 
 

From 02341c20bcd78aab0e0beee2899e527874dc452e Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 16 Nov 2016 22:22:10 +0100
Subject: [PATCH 007/899] db: disable dbm support by default

---
 pkgs/development/libraries/db/clang-4.8.patch | 13 -------------
 pkgs/development/libraries/db/clang-5.3.patch | 13 -------------
 pkgs/development/libraries/db/clang-6.0.patch | 13 -------------
 pkgs/development/libraries/db/generic.nix     | 14 ++++++++------
 4 files changed, 8 insertions(+), 45 deletions(-)

diff --git a/pkgs/development/libraries/db/clang-4.8.patch b/pkgs/development/libraries/db/clang-4.8.patch
index bbb77891497..aa46b8500b5 100644
--- a/pkgs/development/libraries/db/clang-4.8.patch
+++ b/pkgs/development/libraries/db/clang-4.8.patch
@@ -38,19 +38,6 @@ index 0034dcc..160c8ea 100644
  #else
  #define atomic_inc(env, p)	__atomic_inc(env, p)
  #define atomic_dec(env, p)	__atomic_dec(env, p)
-diff --git a/dbinc/db.in b/dbinc/db.in
-index 9fc6712..7428e0a 100644
---- a/dbinc/db.in
-+++ b/dbinc/db.in
-@@ -2413,7 +2413,7 @@ typedef struct {
- #define	fetch(a)	__db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a)
- #define	firstkey	__db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@
- #define	nextkey(a)	__db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a)
--#define	store(a, b)	__db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b)
-+#define	store_db(a, b)	__db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b)
- 
- /*******************************************************
-  * Hsearch historic interface.
 diff --git a/mp/mp_fget.c b/mp/mp_fget.c
 index 5fdee5a..0b75f57 100644
 --- a/mp/mp_fget.c
diff --git a/pkgs/development/libraries/db/clang-5.3.patch b/pkgs/development/libraries/db/clang-5.3.patch
index 1cfb13ca8e6..caf19ffeb92 100644
--- a/pkgs/development/libraries/db/clang-5.3.patch
+++ b/pkgs/development/libraries/db/clang-5.3.patch
@@ -38,19 +38,6 @@ index 6a858f7..9f338dc 100644
  #else
  #define atomic_inc(env, p)	__atomic_inc(env, p)
  #define atomic_dec(env, p)	__atomic_dec(env, p)
-diff --git a/src/dbinc/db.in b/src/dbinc/db.in
-index 92ac822..f80428e 100644
---- a/src/dbinc/db.in
-+++ b/src/dbinc/db.in
-@@ -2782,7 +2782,7 @@ typedef struct {
- #define	fetch(a)	__db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a)
- #define	firstkey	__db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@
- #define	nextkey(a)	__db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a)
--#define	store(a, b)	__db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b)
-+#define	store_db(a, b)	__db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b)
- 
- /*******************************************************
-  * Hsearch historic interface.
 diff --git a/src/mp/mp_fget.c b/src/mp/mp_fget.c
 index 16de695..d0dcc29 100644
 --- a/src/mp/mp_fget.c
diff --git a/pkgs/development/libraries/db/clang-6.0.patch b/pkgs/development/libraries/db/clang-6.0.patch
index 5c1e8f506c4..a411e60dc39 100644
--- a/pkgs/development/libraries/db/clang-6.0.patch
+++ b/pkgs/development/libraries/db/clang-6.0.patch
@@ -20,19 +20,6 @@ index e4420aa..4799b5f 100644
  #else
  #define	atomic_inc(env, p)	__atomic_inc_int(env, p)
  #define	atomic_dec(env, p)	__atomic_dec_int(env, p)
-diff --git a/src/dbinc/db.in b/src/dbinc/db.in
-index 3c2ad9b..3e46f02 100644
---- a/src/dbinc/db.in
-+++ b/src/dbinc/db.in
-@@ -2999,7 +2999,7 @@ typedef struct {
- #define	fetch(a)	__db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a)
- #define	firstkey	__db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@
- #define	nextkey(a)	__db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a)
--#define	store(a, b)	__db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b)
-+#define	store_db(a, b)	__db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b)
- 
- /*******************************************************
-  * Hsearch historic interface.
 diff --git a/src/mp/mp_fget.c b/src/mp/mp_fget.c
 index 59fe9fe..fa4ced7 100644
 --- a/src/mp/mp_fget.c
diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix
index a6f9c676bba..c3204555901 100644
--- a/pkgs/development/libraries/db/generic.nix
+++ b/pkgs/development/libraries/db/generic.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl
 , cxxSupport ? true
 , compat185 ? true
+, dbmSupport ? false
 
 # Options from inherited versions
 , version, sha256
@@ -19,12 +20,13 @@ stdenv.mkDerivation (rec {
 
   patches = extraPatches;
 
-  configureFlags = [
-    (if cxxSupport then "--enable-cxx" else "--disable-cxx")
-    (if compat185 then "--enable-compat185" else "--disable-compat185")
-    "--enable-dbm"
-    (stdenv.lib.optionalString stdenv.isFreeBSD "--with-pic")
-  ];
+  configureFlags =
+    [
+      (if cxxSupport then "--enable-cxx" else "--disable-cxx")
+      (if compat185 then "--enable-compat185" else "--disable-compat185")
+    ]
+    ++ stdenv.lib.optional dbmSupport "--enable-dbm"
+    ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
 
   preConfigure = ''
     cd build_unix

From 516300624ee0df395c9a4d1f3f42abd71fe5ccd9 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 23 Jan 2017 17:49:39 -0600
Subject: [PATCH 008/899] emacs25Macport: use newer icons

---
 pkgs/applications/editors/emacs/macport-25.1.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/applications/editors/emacs/macport-25.1.nix b/pkgs/applications/editors/emacs/macport-25.1.nix
index 84d1950b865..9169c12417a 100644
--- a/pkgs/applications/editors/emacs/macport-25.1.nix
+++ b/pkgs/applications/editors/emacs/macport-25.1.nix
@@ -19,6 +19,11 @@ stdenv.mkDerivation rec {
     sha256 = "1zwxh7zsvwcg221mpjh0dhpdas3j9mc5q92pprf8yljl7clqvg62";
   };
 
+  hiresSrc = fetchurl {
+    url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/emacs-hires-icons-2.0.tar.gz";
+    sha256 = "1ari8n3y1d4hdl9npg3c3hk27x7cfkwfgyhgzn1vlqkrdah4z434";
+  };
+
   enableParallelBuilding = true;
 
   buildInputs = [ ncurses libxml2 gnutls pkgconfig texinfo gettext autoconf automake];
@@ -32,12 +37,18 @@ stdenv.mkDerivation rec {
     mv $sourceRoot $name
     tar xzf $macportSrc
     mv $name $sourceRoot
+
+    # extract retina image resources
+    tar xzfv $hiresSrc --strip 1 -C $sourceRoot
   '';
 
   postPatch = ''
     patch -p1 < patch-mac
     substituteInPlace lisp/international/mule-cmds.el \
       --replace /usr/share/locale ${gettext}/share/locale
+
+    # use newer emacs icon
+    cp nextstep/Cocoa/Emacs.base/Contents/Resources/Emacs.icns mac/Emacs.app/Contents/Resources/Emacs.icns
   '';
 
   configureFlags = [

From 7af2d3d6e2bf54e606c93887668fcc23d9355559 Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Tue, 24 Jan 2017 21:08:42 +1100
Subject: [PATCH 009/899] buildPythonPackage: send pip output to stderr

---
 .../interpreters/python/build-python-package-setuptools.nix     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/build-python-package-setuptools.nix b/pkgs/development/interpreters/python/build-python-package-setuptools.nix
index f077533ecfe..c6e21ff4fed 100644
--- a/pkgs/development/interpreters/python/build-python-package-setuptools.nix
+++ b/pkgs/development/interpreters/python/build-python-package-setuptools.nix
@@ -49,7 +49,7 @@ in attrs // {
       export PATH="$tmp_path/bin:$PATH"
       export PYTHONPATH="$tmp_path/${python.sitePackages}:$PYTHONPATH"
       mkdir -p $tmp_path/${python.sitePackages}
-      ${bootstrapped-pip}/bin/pip install -e . --prefix $tmp_path
+      ${bootstrapped-pip}/bin/pip install -e . --prefix $tmp_path >&2
     fi
     ${postShellHook}
   '';

From 17a344a5daebf7796e5b25f45658359b6c0dfda2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 14 Oct 2016 17:52:14 +0200
Subject: [PATCH 010/899] binutils: Add lib output

Some packages depend on libbfd. This prevents them from having all of
binutils in their closure (which is 29 MiB).
---
 .../tools/misc/binutils/default.nix           |  8 +++++++-
 .../tools/misc/binutils/no-plugins.patch      | 19 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/misc/binutils/no-plugins.patch

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 4c32255e875..0214cafb1a7 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -32,9 +32,15 @@ stdenv.mkDerivation rec {
     # This is needed, for instance, so that running "ldd" on a binary that is
     # PaX-marked to disable mprotect doesn't fail with permission denied.
     ./pt-pax-flags.patch
+
+    # Bfd looks in BINDIR/../lib for some plugins that don't
+    # exist. This is pointless (since users can't install plugins
+    # there) and causes a cycle between the lib and bin outputs, so
+    # get rid of it.
+    ./no-plugins.patch
   ];
 
-  outputs = [ "out" "info" ] ++ (optional (cross == null) "dev");
+  outputs = [ "out" "lib" "info" ] ++ (optional (cross == null) "dev");
 
   nativeBuildInputs = [ bison ];
   buildInputs = [ zlib ];
diff --git a/pkgs/development/tools/misc/binutils/no-plugins.patch b/pkgs/development/tools/misc/binutils/no-plugins.patch
new file mode 100644
index 00000000000..9624b7976b7
--- /dev/null
+++ b/pkgs/development/tools/misc/binutils/no-plugins.patch
@@ -0,0 +1,19 @@
+diff -ru binutils-2.27-orig/bfd/plugin.c binutils-2.27/bfd/plugin.c
+--- binutils-2.27-orig/bfd/plugin.c	2016-10-14 17:46:30.791315555 +0200
++++ binutils-2.27/bfd/plugin.c	2016-10-14 17:46:38.583298765 +0200
+@@ -333,6 +333,7 @@
+   if (plugin_program_name == NULL)
+     return found;
+ 
++#if 0
+   plugin_dir = concat (BINDIR, "/../lib/bfd-plugins", NULL);
+   p = make_relative_prefix (plugin_program_name,
+ 			    BINDIR,
+@@ -364,6 +365,7 @@
+   free (p);
+   if (d)
+     closedir (d);
++#endif
+ 
+   return found;
+ }

From d01d2db3d89beb7b0599c3251fd5127cd4bd58e2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 19 Oct 2016 16:19:11 +0200
Subject: [PATCH 011/899] audiofile: Fix build on GCC 6

http://hydra.nixos.org/build/42228674
---
 .../libraries/audiofile/default.nix           |  2 +-
 .../libraries/audiofile/gcc-6.patch           | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/audiofile/gcc-6.patch

diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix
index c76115000cb..78867881dc3 100644
--- a/pkgs/development/libraries/audiofile/default.nix
+++ b/pkgs/development/libraries/audiofile/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0rb927zknk9kmhprd8rdr4azql4gn2dp75a36iazx2xhkbqhvind";
   };
 
-  patches = [ ./CVE-2015-7747.patch ];
+  patches = [ ./CVE-2015-7747.patch ./gcc-6.patch ];
 
   meta = with stdenv.lib; {
     description = "Library for reading and writing audio files in various formats";
diff --git a/pkgs/development/libraries/audiofile/gcc-6.patch b/pkgs/development/libraries/audiofile/gcc-6.patch
new file mode 100644
index 00000000000..1a7edd5af9a
--- /dev/null
+++ b/pkgs/development/libraries/audiofile/gcc-6.patch
@@ -0,0 +1,30 @@
+http://patchwork.ozlabs.org/patch/630200/
+
+From 28cfdbbcb96a69087c3d21faf69b5eae7bcf6d69 Mon Sep 17 00:00:00 2001
+From: Hodorgasm <nsane457@gmail.com>
+Date: Wed, 11 May 2016 21:42:07 -0400
+Subject: [PATCH] Cast to unsigned while left bit-shifting
+
+GCC-6 now treats the left bitwise-shift of a negative integer as nonconformant so explicitly cast to an unsigned int while bit-shifting.
+
+Downloaded from upstream PR:
+https://github.com/mpruett/audiofile/pull/28
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ libaudiofile/modules/SimpleModule.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libaudiofile/modules/SimpleModule.h b/libaudiofile/modules/SimpleModule.h
+index 03c6c69..4014fb2 100644
+--- a/libaudiofile/modules/SimpleModule.h
++++ b/libaudiofile/modules/SimpleModule.h
+@@ -123,7 +123,7 @@ struct signConverter
+ 	typedef typename IntTypes<Format>::UnsignedType UnsignedType;
+ 
+ 	static const int kScaleBits = (Format + 1) * CHAR_BIT - 1;
+-	static const int kMinSignedValue = -1 << kScaleBits;
++	static const int kMinSignedValue = static_cast<signed>(static_cast<unsigned>(-1) << kScaleBits);;
+ 
+ 	struct signedToUnsigned : public std::unary_function<SignedType, UnsignedType>
+ 	{

From 0cb253853db3e93b1d6e29f37022031007f5dbe5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 2 Nov 2016 15:31:43 +0100
Subject: [PATCH 012/899] memtest86+: Build with gcc 5

http://hydra.nixos.org/build/43011285
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0cf4923a3fe..bbe1243749d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2776,7 +2776,9 @@ in
 
   memtest86 = callPackage ../tools/misc/memtest86 { };
 
-  memtest86plus = callPackage ../tools/misc/memtest86+ { };
+  memtest86plus = callPackage ../tools/misc/memtest86+ {
+    stdenv = overrideCC stdenv gcc5;
+  };
 
   meo = callPackage ../tools/security/meo {
     boost = boost155;

From a2900f3f0f6913653da773e98a880433bc246231 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 3 Nov 2016 09:24:03 +0100
Subject: [PATCH 013/899] libfaketime: Fix build on gcc 6

http://hydra.nixos.org/build/43031670
---
 pkgs/development/libraries/libfaketime/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix
index 16ee2151faa..c620254aacd 100644
--- a/pkgs/development/libraries/libfaketime/default.nix
+++ b/pkgs/development/libraries/libfaketime/default.nix
@@ -16,6 +16,9 @@ stdenv.mkDerivation rec {
     makeFlagsArray+=(PREFIX="$out" LIBDIRNAME=/lib)
   '';
 
+  # Work around "libfaketime.c:513:7: error: nonnull argument 'buf' compared to NULL [-Werror=nonnull-compare]".
+  NIX_CFLAGS_COMPILE = "-Wno-nonnull-compare";
+
   meta = with stdenv.lib; {
     description = "Report faked system time to programs without having to change the system-wide time";
     homepage = http://www.code-wizards.com/projects/libfaketime/;

From 48dce4ad7be99ccb5e9710aaa19855e85fdd69a3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 9 Nov 2016 15:28:57 +0100
Subject: [PATCH 014/899] libraw: 0.17.1 -> 0.17.2

Also apply a fix from Debian for building with GCC 6.
---
 pkgs/development/libraries/libraw/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index fedc5287b49..10979abdeab 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -2,13 +2,20 @@
 
 stdenv.mkDerivation rec {
   name = "libraw-${version}";
-  version = "0.17.1";
+  version = "0.17.2";
 
   src = fetchurl {
     url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz";
-    sha256 = "18fygk896gxbx47nh2rn5jp4skisgkl6pdfjqb7h0zn39hd6b6g5";
+    sha256 = "0p6imxpsfn82i0i9w27fnzq6q6gwzvb9f7sygqqakv36fqnc9c4j";
   };
 
+  patches =
+    [ (fetchurl {
+        url = https://anonscm.debian.org/cgit/pkg-phototools/libraw.git/plain/debian/patches/0001-Fix_gcc6_narrowing_conversion.patch?id=d890937aaca6359df45a66b35e547c94ca564823;
+        sha256 = "1lcg5l0wmwiyzhhm67c1c7hy8py6ihxfmicnhrwpi3i6f16vq29w";
+      })
+    ];
+
   outputs = [ "out" "lib" "dev" "doc" ];
 
   buildInputs = [ jasper ];

From 3756edb1096112ead131754b0aa4745f60773d28 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 17 Jan 2017 04:58:14 +0100
Subject: [PATCH 015/899] ragel: fix build with gcc 6

---
 pkgs/development/tools/parsing/ragel/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix
index 05546da67f0..0fe243e8aaf 100644
--- a/pkgs/development/tools/parsing/ragel/default.nix
+++ b/pkgs/development/tools/parsing/ragel/default.nix
@@ -20,6 +20,8 @@ let
 
       configureFlags = [ "--with-colm=${colm}" ];
 
+      NIX_CFLAGS_COMPILE = "-std=gnu++98";
+
       doCheck = true;
 
       meta = with stdenv.lib; {

From b13e77fc3371cb3280ab0bcdb4825922d260c92b Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 17 Jan 2017 05:07:11 +0100
Subject: [PATCH 016/899] geos: 3.5.0 -> 3.6.1

---
 pkgs/development/libraries/geos/default.nix | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix
index d63a1bb7572..de7111f6be3 100644
--- a/pkgs/development/libraries/geos/default.nix
+++ b/pkgs/development/libraries/geos/default.nix
@@ -1,24 +1,17 @@
-{ composableDerivation, fetchurl, python }:
+{ stdenv, fetchurl, fetchpatch, python }:
 
-let inherit (composableDerivation) edf; in
-
-composableDerivation.composableDerivation {} rec {
-
-  flags =
-  # python and ruby untested 
-    edf { name = "python"; enable = { buildInputs = [ python ]; }; };
-    # (if args.use_svn then ["libtool" "autoconf" "automake" "swig"] else [])
-    # // edf { name = "ruby"; enable = { buildInputs = [ ruby ]; };}
-
-  name = "geos-3.5.0";
+stdenv.mkDerivation rec {
+  name = "geos-3.6.1";
 
   src = fetchurl {
     url = "http://download.osgeo.org/geos/${name}.tar.bz2";
-    sha256 = "49982b23bcfa64a53333dab136b82e25354edeb806e5a2e2f5b8aa98b1d0ae02";
+    sha256 = "1icz31kd5sml2kdxhjznvmv33zfr6nig9l0i6bdcz9q9g8x4wbja";
   };
 
   enableParallelBuilding = true;
 
+  buildInputs = [ python ];
+
   meta = {
     description = "C++ port of the Java Topology Suite (JTS)";
     homepage = http://geos.refractions.net/;

From b80291ab98865e61df1442e6e25f5723139689ae Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 17 Jan 2017 22:51:17 +0100
Subject: [PATCH 017/899] protobuf3_0: 3.0.0 -> 3.0.2

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

diff --git a/pkgs/development/libraries/protobuf/3.0.nix b/pkgs/development/libraries/protobuf/3.0.nix
index f80acf462b8..4e77e7f1fbe 100644
--- a/pkgs/development/libraries/protobuf/3.0.nix
+++ b/pkgs/development/libraries/protobuf/3.0.nix
@@ -1,6 +1,6 @@
 { callPackage, ... }:
 
 callPackage ./generic-v3.nix {
-  version = "3.0.0";
-  sha256 = "05qkcl96lkdama848m7q3nzzzdckjc158iiyvgmln0zi232xx7g7";
+  version = "3.0.2";
+  sha256 = "16wmr1fgdqpf84fkq90cxvccfsxx7h0q0wzqkbg8vdjmka412g09";
 }

From a3a0e8fe6468b6052add9bad5772dacd1ba400e0 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 18 Jan 2017 00:11:59 +0100
Subject: [PATCH 018/899] protobuf3_0: fix build with gcc 6

---
 pkgs/development/libraries/protobuf/generic-v3.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix
index f74aea9dbd5..315608bf2b4 100644
--- a/pkgs/development/libraries/protobuf/generic-v3.nix
+++ b/pkgs/development/libraries/protobuf/generic-v3.nix
@@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  NIX_CFLAGS_COMPILE = "-Wno-error=misleading-indentation";
+
   meta = {
     description = "Google's data interchange format";
     longDescription =

From 9aae2991f2404c2c4781ea9e25c1a64471ba212f Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 18 Jan 2017 00:22:08 +0100
Subject: [PATCH 019/899] qt4: add patch to fix build with gcc6, set c++ std

---
 .../development/libraries/qt-4.x/4.8/default.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 91a8899f4d1..cfb4ac61459 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -80,12 +80,19 @@ stdenv.mkDerivation rec {
         gtk = gtk2.out;
         gdk_pixbuf = gdk_pixbuf.out;
       })
-    ++ [(fetchpatch {
+    ++ [
+      (fetchpatch {
         name = "fix-medium-font.patch";
         url = "http://anonscm.debian.org/cgit/pkg-kde/qt/qt4-x11.git/plain/debian/patches/"
           + "kubuntu_39_fix_medium_font.diff?id=21b342d71c19e6d68b649947f913410fe6129ea4";
         sha256 = "0bli44chn03c2y70w1n8l7ss4ya0b40jqqav8yxrykayi01yf95j";
-      })];
+      })
+      (fetchpatch {
+        name = "qt4-gcc6.patch";
+        url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qt4-gcc6.patch?h=packages/qt4&id=ca773a144f5abb244ac4f2749eeee9333cac001f";
+        sha256 = "07lrva7bjh6i40p7b3ml26a2jlznri8bh7y7iyx5zmvb1gfxmj34";
+      })
+    ];
 
   preConfigure = ''
     export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH"
@@ -145,8 +152,9 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = false;
 
-  NIX_CFLAGS_COMPILE = optionalString (stdenv.isFreeBSD || stdenv.isDarwin)
-    "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"
+  NIX_CFLAGS_COMPILE = "-std=gnu++98"
+    + optionalString (stdenv.isFreeBSD || stdenv.isDarwin)
+      "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"
     + optionalString stdenv.isDarwin " -I${libcxx}/include/c++/v1";
 
   NIX_LDFLAGS = optionalString (stdenv.isFreeBSD || stdenv.isDarwin)

From 3098c3fd00e18683a7c62d29d330abecc30bc9f2 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 18 Jan 2017 01:12:49 +0100
Subject: [PATCH 020/899] smpeg: build with gcc 6

---
 pkgs/development/libraries/smpeg/default.nix  |  7 ++--
 pkgs/development/libraries/smpeg/format.patch | 11 +++++++
 pkgs/development/libraries/smpeg/gcc6.patch   | 33 +++++++++++++++++++
 3 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/smpeg/format.patch
 create mode 100644 pkgs/development/libraries/smpeg/gcc6.patch

diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix
index 6803dfd76de..f248d65e2ed 100644
--- a/pkgs/development/libraries/smpeg/default.nix
+++ b/pkgs/development/libraries/smpeg/default.nix
@@ -10,9 +10,12 @@ stdenv.mkDerivation rec {
     sha256 = "0ynwn7ih5l2b1kpzpibns9bb9wzfjak7mgrb1ji0dkn2q5pv6lr0";
   };
 
-  enableParallelBuilding = true;
+  patches = [
+    ./format.patch
+    ./gcc6.patch
+  ];
 
-  hardeningDisable = [ "format" ];
+  enableParallelBuilding = true;
 
   buildInputs = [ SDL gtk2 mesa ];
 
diff --git a/pkgs/development/libraries/smpeg/format.patch b/pkgs/development/libraries/smpeg/format.patch
new file mode 100644
index 00000000000..8486dee5cda
--- /dev/null
+++ b/pkgs/development/libraries/smpeg/format.patch
@@ -0,0 +1,11 @@
+--- a/plaympeg.c	2014-09-04 08:55:10.646132150 +0200
++++ b/plaympeg.c	2014-09-04 08:56:57.465210820 +0200
+@@ -262,7 +262,7 @@
+       answer[i] = c;
+     }
+     answer[i] = 0;
+-    fprintf(stderr, answer + 4);
++    fprintf(stderr, "%s", answer + 4);
+   }
+   while(answer[3] == '-');
+ 
diff --git a/pkgs/development/libraries/smpeg/gcc6.patch b/pkgs/development/libraries/smpeg/gcc6.patch
new file mode 100644
index 00000000000..165feb4428c
--- /dev/null
+++ b/pkgs/development/libraries/smpeg/gcc6.patch
@@ -0,0 +1,33 @@
+--- a/audio/hufftable.cpp
++++ b/audio/hufftable.cpp
+@@ -9,6 +9,7 @@
+ #include "config.h"
+ #endif
+ 
++#include <climits>
+ #include "MPEGaudio.h"
+ 
+ static const unsigned int
+@@ -550,11 +551,11 @@ htd33[ 31][2]={{ 16,  1},{  8,  1},{  4,
+ 
+ const HUFFMANCODETABLE MPEGaudio::ht[HTN]=
+ {
+-  { 0, 0-1, 0-1, 0,  0, htd33},
++  { 0, UINT_MAX, UINT_MAX, 0,  0, htd33},
+   { 1, 2-1, 2-1, 0,  7,htd01},
+   { 2, 3-1, 3-1, 0, 17,htd02},
+   { 3, 3-1, 3-1, 0, 17,htd03},
+-  { 4, 0-1, 0-1, 0,  0, htd33},
++  { 4, UINT_MAX, UINT_MAX, 0,  0, htd33},
+   { 5, 4-1, 4-1, 0, 31,htd05},
+   { 6, 4-1, 4-1, 0, 31,htd06},
+   { 7, 6-1, 6-1, 0, 71,htd07},
+@@ -564,7 +565,7 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN
+   {11, 8-1, 8-1, 0,127,htd11},
+   {12, 8-1, 8-1, 0,127,htd12},
+   {13,16-1,16-1, 0,511,htd13},
+-  {14, 0-1, 0-1, 0,  0, htd33},
++  {14, UINT_MAX, UINT_MAX, 0,  0, htd33},
+   {15,16-1,16-1, 0,511,htd15},
+   {16,16-1,16-1, 1,511,htd16},
+   {17,16-1,16-1, 2,511,htd16},

From 0f3cee15b5f963c4a3c6ef088f3334374eddb26a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 18 Jan 2017 14:48:13 +0100
Subject: [PATCH 021/899] wxGTK: build with gcc 6

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

diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix
index c4530da5453..6b9aa458735 100644
--- a/pkgs/development/libraries/wxGTK-2.8/default.nix
+++ b/pkgs/development/libraries/wxGTK-2.8/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     + optionalString withMesa "${mesa.out}/lib ";
 
   # Work around a bug in configure.
-  NIX_CFLAGS_COMPILE = [ "-DHAVE_X11_XLIB_H=1" "-lX11" "-lcairo" ];
+  NIX_CFLAGS_COMPILE = [ "-DHAVE_X11_XLIB_H=1" "-lX11" "-lcairo" "-Wno-narrowing" ];
 
   preConfigure = "
     substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='

From 90fc5042adde849261a38f37efc3878238f508f2 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 18 Jan 2017 20:42:53 +0100
Subject: [PATCH 022/899] wxGTK30: fix build with gcc 6

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

diff --git a/pkgs/development/libraries/wxGTK-3.0/default.nix b/pkgs/development/libraries/wxGTK-3.0/default.nix
index 5c45b29ec5c..ed937272514 100644
--- a/pkgs/development/libraries/wxGTK-3.0/default.nix
+++ b/pkgs/development/libraries/wxGTK-3.0/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
-, gstreamer, gst_plugins_base, GConf, setfile
+{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm
+, xf86vidmodeproto , gstreamer, gst_plugins_base, GConf, setfile
 , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true
 , withWebKit ? false, webkitgtk2 ? null
 , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
@@ -33,6 +33,11 @@ stdenv.mkDerivation {
 
   propagatedBuildInputs = optional stdenv.isDarwin AGL;
 
+  patches = [ (fetchpatch {
+    url = "https://raw.githubusercontent.com/jessehager/MINGW-packages/af6ece963d8157dd3fbc710bcc190647c4924c63/mingw-w64-wxwidgets/wxWidgets-3.0.2-gcc6-abs.patch";
+    sha256 = "0100pg0z7i6cjyysf2k3330pmqmdaxgc9hz6kxnfvc31dynjcq3h";
+  }) ];
+
   configureFlags =
     [ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl"
       (if compat24 then "--enable-compat24" else "--disable-compat24")

From 45f1a914e8e4b5f32382b3f062c33a9e047525b6 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 19 Jan 2017 02:03:42 +0100
Subject: [PATCH 023/899] audacity: fix build with gcc 6

---
 pkgs/applications/audio/audacity/default.nix | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index f91fc03ec01..8b81fd7c35a 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -13,12 +13,19 @@ stdenv.mkDerivation rec {
     url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
     sha256 = "1ggr6g0mk36rqj7ahsg8b0b1r9kphwajzvxgn43md263rm87n04h";
   };
-  patches = [(fetchpatch {
-    name = "new-ffmpeg.patch";
-    url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk"
-      + "/audacity-ffmpeg.patch?h=packages/audacity&id=0c1e35798d4d70692";
-    sha256 = "19fr674mw844zmkp1476yigkcnmb6zyn78av64ccdwi3p68i00rf";
-  })];
+  patches = [
+    (fetchpatch {
+      name = "new-ffmpeg.patch";
+      url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk"
+        + "/audacity-ffmpeg.patch?h=packages/audacity&id=0c1e35798d4d70692";
+      sha256 = "19fr674mw844zmkp1476yigkcnmb6zyn78av64ccdwi3p68i00rf";
+    })
+    (fetchpatch {
+      name = "gcc6.patch";
+      url = "https://github.com/audacity/audacity/commit/60f2322055756e8cacfe96530a12c63e9694482c.patch";
+      sha256 = "07jlxr8y7ap3nsblx3zh8v9rcx7ajbcfnvwzhwykmbwbsyirgqf2";
+    })
+  ];
 
   preConfigure = /* we prefer system-wide libs */ ''
     mv lib-src lib-src-rm

From 0437bc96630db63a667646e4b2faaa272b836aea Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 19 Jan 2017 02:09:16 +0100
Subject: [PATCH 024/899] podofo: 0.9.3 -> 0.9.4, pin to gcc5

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

diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index 0b67ce16331..b68bc20ecf3 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig
-, openssl, libpng, lua5 }:
+, gcc5, openssl, libpng, lua5 }:
 
 stdenv.mkDerivation rec {
-  name = "podofo-0.9.3";
+  name = "podofo-0.9.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/podofo/${name}.tar.gz";
-    sha256 = "1n12lbq9x15vqn7dc0hsccp56l5jdff1xrhvlfqlbklxx0qiw9pc";
+    sha256 = "0ngqgwl38afmzcj2zpf18a2g63vhm2fp45cbf9z62129rdgm1pyc";
   };
 
   propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng ];
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake gcc5 ];
   buildInputs = [ lua5 stdenv.cc.libc ];
 
   crossAttrs = {

From 4e5f484016b6ee9df10d33e209803c29a1ace555 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 19 Jan 2017 02:18:03 +0100
Subject: [PATCH 025/899] libe-book: fix build with gcc6

---
 pkgs/development/libraries/libe-book/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/libe-book/default.nix b/pkgs/development/libraries/libe-book/default.nix
index 02195dede93..1e374b8ad1f 100644
--- a/pkgs/development/libraries/libe-book/default.nix
+++ b/pkgs/development/libraries/libe-book/default.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     inherit (s) url sha256;
   };
+  NIX_CFLAGS_COMPILE = "-Wno-error=unused-function";
   meta = {
     inherit (s) version;
     description = ''Library for import of reflowable e-book formats'';

From 9842a107dad0aaad8f21d6e2b98be1bc00347dcf Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 19 Jan 2017 02:24:04 +0100
Subject: [PATCH 026/899] linuxPackages.perf: fix build with gcc6

---
 pkgs/os-specific/linux/kernel/perf.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index 9e572498457..76f2662f21b 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -30,7 +30,10 @@ stdenv.mkDerivation {
 
   # Note: we don't add elfutils to buildInputs, since it provides a
   # bad `ld' and other stuff.
-  NIX_CFLAGS_COMPILE = "-Wno-error=cpp -Wno-error=bool-compare -Wno-error=deprecated-declarations";
+  NIX_CFLAGS_COMPILE = [
+    "-Wno-error=cpp" "-Wno-error=bool-compare" "-Wno-error=deprecated-declarations"
+    "-Wno-error=unused-const-variable" "-Wno-error=misleading-indentation"
+  ];
 
   installFlags = "install install-man ASCIIDOC8=1";
 

From b8340929d07e063e968d99ba545624e73aca141b Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 19 Jan 2017 12:43:05 +0100
Subject: [PATCH 027/899] libtasn1: 4.9 -> 4.10

---
 pkgs/development/libraries/libtasn1/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index 150e7455c03..3b74406d7bf 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -5,16 +5,12 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/libtasn1/${name}.tar.gz";
-    sha256 = "681a4d9a0d259f2125713f2e5766c5809f151b3a1392fd91390f780b4b8f5a02";
+    sha256 = "00jsix5hny0g768zv4hk78dib7w0qmk5fbizf4jj37r51nd4s6k8";
   };
 
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev";
 
-  # Warning causes build to fail on darwin since 4.9,
-  # check if this can be removed in the next release.
-  CFLAGS = "-Wno-sign-compare";
-
   buildInputs = [ perl texinfo ];
 
   doCheck = true;

From 6d3f23d0457f87952d13c2a47f404a83a4593be7 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 19 Jan 2017 15:48:29 +0100
Subject: [PATCH 028/899] thunderbird: add patch to fix build with gcc6

---
 .../mailreaders/thunderbird/default.nix       |  2 +
 .../mailreaders/thunderbird/gcc6.patch        | 75 +++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 pkgs/applications/networking/mailreaders/thunderbird/gcc6.patch

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 5f1483672b2..89cdfcb1aa4 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
     sha512 = "1f4579ac37b8ab98c91fe2e3e6742ba1b005ca9346d23f467d19e6af45eb457cab749bf91ed2a79f2058bd66f54da661da3ea5d5786f8c4b472d8a2a6c34db4b";
   };
 
+  patches = [ ./gcc6.patch ];
+
   # New sed no longer tolerates this mistake.
   postPatch = ''
     for f in mozilla/{js/src,}/configure; do
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/gcc6.patch b/pkgs/applications/networking/mailreaders/thunderbird/gcc6.patch
new file mode 100644
index 00000000000..bd102220285
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/thunderbird/gcc6.patch
@@ -0,0 +1,75 @@
+
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# Date 1457596445 -32400
+# Node ID 55212130f19da3079167a6b0a5a0ed6689c9a71d
+# Parent  27c94617d7064d566c24a42e11cd4c7ef725923d
+Bug 1245076 - Don't include mozalloc.h from the cstdlib wrapper. r=froydnj
+
+Our STL wrappers do various different things, one of which is including
+mozalloc.h for infallible operator new. mozalloc.h includes stdlib.h,
+which, in libstdc++ >= 6 is now itself a wrapper around cstdlib, which
+circles back to our STL wrapper.
+
+But of the things our STL wrappers do, including mozalloc.h is not one
+that is necessary for cstdlib. So skip including mozalloc.h in our
+cstdlib wrapper.
+
+Additionally, some C++ sources (in media/mtransport) are including
+headers in an extern "C" block, which end up including stdlib.h, which
+ends up including cstdlib because really, this is all C++, and our
+wrapper pre-includes <new> for mozalloc.h, which fails because templates
+don't work inside extern "C". So, don't pre-include <new> when we're not
+including mozalloc.h.
+
+
+diff --git a/mozilla/config/gcc-stl-wrapper.template.h b/mozilla/config/gcc-stl-wrapper.template.h
+--- a/mozilla/config/gcc-stl-wrapper.template.h
++++ b/mozilla/config/gcc-stl-wrapper.template.h
+@@ -12,33 +12,40 @@
+ // compiling ObjC.
+ #if defined(__EXCEPTIONS) && __EXCEPTIONS && !(__OBJC__ && __GNUC__ && XP_IOS)
+ #  error "STL code can only be used with -fno-exceptions"
+ #endif
+ 
+ // Silence "warning: #include_next is a GCC extension"
+ #pragma GCC system_header
+ 
++// Don't include mozalloc for cstdlib. See bug 1245076.
++#ifndef moz_dont_include_mozalloc_for_cstdlib
++#  define moz_dont_include_mozalloc_for_cstdlib
++#endif
++#ifndef moz_dont_include_mozalloc_for_${HEADER}
+ // mozalloc.h wants <new>; break the cycle by always explicitly
+ // including <new> here.  NB: this is a tad sneaky.  Sez the gcc docs:
+ //
+ //    `#include_next' does not distinguish between <file> and "file"
+ //    inclusion, nor does it check that the file you specify has the
+ //    same name as the current file. It simply looks for the file
+ //    named, starting with the directory in the search path after the
+ //    one where the current file was found.
+-#include_next <new>
++#  include_next <new>
+ 
+ // See if we're in code that can use mozalloc.  NB: this duplicates
+ // code in nscore.h because nscore.h pulls in prtypes.h, and chromium
+ // can't build with that being included before base/basictypes.h.
+-#if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC)
+-#  include "mozilla/mozalloc.h"
+-#else
+-#  error "STL code can only be used with infallible ::operator new()"
++#  if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC)
++#    include "mozilla/mozalloc.h"
++#  else
++#    error "STL code can only be used with infallible ::operator new()"
++#  endif
++
+ #endif
+ 
+ #if defined(DEBUG) && !defined(_GLIBCXX_DEBUG)
+ // Enable checked iterators and other goodies
+ //
+ // FIXME/bug 551254: gcc's debug STL implementation requires -frtti.
+ // Figure out how to resolve this with -fno-rtti.  Maybe build with
+ // -frtti in DEBUG builds?
+

From 41cb4593b437f2ef1caad989a0f8f6f62ac5e62f Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 19 Jan 2017 22:57:29 +0100
Subject: [PATCH 029/899] openxcom: add patch to fix build with gcc6

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

diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix
index 204663e1448..65c2a42922b 100644
--- a/pkgs/games/openxcom/default.nix
+++ b/pkgs/games/openxcom/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake, mesa, zlib, openssl, libyamlcpp, boost
+{stdenv, fetchurl, fetchpatch, cmake, mesa, zlib, openssl, libyamlcpp, boost
 , SDL, SDL_image, SDL_mixer, SDL_gfx }:
 
 let version = "1.0.0"; in
@@ -13,6 +13,11 @@ stdenv.mkDerivation {
   buildInputs = [ cmake mesa zlib openssl libyamlcpp boost
     SDL SDL_image SDL_mixer SDL_gfx ];
 
+  patches = [ (fetchpatch {
+    url = "https://github.com/SupSuper/OpenXcom/commit/49bec0851fc6e5365cac0f71b2c40a80ddf95e77.patch";
+    sha256 = "156fk8wz4qc0nmqq3zjb6kw84qirabads2azr6xvlgb3lcn327v2";
+  }) ];
+
   meta = {
     description = "Open source clone of UFO: Enemy Unknown";
     homepage = http://openxcom.org;

From bc08b942e91aa8e4f1a65d68753c928cce84e1e0 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 19 Jan 2017 23:10:28 +0100
Subject: [PATCH 030/899] warmux: add patch to fix build with gcc6

---
 pkgs/games/warmux/gcc-fix.patch | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/games/warmux/gcc-fix.patch b/pkgs/games/warmux/gcc-fix.patch
index 1ac476b92a3..913b912af7d 100644
--- a/pkgs/games/warmux/gcc-fix.patch
+++ b/pkgs/games/warmux/gcc-fix.patch
@@ -34,3 +34,18 @@ Author: Felix Geyer <debfx-pkg@fobos.de>
  #include <WARMUX_types.h>
  #include <WARMUX_network.h>
  #include <WARMUX_index_server.h>
+
+Description: Fix conversion error in gcc 6.
+Author: Robin Gloster <mail@glob.in>
+
+--- warmux-11.04.1.orig/src/interface/weapon_menu.cpp	2017-01-19 23:06:32.401035923 +0100
++++ warmux-11.04.1/src/interface/weapon_menu.cpp	2017-01-19 23:07:14.245866593 +0100
+@@ -391,7 +391,7 @@
+ Weapon * WeaponsMenu::UpdateCurrentOverflyItem(const Polygon * poly)
+ {
+   if (!show)
+-    return false;
++    return nullptr;
+   const std::vector<PolygonItem *>& items = poly->GetItem();
+   WeaponMenuItem * tmp;
+   Interface::GetInstance()->SetCurrentOverflyWeapon(NULL);

From d3cd8b1d58de5ad67e227617ffa2629f04b9e9ac Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 21 Jan 2017 13:49:24 +0100
Subject: [PATCH 031/899] spidermonkey_1_8_5: add patch to fix build with gcc6

---
 pkgs/development/interpreters/spidermonkey/1.8.5.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
index 3c5eef01db0..ed09ac7467d 100644
--- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix
+++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, autoconf213, fetchurl, pkgconfig, nspr, perl, python2, zip }:
+{ stdenv, lib, autoconf213, fetchurl, fetchpatch, pkgconfig, nspr, perl, python2, zip }:
 
 stdenv.mkDerivation rec {
   name = "spidermonkey-${version}";
@@ -22,7 +22,13 @@ stdenv.mkDerivation rec {
     ${lib.optionalString stdenv.isArm "autoreconf --verbose --force"}
   '';
 
-  patches = stdenv.lib.optionals stdenv.isArm [
+  patches = [
+    (fetchpatch {
+      name = "gcc6.patch";
+      url = "https://anonscm.debian.org/cgit/collab-maint/mozjs.git/plain/debian/patches/fix-811665.patch?id=00b15c7841968ab4f7fec409a6b93fa5e1e1d32e";
+      sha256 = "1q8477xqxiy5d8376k5902l45gd0qkd4nxmhl8vr6rr1pxfcny99";
+    })
+  ] ++ stdenv.lib.optionals stdenv.isArm [
     # Explained below in configureFlags for ARM
     ./1.8.5-findvanilla.patch
     # Fix for hard float flags.

From 8cae089f199552ef7629421eb73b67901f45c8d7 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 21 Jan 2017 14:42:59 +0100
Subject: [PATCH 032/899] dirac: fix build with gcc6

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

diff --git a/pkgs/development/libraries/dirac/default.nix b/pkgs/development/libraries/dirac/default.nix
index ac94e077b9a..7b42ead14bd 100644
--- a/pkgs/development/libraries/dirac/default.nix
+++ b/pkgs/development/libraries/dirac/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
 
   patches = [ ./dirac-1.0.2.patch ];
 
+  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+
   postInstall = ''
     # keep only necessary binaries
     find $out/bin \( -name '*RGB*' -or -name '*YUV*' -or -name create_dirac_testfile.pl \) -delete

From d31b3a9e6dad213fe60b0fe1ede1ca4b87e055f5 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 21 Jan 2017 14:43:22 +0100
Subject: [PATCH 033/899] freeimage: fix build with gcc6

---
 pkgs/development/libraries/freeimage/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix
index 42105c7022c..6ee7670fc29 100644
--- a/pkgs/development/libraries/freeimage/default.nix
+++ b/pkgs/development/libraries/freeimage/default.nix
@@ -1,11 +1,15 @@
-{stdenv, fetchurl, unzip, darwin}:
+{ stdenv, fetchurl, unzip, darwin }:
+
 stdenv.mkDerivation {
   name = "freeimage-3.17.0";
+
   src = fetchurl {
     url = mirror://sourceforge/freeimage/FreeImage3170.zip;
     sha256 = "12bz57asdcfsz3zr9i9nska0fb6h3z2aizy412qjqkixkginbz7v";
   };
+
   buildInputs = [ unzip ] ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools;
+
   prePatch = if stdenv.isDarwin
              then ''
     sed -e 's/gcc-4.0/clang/g' \
@@ -38,6 +42,8 @@ stdenv.mkDerivation {
   preInstall = "mkdir -p $out/include $out/lib";
   postInstall = stdenv.lib.optionalString (!stdenv.isDarwin) "make -f Makefile.fip install";
 
+  NIX_CFLAGS_COMPILE = "-Wno-narrowing";
+
   meta = {
     description = "Open Source library for accessing popular graphics image file formats";
     homepage = http://freeimage.sourceforge.net/;

From 246765f33db59d7d0244b8c415a76f64f4082538 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 21 Jan 2017 14:43:45 +0100
Subject: [PATCH 034/899] libjack2: add patch to fix build with gcc6

---
 pkgs/misc/jackaudio/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index a4e4e408fec..a38c9b76410 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper
-, bash, libsamplerate, libsndfile, readline, gcc
+{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, python2Packages, makeWrapper
+, bash, libsamplerate, libsndfile, readline
 
 # Optional Dependencies
 , dbus ? null, libffado ? null, alsaLib ? null
@@ -34,11 +34,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig python makeWrapper ];
-  buildInputs = [ gcc
-    python
-
-    libsamplerate libsndfile readline
-
+  buildInputs = [ python libsamplerate libsndfile readline
     optDbus optPythonDBus optLibffado optAlsaLib optLibopus
   ];
 
@@ -46,7 +42,13 @@ stdenv.mkDerivation rec {
     substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash
   '';
 
-  patches = [ ./jack-gcc5.patch ];
+  patches = [
+    ./jack-gcc5.patch
+    (fetchpatch {
+      url = "https://github.com/jackaudio/jack2/commit/ff1ed2c4524095055140370c1008a2d9cccc5645.patch";
+      sha256 = "0vywakbmlskvs9ginij9ilk39wjyzg7w6cf1qxp11hb0hj69fir5";
+    })
+  ];
 
   configurePhase = ''
     python waf configure --prefix=$out \

From 6bc1f2f61c113f49ae4c8799eff7e1b5d61adef1 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 22 Jan 2017 20:24:27 +0100
Subject: [PATCH 035/899] ams-lv2: 1.1.0 -> 1.2.1

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

diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix
index 9d62696a3f8..fbbb9f90f8a 100644
--- a/pkgs/applications/audio/ams-lv2/default.nix
+++ b/pkgs/applications/audio/ams-lv2/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig, python }:
+{ stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig, python }:
 
 stdenv.mkDerivation  rec {
   name = "ams-lv2-${version}";
-  version = "1.1.0";
+  version = "1.2.1";
 
-  src = fetchurl {
-    url = "https://github.com/blablack/ams-lv2/archive/v${version}.tar.gz";
-    sha256 = "1kqbl7rc3zrs27c5ga0frw3mlpx15sbxzhf04sfbrd9l60535fd5";
+  src = fetchFromGitHub {
+    owner = "blablack";
+    repo = "ams-lv2";
+    rev = version;
+    sha256 = "1n1dnqnj24xhiy9323lj52nswr5120cj56fpckg802miss05sr6x";
   };
 
   buildInputs = [ cairo fftw gtkmm2 lv2 lvtk pkgconfig python ];

From dc52135d550c0f860bd5983d80d31f2e8fdc6424 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 22 Jan 2017 20:25:16 +0100
Subject: [PATCH 036/899] apvlv: 0.1 -> 0.1.5

---
 pkgs/applications/misc/apvlv/default.nix | 37 +++++++++++++++---------
 pkgs/top-level/all-packages.nix          |  4 +--
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix
index 88e08b40914..977f5e94e5d 100644
--- a/pkgs/applications/misc/apvlv/default.nix
+++ b/pkgs/applications/misc/apvlv/default.nix
@@ -1,26 +1,37 @@
-{ stdenv, fetchurl, cmake, pkgconfig,
-  gtk2 , poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, pcre, libxkbcommon, epoxy
+, gtk3, poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.1.f7f7b9c";
+  version = "0.1.5";
   name = "apvlv-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/downloads/naihe2010/apvlv/${name}-Source.tar.gz";
-    sha256 = "125nlcfjdhgzi9jjxh9l2yc9g39l6jahf8qh2555q20xkxf4rl0w";
+  src = fetchFromGitHub {
+    owner = "naihe2010";
+    repo = "apvlv";
+    rev = "v${version}";
+    sha256 = "1n4xiic8lqnv3mqi7wpdv866gyyakax71gffv3n9427rmcld465i";
   };
 
-  preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${poppler.dev}/include/poppler"
-  '';
+  NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler";
 
   buildInputs = [
     pkgconfig cmake
-     poppler
-     freetype gtk2
-     libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation
-   ];
+    poppler pcre libxkbcommon epoxy
+    freetype gtk3
+    libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation
+  ];
+
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/naihe2010/apvlv/commit/d432635b9c5ea6c052a2ae1fb71aedec5c4ad57a.patch";
+      sha256 = "1am8dgv2kkpqmm2vaysa61czx8ppdx94zb3c59sx88np50jpy70w";
+    })
+    (fetchpatch {
+      url = "https://github.com/naihe2010/apvlv/commit/4c7a583e8431964def482e5471f02e6de8e62a7b.patch";
+      sha256 = "1dszm120lwm90hcg5zmd4vr6pjyaxc84qmb7k0fr59mmb3qif62j";
+    })
+  ];
 
   installPhase = ''
     # binary
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bbe1243749d..f2b593f806e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15731,9 +15731,7 @@ in
     inherit (gnome2) libgnomeprint libgnomeprintui libgnomecanvas;
   };
 
-  apvlv = callPackage ../applications/misc/apvlv {
-    gtk2 = gtk2-x11;
-  };
+  apvlv = callPackage ../applications/misc/apvlv { };
 
   xpdf = callPackage ../applications/misc/xpdf {
     base14Fonts = "${ghostscript}/share/ghostscript/fonts";

From 7a02353e36a61424c2068d1b0c72cfb6885ca664 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 22 Jan 2017 19:56:55 +0100
Subject: [PATCH 037/899] acoustidFingerprinter: add patch to fix build with
 gcc6

---
 pkgs/tools/audio/acoustid-fingerprinter/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix
index 208b4c2b38b..80149fa98dd 100644
--- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix
+++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, qt4, taglib, chromaprint, ffmpeg }:
+{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, qt4, taglib, chromaprint, ffmpeg }:
 
 stdenv.mkDerivation rec {
   name = "acoustid-fingerprinter-${version}";
@@ -14,6 +14,11 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DTAGLIB_MIN_VERSION=${(builtins.parseDrvName taglib.name).version}" ];
 
+  patches = [ (fetchpatch {
+    url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/commits/632e87969c3a5562a5d4842b03613267ba6236b2/raw";
+    sha256 = "15hm9knrpqn3yqrwyjz4zh2aypwbcycd0c5svrsy1fb2h2rh05jk";
+  }) ];
+
   meta = with stdenv.lib; {
     homepage = "http://acoustid.org/fingerprinter";
     description = "Audio fingerprinting tool using chromaprint";

From bcfca9224f6ed0933562fdf3d3aa8ff226023d22 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 23 Jan 2017 01:33:49 +0100
Subject: [PATCH 038/899] gnome3.gjs: 1.46 -> 1.47, use spidermonkey_31

---
 pkgs/desktops/gnome-3/3.22/core/gjs/default.nix | 4 ++--
 pkgs/desktops/gnome-3/3.22/core/gjs/src.nix     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix
index ac5572decb8..1141db03c40 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix
@@ -1,12 +1,12 @@
 { fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection
-, spidermonkey_24, pango, readline, glib, libxml2, dbus }:
+, spidermonkey_31, pango, readline, glib, libxml2, dbus }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
   buildInputs = [ libxml2 gobjectIntrospection pkgconfig gtk3 glib pango readline dbus ];
 
-  propagatedBuildInputs = [ spidermonkey_24 ];
+  propagatedBuildInputs = [ spidermonkey_31 ];
 
   postInstall = ''
     sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la
diff --git a/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix b/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix
index 1f4ef08f9b1..7af8d7c531b 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix
@@ -1,11 +1,11 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: rec {
-  name = "gjs-${major}.0";
-  major = "1.46";
+  name = "gjs-${major}.4";
+  major = "1.47";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gjs/${major}/${name}.tar.xz";
-    sha256 = "2283591fa70785443793e1d7db66071b36052d707075f229baeb468d8dd25ad4";
+    sha256 = "05x9yk3h53wn9fpwbcxl8yz71znhwhzwy7412di77x88ghkxi2c1";
   };
 }

From 61f893fb64b542507fa3d99480c5372a35aa1d4a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 23 Jan 2017 01:34:41 +0100
Subject: [PATCH 039/899] html-tidy: 5.0.0 -> 5.2.0

---
 pkgs/tools/text/html-tidy/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix
index c0db454ed29..1a264885b48 100644
--- a/pkgs/tools/text/html-tidy/default.nix
+++ b/pkgs/tools/text/html-tidy/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, cmake, libxslt }:
+{ stdenv, fetchFromGitHub, cmake, libxslt }:
 
-let
-  version = "5.0.0";
-in
 stdenv.mkDerivation rec {
   name = "html-tidy-${version}";
+  version = "5.2.0";
 
-  src = fetchurl {
-    url = "https://github.com/htacg/tidy-html5/archive/${version}.tar.gz";
-    sha256 = "1qz7hgk482496agngp9grz4jqkyxrp29r2ywbccc9i5198yspca4";
+  src = fetchFromGitHub {
+    owner = "htacg";
+    repo = "tidy-html5";
+    rev = version;
+    sha256 = "1yxp3kjsxd5zwwn4r5rpyq5ndyylbcnb9pisdyf7dxjqd47z64bc";
   };
 
   nativeBuildInputs = [ cmake libxslt/*manpage*/ ];

From d7b17e8b1cc6d67ced284e849665f199b457d26e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 25 Jan 2017 20:07:40 +0100
Subject: [PATCH 040/899] edbrowse: mark as broken

---
 pkgs/applications/editors/edbrowse/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix
index e6f942dbfdd..e5e64a32e97 100644
--- a/pkgs/applications/editors/edbrowse/default.nix
+++ b/pkgs/applications/editors/edbrowse/default.nix
@@ -1,10 +1,11 @@
-{ stdenv, fetchurl, spidermonkey_24, unzip, curl, pcre, readline, openssl, perl, html-tidy }:
+{ stdenv, fetchurl, spidermonkey, unzip, curl, pcre, readline, openssl, perl, html-tidy }:
+
 stdenv.mkDerivation rec {
   name = "edbrowse-${version}";
   version = "3.6.1";
 
   nativeBuildInputs = [ unzip ];
-  buildInputs = [ curl pcre readline openssl spidermonkey_24 perl html-tidy ];
+  buildInputs = [ curl pcre readline openssl spidermonkey perl html-tidy ];
 
   patchPhase = ''
     substituteInPlace src/ebjs.c --replace \"edbrowse-js\" \"$out/bin/edbrowse-js\"
@@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  NIX_CFLAGS_COMPILE = "-I${spidermonkey_24.dev}/include/mozjs-24";
+  NIX_CFLAGS_COMPILE = "-I${spidermonkey}/include/mozjs-31";
   makeFlags = "-C src prefix=$(out)";
 
   src = fetchurl {
@@ -34,5 +35,6 @@ stdenv.mkDerivation rec {
     homepage = http://edbrowse.org/;
     maintainers = [ maintainers.schmitthenner maintainers.vrthra ];
     platforms = platforms.linux;
+    broken = true;  # no compatible spidermonkey
   };
 }

From 5dacc53af3f4537fab693952b5f13b6cafcde6d4 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 25 Jan 2017 20:07:57 +0100
Subject: [PATCH 041/899] spidermonkey_24: remove

---
 .../interpreters/spidermonkey/24.nix          | 62 -------------------
 pkgs/top-level/all-packages.nix               |  1 -
 2 files changed, 63 deletions(-)
 delete mode 100644 pkgs/development/interpreters/spidermonkey/24.nix

diff --git a/pkgs/development/interpreters/spidermonkey/24.nix b/pkgs/development/interpreters/spidermonkey/24.nix
deleted file mode 100644
index 6e354c54296..00000000000
--- a/pkgs/development/interpreters/spidermonkey/24.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi, readline, icu }:
-
-stdenv.mkDerivation rec {
-  version = "24.2.0";
-  name = "spidermonkey-${version}";
-
-  src = fetchurl {
-    url = "mirror://mozilla/js/mozjs-${version}.tar.bz2";
-    sha256 = "1n1phk8r3l8icqrrap4czplnylawa0ddc2cc4cgdz46x3lrkybz6";
-  };
-
-  outputs = [ "out" "dev" "lib" ];
-
-  propagatedBuildInputs = [ nspr ];
-
-  buildInputs = [ pkgconfig perl python2 zip libffi readline icu ];
-
-  postPatch = ''
-    # Fixes an issue with version detection under perl 5.22.x
-    sed -i 's/(defined\((@TEMPLATE_FILE)\))/\1/' config/milestone.pl
-  '';
-
-  postUnpack = "sourceRoot=\${sourceRoot}/js/src";
-
-  preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"
-    export LIBXUL_DIST=$out
-  '';
-
-  setOutputFlags = false;
-  configureFlags = [
-    "--libdir=$(lib)/lib"
-    "--includedir=$(dev)/include"
-    "--enable-threadsafe"
-    "--with-system-icu"
-    "--with-system-nspr"
-    "--with-system-ffi"
-    "--enable-readline"
-  ];
-
-  # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393
-  preBuild = "touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}";
-
-  enableParallelBuilding = true;
-
-  doCheck = true;
-  preCheck = "rm jit-test/tests/sunspider/check-date-format-tofte.js"; # https://bugzil.la/600522
-
-  postInstall = ''
-    rm "$lib"/lib/*.a # halve the output size
-    moveToOutput "bin/js*-config" "$dev" # break the cycle
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Mozilla's JavaScript engine written in C/C++";
-    homepage = https://developer.mozilla.org/en/SpiderMonkey;
-    # TODO: MPL/GPL/LGPL tri-license.
-    maintainers = [ maintainers.goibhniu ];
-    platforms = platforms.linux;
-  };
-}
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2b593f806e..5df31f6bbd3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5912,7 +5912,6 @@ in
 
   spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { };
   spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { };
-  spidermonkey_24 = callPackage ../development/interpreters/spidermonkey/24.nix { };
   spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.nix { };
   spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix { };
   spidermonkey = spidermonkey_31;

From 74e6aa7de608f1ea62a67dc9dfb7f09db6b64633 Mon Sep 17 00:00:00 2001
From: Christoph-Simon Senjak <you@example.com>
Date: Wed, 25 Jan 2017 21:59:27 +0100
Subject: [PATCH 042/899] gbsplay: init at version 2016-12-17

---
 pkgs/applications/audio/gbsplay/default.nix | 36 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/applications/audio/gbsplay/default.nix

diff --git a/pkgs/applications/audio/gbsplay/default.nix b/pkgs/applications/audio/gbsplay/default.nix
new file mode 100644
index 00000000000..b49be827d83
--- /dev/null
+++ b/pkgs/applications/audio/gbsplay/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, libpulseaudio }:
+
+stdenv.mkDerivation {
+  name = "gbsplay-2016-12-17";
+
+  src = fetchFromGitHub {
+    owner = "mmitch";
+    repo = "gbsplay";
+    rev = "2c4486e17fd4f4cdea8c3fd79ae898c892616b70";
+    sha256 = "1214j67sr87zfhvym41cw2g823fmqh4hr451r7y1s9ql3jpjqhpz";
+  };
+
+  buildInputs = [ libpulseaudio ];
+
+  #CFLAGS = "-I${libpulseaudio}/include";
+  #LDFLAGS = "-L${libpulseaudio}/lib";
+
+#  preConfigure = ''
+#    sed -i "s:check_include pulse/simple.h:check_include pulse/simple.h ${libpulseaudio}/include:" ./configure;
+#  '';
+  
+  configureFlagsArray = [
+   "--without-test" "--without-contrib" "--disable-devdsp"
+   "--enable-pulse" "--disable-alsa" "--disable-midi" "--disable-nas"
+   "--disable-dsound" "--disable-i18n"
+   ];
+
+   makeFlagsArray = [ "tests=" ];
+
+
+  meta = with stdenv.lib; {
+    description = "gameboy sound player";
+    license = licenses.gpl1;
+    maintainers = with maintainers; [ dasuxullebt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b0189355fdc..23bd19396eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -862,6 +862,8 @@ with pkgs;
 
   fzy = callPackage ../tools/misc/fzy { };
 
+  gbsplay = callPackage ../applications/audio/gbsplay { };
+
   gdrivefs = python27Packages.gdrivefs;
 
   go-dependency-manager = callPackage ../development/tools/gdm { };

From c84c72063109de7f183c62a743ef6b8491141387 Mon Sep 17 00:00:00 2001
From: Christoph-Simon Senjak <you@example.com>
Date: Thu, 26 Jan 2017 00:41:54 +0100
Subject: [PATCH 043/899] fixing gbsplay/default.nix

---
 pkgs/applications/audio/gbsplay/default.nix | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/audio/gbsplay/default.nix b/pkgs/applications/audio/gbsplay/default.nix
index b49be827d83..9ff9b8dc114 100644
--- a/pkgs/applications/audio/gbsplay/default.nix
+++ b/pkgs/applications/audio/gbsplay/default.nix
@@ -11,26 +11,18 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ libpulseaudio ];
-
-  #CFLAGS = "-I${libpulseaudio}/include";
-  #LDFLAGS = "-L${libpulseaudio}/lib";
-
-#  preConfigure = ''
-#    sed -i "s:check_include pulse/simple.h:check_include pulse/simple.h ${libpulseaudio}/include:" ./configure;
-#  '';
   
-  configureFlagsArray = [
-   "--without-test" "--without-contrib" "--disable-devdsp"
-   "--enable-pulse" "--disable-alsa" "--disable-midi" "--disable-nas"
-   "--disable-dsound" "--disable-i18n"
-   ];
-
-   makeFlagsArray = [ "tests=" ];
+  configureFlagsArray =
+   [ "--without-test" "--without-contrib" "--disable-devdsp"
+     "--enable-pulse" "--disable-alsa" "--disable-midi"
+     "--disable-nas" "--disable-dsound" "--disable-i18n" ];
 
+  makeFlagsArray = [ "tests=" ];
 
   meta = with stdenv.lib; {
     description = "gameboy sound player";
     license = licenses.gpl1;
+    platforms = ["i686-linux" "x86_64-linux"];
     maintainers = with maintainers; [ dasuxullebt ];
   };
 }

From a674415045b07210459b4092512728330fecf4d5 Mon Sep 17 00:00:00 2001
From: Gabe Evans <gabe@ga.be>
Date: Wed, 25 Jan 2017 20:42:30 -0800
Subject: [PATCH 044/899] rcm: 1.3.0 -> 1.3.1

---
 pkgs/tools/misc/rcm/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/rcm/default.nix b/pkgs/tools/misc/rcm/default.nix
index 82b831207a9..db68fab75ab 100644
--- a/pkgs/tools/misc/rcm/default.nix
+++ b/pkgs/tools/misc/rcm/default.nix
@@ -1,13 +1,14 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "rcm-1.3.0";
+stdenv.mkDerivation rec {
+  name = "rcm-${version}";
+  version = "1.3.1";
 
   src = fetchurl {
-    url = https://thoughtbot.github.io/rcm/dist/rcm-1.3.0.tar.gz;
-    sha256 = "ddcf638b367b0361d8e063c29fd573dbe1712d1b83e8d5b3a868e4aa45ffc847";
+    url = "https://thoughtbot.github.io/rcm/dist/rcm-${version}.tar.gz";
+    sha256 = "9c8f92dba63ab9cb8a6b3d0ccf7ed8edf3f0fb388b044584d74778145fae7f8f";
   };
- 
+
   patches = [ ./fix-rcmlib-path.patch ];
 
   postPatch = ''

From a38f1911d34f2a72e15d5e98d76bece6cb8042a8 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 26 Jan 2017 01:52:38 +0100
Subject: [PATCH 045/899] systemd: 231 -> 232

Includes adding some more upstream units and removing obsolete (-.slice) ones.
---
 nixos/modules/system/boot/networkd.nix     |  6 ++++--
 nixos/modules/system/boot/resolved.nix     |  4 +++-
 nixos/modules/system/boot/systemd.nix      | 20 ++++++++++++++++----
 pkgs/os-specific/linux/systemd/default.nix | 20 +++++---------------
 4 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index b828ad53dc5..be70bdbf0a9 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -667,8 +667,10 @@ in
 
   config = mkIf config.systemd.network.enable {
 
-    systemd.additionalUpstreamSystemUnits =
-      [ "systemd-networkd.service" "systemd-networkd-wait-online.service" ];
+    systemd.additionalUpstreamSystemUnits = [
+      "systemd-networkd.service" "systemd-networkd-wait-online.service"
+      "org.freedesktop.network1.busname"
+    ];
 
     systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links
       // mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs
diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix
index 4b7c545dcc0..a3fb733c289 100644
--- a/nixos/modules/system/boot/resolved.nix
+++ b/nixos/modules/system/boot/resolved.nix
@@ -71,7 +71,9 @@ in
 
   config = mkIf cfg.enable {
 
-    systemd.additionalUpstreamSystemUnits = [ "systemd-resolved.service" ];
+    systemd.additionalUpstreamSystemUnits = [
+      "systemd-resolved.service" "org.freedesktop.resolve1.busname"
+    ];
 
     systemd.services.systemd-resolved = {
       wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index a2ee5166971..ace1545b96e 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -17,6 +17,7 @@ let
       "busnames.target"
       "sysinit.target"
       "sockets.target"
+      "exit.target"
       "graphical.target"
       "multi-user.target"
       "network.target"
@@ -41,11 +42,13 @@ let
       "systemd-udevd.service"
       "systemd-udev-settle.service"
       "systemd-udev-trigger.service"
+      "systemd-hwdb-update.service"
 
       # Consoles.
       "getty.target"
       "getty@.service"
       "serial-getty@.service"
+      "console-getty.service"
       "container-getty@.service"
       "systemd-vconsole-setup.service"
 
@@ -72,6 +75,7 @@ let
       "systemd-journal-flush.service"
       "systemd-journal-gatewayd.socket"
       "systemd-journal-gatewayd.service"
+      "systemd-journal-catalog-update.service"
       "systemd-journald-audit.socket"
       "systemd-journald-dev-log.socket"
       "syslog.socket"
@@ -104,6 +108,7 @@ let
       "systemd-random-seed.service"
       "systemd-backlight@.service"
       "systemd-rfkill.service"
+      "systemd-rfkill.socket"
 
       # Hibernate / suspend.
       "hibernate.target"
@@ -111,8 +116,8 @@ let
       "sleep.target"
       "hybrid-sleep.target"
       "systemd-hibernate.service"
-      "systemd-suspend.service"
       "systemd-hybrid-sleep.service"
+      "systemd-suspend.service"
 
       # Reboot stuff.
       "reboot.target"
@@ -136,10 +141,10 @@ let
 
       # Slices / containers.
       "slices.target"
-      "-.slice"
       "system.slice"
       "user.slice"
       "machine.slice"
+      "machines.target"
       "systemd-machined.service"
       "systemd-nspawn@.service"
 
@@ -162,12 +167,12 @@ let
       "systemd-localed.service"
       "systemd-hostnamed.service"
       "systemd-binfmt.service"
+      "systemd-exit.service"
     ]
     ++ cfg.additionalUpstreamSystemUnits;
 
   upstreamSystemWants =
-    [ #"basic.target.wants"
-      "sysinit.target.wants"
+    [ "sysinit.target.wants"
       "sockets.target.wants"
       "local-fs.target.wants"
       "multi-user.target.wants"
@@ -176,11 +181,18 @@ let
 
   upstreamUserUnits =
     [ "basic.target"
+      "bluetooth.target"
+      "busnames.target"
       "default.target"
       "exit.target"
+      "graphical-session-pre.target"
+      "graphical-session.target"
       "paths.target"
+      "printer.target"
       "shutdown.target"
+      "smartcard.target"
       "sockets.target"
+      "sound.target"
       "systemd-exit.service"
       "timers.target"
     ];
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 8939f854870..62b6f66d6ab 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -4,30 +4,21 @@
 , kexectools, libmicrohttpd, linuxHeaders ? stdenv.cc.libc.linuxHeaders, libseccomp
 , iptables, gnu-efi
 , autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
-, enableKDbus ? false
 }:
 
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  version = "231";
+  version = "232";
   name = "systemd-${version}";
 
   src = fetchFromGitHub {
-    owner = "NixOS";
+    owner = "mayflower";
     repo = "systemd";
-    rev = "3b11791d323cf2d0e00a156967021e1ae9119de2";
-    sha256 = "1xzldwd6407jdg6z36smd49d961nmqykpay969i4xfdldcgyjdv0";
+    rev = "42a48d16c0ec48330286f8332a4628e1d71c759b";
+    sha256 = "18bcxbba1wk44xhlsna18x3c4b07sq6670wnsy2xy1x2kzfnmhdl";
   };
 
-  patches = [
-    # Fixes tty issues, see #18158. Remove when upgrading to systemd 232.
-    (fetchpatch {
-      url = "https://github.com/systemd/systemd/commit/bd64d82c1c0e3fe2a5f9b3dd9132d62834f50b2d.patch";
-      sha256 = "1gc9fxdlnfmjhbi77xfwcb5mkhryjsdi0rmbh2lq2qq737iyqqwm";
-    })
-  ];
-
   outputs = [ "out" "lib" "man" "dev" ];
 
   buildInputs =
@@ -53,7 +44,6 @@ stdenv.mkDerivation rec {
       "--with-dbussystemservicedir=$(out)/share/dbus-1/system-services"
       "--with-dbussessionservicedir=$(out)/share/dbus-1/services"
       "--with-tty-gid=3" # tty in NixOS has gid 3
-      "--enable-compat-libs" # get rid of this eventually
       "--disable-tests"
 
       "--enable-lz4"
@@ -80,7 +70,7 @@ stdenv.mkDerivation rec {
       "--with-sysvinit-path="
       "--with-sysvrcnd-path="
       "--with-rc-local-script-path-stop=/etc/halt.local"
-    ] ++ (if enableKDbus then [ "--enable-kdbus" ] else [ "--disable-kdbus" ]);
+    ];
 
   hardeningDisable = [ "stackprotector" ];
 

From 972749f1d423c5682faf5cd40fe3458bdcbb8cab Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 26 Jan 2017 17:57:10 +0100
Subject: [PATCH 046/899] systemd: fix repository url

Left-over from testing, sorry..
---
 pkgs/os-specific/linux/systemd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 62b6f66d6ab..97ba7315ead 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   name = "systemd-${version}";
 
   src = fetchFromGitHub {
-    owner = "mayflower";
+    owner = "nixos";
     repo = "systemd";
     rev = "42a48d16c0ec48330286f8332a4628e1d71c759b";
     sha256 = "18bcxbba1wk44xhlsna18x3c4b07sq6670wnsy2xy1x2kzfnmhdl";

From 123dd9f4e748f64affc2cf77976174444b394705 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@sourcediver.org>
Date: Thu, 26 Jan 2017 17:33:26 +0100
Subject: [PATCH 047/899] services: ipfs: separate system units, add offline
 mode

Offline mode: When adding a lot of data, start this service.
It will will not flood the DHT since it only exposes the API.
When you are done simply reverse the process.
---
 .../services/network-filesystems/ipfs.nix     | 62 ++++++++++++++++---
 1 file changed, 52 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index d43147a16f3..e6e04248854 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -104,30 +104,72 @@ in
       };
     };
 
-    systemd.services.ipfs = {
-      description = "IPFS Daemon";
+    systemd.services.ipfs-init = {
+      description = "IPFS Initializer";
+
+      after = [ "local-fs.target" ];
+      before = [ "ipfs.service" "ipfs-offline.service" ];
 
-      wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" "local-fs.target" ];
       path  = [ pkgs.ipfs pkgs.su pkgs.bash ];
 
       preStart = ''
         install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.dataDir}
+      '';
+
+      script =  ''
         if [[ ! -d ${cfg.dataDir}/.ipfs ]]; then
           cd ${cfg.dataDir}
-          ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c \
-             "${ipfs}/bin/ipfs init ${if cfg.emptyRepo then "-e" else ""}"
+          ${ipfs}/bin/ipfs init ${optionalString cfg.emptyRepo "-e"}
         fi
-        ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c \
-           "${ipfs}/bin/ipfs --local config Addresses.API ${cfg.apiAddress} && \
-            ${ipfs}/bin/ipfs --local config Addresses.Gateway ${cfg.gatewayAddress}"
+        ${ipfs}/bin/ipfs --local config Addresses.API ${cfg.apiAddress}
+        ${ipfs}/bin/ipfs --local config Addresses.Gateway ${cfg.gatewayAddress}
       '';
 
+      serviceConfig = {
+        User = cfg.user;
+        Group = cfg.group;
+        Type = "oneshot";
+        RemainAfterExit = true;
+        PermissionsStartOnly = true;
+      };
+    };
+
+    systemd.services.ipfs = {
+      description = "IPFS Daemon";
+
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" "local-fs.target" "ipfs-init.service" ];
+
+      conflicts = [ "ipfs-offline.service" ];
+      wants = [ "ipfs-init.service" ];
+
+      path  = [ pkgs.ipfs ];
+
       serviceConfig = {
         ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags}";
         User = cfg.user;
         Group = cfg.group;
-        PermissionsStartOnly = true;
+        Restart = "on-failure";
+        RestartSec = 1;
+      };
+    };
+
+    systemd.services.ipfs-offline = {
+      description = "IPFS Daemon (offline mode)";
+
+      after = [ "local-fs.target" "ipfs-init.service" ];
+
+      conflicts = [ "ipfs.service" ];
+      wants = [ "ipfs-init.service" ];
+
+      path  = [ pkgs.ipfs ];
+
+      serviceConfig = {
+        ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags} --offline";
+        User = cfg.user;
+        Group = cfg.group;
+        Restart = "on-failure";
+        RestartSec = 1;
       };
     };
   };

From 0cbb65c832f708e1986c0d1145c5aa457018393c Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Fri, 27 Jan 2017 01:45:50 +0100
Subject: [PATCH 048/899] ghcjs-HEAD: upgrade to the latest HEAD

It includes the following changes:

* Fixed crash on Safari on iOS

* Make linker write externs for closure compiler ADVANCED_OPTIMIZATIONS

* ghcjs-pkg fixes for ghc 8.0.2

Because of the latter I switched from GHC-8.0.1 to GHC-8.0.2 to build ghcjs-HEAD.
---
 pkgs/development/compilers/ghcjs/head.nix | 4 ++--
 pkgs/top-level/haskell-packages.nix       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix
index b191f9655d2..1c347655ebe 100644
--- a/pkgs/development/compilers/ghcjs/head.nix
+++ b/pkgs/development/compilers/ghcjs/head.nix
@@ -10,8 +10,8 @@ bootPkgs.callPackage ./base.nix {
   ghcjsSrc = fetchFromGitHub {
     owner = "ghcjs";
     repo = "ghcjs";
-    rev = "899c834a36692bbbde9b9d16fe5b92ce55a623c4";
-    sha256 = "024yj4k0dxy7nvyq19n3xbhh4b4csdrgj19a3l4bmm1zn84gmpl6";
+    rev = "2dc14802e78d7d9dfa35395d5dbfc9c708fb83e6";
+    sha256 = "0cvmapbrwg0h1pbz648isc2l84z694ylnfm8ncd1g4as28lmj0pz";
   };
   ghcjsBootSrc = fetchgit {
     url = git://github.com/ghcjs/ghcjs-boot.git;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7309121486e..805e9560c20 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -61,8 +61,8 @@ rec {
     ghcjs = packages.ghc7103.callPackage ../development/compilers/ghcjs {
       bootPkgs = packages.ghc7103;
     };
-    ghcjsHEAD = packages.ghc801.callPackage ../development/compilers/ghcjs/head.nix {
-      bootPkgs = packages.ghc801;
+    ghcjsHEAD = packages.ghc802.callPackage ../development/compilers/ghcjs/head.nix {
+      bootPkgs = packages.ghc802;
     };
 
     jhc = callPackage ../development/compilers/jhc {

From 2aaa39a2499debf7df3241cdd8275812ebfc67b8 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 27 Jan 2017 11:32:28 +0100
Subject: [PATCH 049/899] pythonPackages.docker: 1.10.6 -> 2.0.2

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

diff --git a/pkgs/development/python-modules/docker.nix b/pkgs/development/python-modules/docker.nix
new file mode 100644
index 00000000000..12c9aac4c23
--- /dev/null
+++ b/pkgs/development/python-modules/docker.nix
@@ -0,0 +1,34 @@
+{ stdenv, buildPythonPackage, fetchurl
+, six, requests2, websocket_client
+, ipaddress, backports_ssl_match_hostname, docker_pycreds
+}:
+buildPythonPackage rec {
+  name = "docker-${version}";
+  version = "2.0.2";
+
+  src = fetchurl {
+    url = "mirror://pypi/d/docker/${name}.tar.gz";
+    sha256 = "1m16n2r8is1gxwmyr6163na2jdyzsnhhk2qj12l7rzm1sr9nhx7z";
+  };
+
+  propagatedBuildInputs = [
+    six
+    requests2
+    websocket_client
+    ipaddress
+    backports_ssl_match_hostname
+    docker_pycreds
+  ];
+
+  # Flake8 version conflict
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "An API client for docker written in Python";
+    homepage = https://github.com/docker/docker-py;
+    license = licenses.asl20;
+    maintainers = with maintainers; [
+      jgeerds
+    ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8d54eef393a..538ebfbeac4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6164,40 +6164,7 @@ in {
     };
   };
 
-  docker = buildPythonPackage rec {
-    name = "docker-py-${version}";
-    version = "1.10.6";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/docker-py/${name}.tar.gz";
-      sha256 = "05f49f6hnl7npmi7kigg0ibqk8s3fhzx1ivvz1kqvlv4ay3paajc";
-    };
-
-    buildInputs = [ pkgs.glibcLocales ];
-
-    LC_ALL="en_US.UTF-8";
-
-    propagatedBuildInputs = with self; [
-      six
-      requests2
-      websocket_client
-      ipaddress
-      backports_ssl_match_hostname
-      docker_pycreds
-    ];
-
-    # Flake8 version conflict
-    doCheck = false;
-
-    meta = {
-      description = "An API client for docker written in Python";
-      homepage = https://github.com/docker/docker-py;
-      license = licenses.asl20;
-      maintainers = with maintainers; [
-        jgeerds
-      ];
-    };
-  };
+  docker = callPackage ../development/python-modules/docker.nix {};
 
   dockerpty = buildPythonPackage rec {
     name = "dockerpty-0.4.1";

From bf23aaf8933934a66d1f733f3b28a52b54df752b Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 27 Jan 2017 12:26:29 +0100
Subject: [PATCH 050/899] docker_compose: 1.9.0 -> 1.10.0

---
 .../python-modules/docker_compose.nix         | 46 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 pkgs/top-level/python-packages.nix            | 38 +--------------
 3 files changed, 49 insertions(+), 37 deletions(-)
 create mode 100644 pkgs/development/python-modules/docker_compose.nix

diff --git a/pkgs/development/python-modules/docker_compose.nix b/pkgs/development/python-modules/docker_compose.nix
new file mode 100644
index 00000000000..e6f309155c2
--- /dev/null
+++ b/pkgs/development/python-modules/docker_compose.nix
@@ -0,0 +1,46 @@
+{ stdenv, buildPythonApplication, fetchurl, pythonOlder
+, mock, pytest, nose
+, pyyaml, backports_ssl_match_hostname, colorama, docopt
+, dockerpty, docker, ipaddress, jsonschema, requests2
+, six, texttable, websocket_client, cached-property
+, enum34, functools32
+}:
+buildPythonApplication rec {
+  version = "1.10.0";
+  name = "docker-compose-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/d/docker-compose/${name}.tar.gz";
+    sha256 = "023y2yhkvglaq07d78i89g2p8h040d71il8nfbyg2f9fkffigx9z";
+  };
+
+  # lots of networking and other fails
+  doCheck = false;
+  buildInputs = [ mock pytest nose ];
+  propagatedBuildInputs = [
+    pyyaml backports_ssl_match_hostname colorama dockerpty docker
+    ipaddress jsonschema requests2 six texttable websocket_client
+    docopt cached-property
+  ] ++
+    stdenv.lib.optional (pythonOlder "3.4") enum34 ++
+    stdenv.lib.optional (pythonOlder "3.2") functools32;
+
+  patchPhase = ''
+    sed -i "s/'requests >= 2.6.1, < 2.8'/'requests'/" setup.py
+  '';
+
+  postInstall = ''
+    mkdir -p $out/share/bash-completion/completions/
+    cp contrib/completion/bash/docker-compose $out/share/bash-completion/completions/docker-compose
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://docs.docker.com/compose/";
+    description = "Multi-container orchestration for Docker";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [
+      jgeerds
+    ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e53a30b81d9..ae380afca17 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -93,6 +93,8 @@ with pkgs;
 
   dockerTools = callPackage ../build-support/docker { };
 
+  docker_compose = pythonPackages.docker_compose;
+
   dotnetenv = callPackage ../build-support/dotnetenv {
     dotnetfx = dotnetfx40;
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 538ebfbeac4..d2a1f9dee7b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11000,43 +11000,7 @@ in {
     };
   };
 
-  docker_compose = buildPythonPackage rec {
-    version = "1.9.0";
-    name = "docker-compose-${version}";
-    namePrefix = "";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/docker-compose/${name}.tar.gz";
-      sha256 = "0zz2jqpxz69q34bp97pbwxda1ik3m8zbhh15mxvhfsn0g566dywq";
-    };
-
-    # lots of networking and other fails
-    doCheck = false;
-    buildInputs = with self; [ mock pytest nose ];
-    propagatedBuildInputs = with self; [
-      requests2 six pyyaml texttable docopt docker dockerpty websocket_client
-      enum34 jsonschema cached-property
-    ];
-
-    patchPhase = ''
-      sed -i "s/'requests >= 2.6.1, < 2.8'/'requests'/" setup.py
-    '';
-
-    postInstall = ''
-      mkdir -p $out/share/bash-completion/completions/
-      cp contrib/completion/bash/docker-compose $out/share/bash-completion/completions/docker-compose
-    '';
-
-    meta = {
-      homepage = "https://docs.docker.com/compose/";
-      description = "Multi-container orchestration for Docker";
-      license = licenses.asl20;
-      platforms = platforms.linux;
-      maintainers = with maintainers; [
-        jgeerds
-      ];
-    };
-  };
+  docker_compose = callPackage ../development/python-modules/docker_compose.nix {};
 
   fdroidserver = buildPythonPackage rec {
     version = "2016-05-31";

From e11f8dc72df04e4a5758cebb89f63f1abded4521 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 27 Jan 2017 18:24:06 +0100
Subject: [PATCH 051/899] miraclecast: remove obsolete enableKDbus flag

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a00ed9c0a32..1ea614e5614 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11552,9 +11552,7 @@ with pkgs;
 
   mingetty = callPackage ../os-specific/linux/mingetty { };
 
-  miraclecast = callPackage ../os-specific/linux/miraclecast {
-    systemd = systemd.override { enableKDbus = true; };
-  };
+  miraclecast = callPackage ../os-specific/linux/miraclecast { };
 
   mkinitcpio-nfs-utils = callPackage ../os-specific/linux/mkinitcpio-nfs-utils { };
 

From 9c9e5bf25e9aa33176de32251b8aa0af6ae3cf49 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 27 Jan 2017 18:43:33 +0100
Subject: [PATCH 052/899] libva: 1.7.2 -> 1.7.3

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

diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index 8cba1a38b5b..031ac781651 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "libva-${version}";
-  version = "1.7.2";
+  version = "1.7.3";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2";
-    sha256 = "04rczbnbi70y1ziy9ab59szi3glk9q35hshlws0bcj2ndbqirmjx";
+    sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12";
   };
 
   outputs = [ "bin" "dev" "out" ];

From bb8859bd66e84d78284a06a43440d1bc7e8211ca Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 27 Jan 2017 18:43:50 +0100
Subject: [PATCH 053/899] vaapiIntel: 1.7.2 -> 1.7.3

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

diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix
index e3a7124720b..df68b86519b 100644
--- a/pkgs/development/libraries/vaapi-intel/default.nix
+++ b/pkgs/development/libraries/vaapi-intel/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libva-intel-driver-1.7.2";
+  name = "libva-intel-driver-1.7.3";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2";
-    sha256 = "1g371q9p31i57fkidjp2akvrbaadpyx3bwmg5kn72sc2mbv7p7h9";
+    sha256 = "0dzryi9x873p9gikzcb9wzwqv2j3wssm0b85ws63vqjszpckgbbn";
   };
 
   patchPhase = ''

From c1c7d2894d2da7b38e9a09e0bdaea46c66a0b7e5 Mon Sep 17 00:00:00 2001
From: Christopher League <league@contrapunctus.net>
Date: Fri, 27 Jan 2017 11:47:06 -0500
Subject: [PATCH 054/899] vokoscreen: init at 2.5.0

vokoscreen is an easy to use screencast creator to record educational
videos, live recordings of browser, installation, videoconferences, etc.

It uses Qt5 and ffmpeg.
---
 .../applications/video/vokoscreen/default.nix | 48 +++++++++++++++++++
 .../video/vokoscreen/ffmpeg-out-of-box.patch  | 31 ++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 81 insertions(+)
 create mode 100644 pkgs/applications/video/vokoscreen/default.nix
 create mode 100644 pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch

diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix
new file mode 100644
index 00000000000..7a9ea5f9095
--- /dev/null
+++ b/pkgs/applications/video/vokoscreen/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchgit
+, pkgconfig, qt5, alsaLib, libv4l, xorg
+, ffmpeg
+}:
+
+stdenv.mkDerivation {
+  name = "vokoscreen-2.5.0";
+  src = fetchgit {
+    url = "https://github.com/vkohaupt/vokoscreen.git";
+    rev = "8325c8658d6e777d34d2e6b8c8bc03f8da9b3d2f";
+    sha256 = "1hvw7xz1mj16ishbaip73wddbmgibsz0pad4y586zbarpynss25z";
+  };
+
+  buildInputs = [
+    alsaLib.dev
+    libv4l.dev
+    pkgconfig
+    qt5.full
+    qt5.qmakeHook
+    qt5.qtx11extras
+    xorg.libXrandr.dev
+  ];
+
+  patches = [
+    ./ffmpeg-out-of-box.patch
+  ];
+
+  preConfigure = ''
+    sed -i 's/lrelease-qt5/lrelease/g' vokoscreen.pro
+  '';
+
+  postConfigure = ''
+    substituteInPlace settings/QvkSettings.cpp --subst-var-by ffmpeg ${ffmpeg}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Simple GUI screencast recorder, using ffmpeg";
+    homepage = "http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html";
+    longDescription = ''
+      vokoscreen is an easy to use screencast creator to record
+      educational videos, live recordings of browser, installation,
+      videoconferences, etc.
+    '';
+    license = licenses.gpl2Plus;
+    maintainers = [maintainers.league];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch b/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch
new file mode 100644
index 00000000000..8f696f26301
--- /dev/null
+++ b/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch
@@ -0,0 +1,31 @@
+diff --git a/settings/QvkSettings.cpp b/settings/QvkSettings.cpp
+index bbf2abf..187efad 100644
+--- a/settings/QvkSettings.cpp
++++ b/settings/QvkSettings.cpp
+@@ -56,17 +56,8 @@ void QvkSettings::readAll()
+       GIFPlayer = settings.value( "GIFplayer" ).toString();
+       Minimized = settings.value( "Minimized", 0 ).toUInt();
+       Countdown = settings.value( "Countdown", 0 ).toUInt();
+-      QFile file;
+-      if ( file.exists( qApp->applicationDirPath().append( "/bin/ffmpeg" ) ) == true )
+-      {
+-	vokoscreenWithLibs = true;
+-        Recorder = qApp->applicationDirPath().append( "/bin/ffmpeg" );
+-      }
+-      else
+-      {
+-	vokoscreenWithLibs = false;
+-        Recorder = settings.value( "Recorder", "ffmpeg" ).toString();
+-      }
++      vokoscreenWithLibs = true;
++      Recorder = settings.value( "Recorder", "@ffmpeg@/bin/ffmpeg" ).toString();
+     settings.endGroup();
+     
+     settings.beginGroup( "Videooptions" );
+@@ -398,4 +389,4 @@ double QvkSettings::getShowClickTime()
+ int QvkSettings::getShowKeyOnOff()
+ {
+   return showKeyOnOff; 
+-}
+\ No newline at end of file
++}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0786e21737b..8d5932c438f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17821,6 +17821,8 @@ with pkgs;
   vips = callPackage ../tools/graphics/vips { };
   nip2 = callPackage ../tools/graphics/nip2 { };
 
+  vokoscreen = callPackage ../applications/video/vokoscreen { };
+
   wavegain = callPackage ../applications/audio/wavegain { };
 
   wcalc = callPackage ../applications/misc/wcalc { };

From 06a945f01789a319f8109103c0a90c2aa7ef058b Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Fri, 27 Jan 2017 15:22:39 -0800
Subject: [PATCH 055/899] lsof working on darwin

---
 pkgs/development/tools/misc/lsof/default.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index 37e5ae6f710..774734a895c 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, ncurses }:
 
+let dialect = with stdenv.lib; last (splitString "-" stdenv.system); in
+
 stdenv.mkDerivation rec {
   name = "lsof-${version}";
   version = "4.89";
@@ -24,20 +26,19 @@ stdenv.mkDerivation rec {
   };
 
   unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); ";
- 
+
   patches = [ ./dfile.patch ];
 
-  configurePhase = ''
-    # Stop build scripts from searching global include paths
-    export LSOF_INCLUDE=${stdenv.cc.libc}/include
-    ./Configure -n ${if stdenv.isDarwin then "darwin" else "linux"}
-  '';
-  
+  # Stop build scripts from searching global include paths
+  LSOF_INCLUDE = "${stdenv.cc.libc}/include";
+  configurePhase = "./Configure -n ${dialect}";
   preBuild = ''
     sed -i Makefile -e 's/^CFGF=/&	-DHASIPv6=1/;' -e 's/-lcurses/-lncurses/'
+    for filepath in $(find dialects/${dialect} -type f); do
+      sed -i "s,/usr/include,$LSOF_INCLUDE,g" $filepath
+    done
   '';
 
-
   installPhase = ''
     mkdir -p $out/bin $out/man/man8
     cp lsof.8 $out/man/man8/
@@ -53,6 +54,6 @@ stdenv.mkDerivation rec {
       from it).
     '';
     maintainers = [ stdenv.lib.maintainers.mornfall ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 7638578342fa7b053095a4f89cc65cba8c70b3a2 Mon Sep 17 00:00:00 2001
From: Chris Hodapp <hodapp87@gmail.com>
Date: Fri, 27 Jan 2017 18:54:50 -0500
Subject: [PATCH 056/899] RStudio: Optionally allow packages from custom R
 environment

https://nixos.org/nixpkgs/manual/#r-packages contains a method for
setting up an R environment with a specific set of libraries, and it
creates an R wrapper which points R to those libraries.

The package RStudio relies on the standard R package, which then
cannot access any of the libraries specified in a custom R
environment.  While one may easily use pkgs.rstudio.override to change
rstudio's R dependency to the custom R environment, this accomplishes
nothing because while RStudio runs the correct R wrapper it clears out
the environment variable R_LIBS_SITE - and so it is still unable to
use any of those packages.

In order to work around this problem, these changes allow the user to
optionally modify rstudio's wrapper to set environment variable
R_PROFILE_USER to an R script which sets R's .libPaths(..) to point to
the same libraries; that script is generated from R_LIBS_SITE in the R
wrapper.

By default, this change has no effect.  If R is overridden to
something else, and if useRPackages is changed from its default of
false, then the change described above is made; for instance:

{
  packageOverrides = pkgs: let self = pkgs.pkgs; in
  rec {
    rEnv = pkgs.rWrapper.override {
      packages = with self.rPackages; [
        dplyr ggplot2 e1071 rpart reshape
      ];
    };
    rstudioEnv = pkgs.rstudio.override { R = rEnv; useRPackages = true; };
  };
}
---
 pkgs/applications/editors/rstudio/default.nix | 22 +++++++++++--
 pkgs/development/r-modules/README.md          | 31 +++++++++++++++++++
 pkgs/development/r-modules/wrapper.nix        | 20 +++++++++++-
 3 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index 82bcc485da3..5fef166e663 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -1,4 +1,14 @@
-{ stdenv, fetchurl, makeDesktopItem, cmake, boost155, zlib, openssl, R, qt4, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper }:
+{ stdenv, fetchurl, makeDesktopItem, cmake, boost155, zlib, openssl,
+R, qt4, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper,
+# If you have set up an R wrapper with other packages by following
+# something like https://nixos.org/nixpkgs/manual/#r-packages, RStudio
+# by default not be able to access any of those R packages. In order
+# to do this, override the argument "R" here with your respective R
+# wrapper, and set "useRPackages" to true.  This will add the
+# environment variable R_PROFILE_USER to the RStudio wrapper, pointing
+# to an R script which will allow R to use these packages.
+useRPackages ? false
+}:
 
 let
   version = "0.98.110";
@@ -72,8 +82,14 @@ stdenv.mkDerivation rec {
     mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;";
   };
 
-  postInstall = ''
-      wrapProgram $out/bin/rstudio --suffix PATH : ${gnumake}/bin
+  postInstall = let rProfile =
+    # RStudio seems to bypass the environment variables that the R
+    # wrapper already applies, and so this sets R_PROFILE_USER to
+    # again make those R packages accessible:
+    if useRPackages
+    then "--set R_PROFILE_USER ${R}/${R.passthru.fixLibsR}" else "";
+    in ''
+      wrapProgram $out/bin/rstudio --suffix PATH : ${gnumake}/bin ${rProfile}
       mkdir $out/share
       cp -r ${desktopItem}/share/applications $out/share
       mkdir $out/share/icons
diff --git a/pkgs/development/r-modules/README.md b/pkgs/development/r-modules/README.md
index e384b375460..9a7ccc55ac9 100644
--- a/pkgs/development/r-modules/README.md
+++ b/pkgs/development/r-modules/README.md
@@ -53,6 +53,37 @@ in with pkgs; {
 and then run `nix-shell .` to be dropped into a shell with those packages
 available.
 
+## RStudio
+
+RStudio by default will not use the libraries installed like above.
+You must override its R version with your custom R environment, and
+set `useRPackages` to `true`, like below:
+
+```nix
+{
+    packageOverrides = super: let self = super.pkgs; in
+    {
+
+        rEnv = super.rWrapper.override {
+            packages = with self.rPackages; [ 
+                devtools
+                ggplot2
+                reshape2
+                yaml
+                optparse
+                ];
+        };
+        rstudioEnv = super.rstudio.override {
+            R = rEnv;
+            useRPackages = true;
+        };
+    };
+}
+```
+
+Then like above, `nix-env -f "<nixpkgs>" -iA rstudioEnv` will install
+this into your user profile.
+
 ## Updating the package set
 
 ```bash
diff --git a/pkgs/development/r-modules/wrapper.nix b/pkgs/development/r-modules/wrapper.nix
index 3b9a9b18450..25c76506027 100644
--- a/pkgs/development/r-modules/wrapper.nix
+++ b/pkgs/development/r-modules/wrapper.nix
@@ -1,12 +1,19 @@
 { stdenv, R, makeWrapper, recommendedPackages, packages }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = R.name + "-wrapper";
 
   buildInputs = [makeWrapper R] ++ recommendedPackages ++ packages;
 
   unpackPhase = ":";
 
+  # This filename is used in 'installPhase', but needs to be
+  # referenced elsewhere.  This will be relative to this package's
+  # path.
+  passthru = {
+    fixLibsR = "fix_libs.R";
+  };
+  
   installPhase = ''
     mkdir -p $out/bin
     cd ${R}/bin
@@ -14,6 +21,17 @@ stdenv.mkDerivation {
       makeWrapper ${R}/bin/$exe $out/bin/$exe \
         --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE"
     done
+    # RStudio (and perhaps other packages) overrides the R_LIBS_SITE
+    # which the wrapper above applies, and as a result packages
+    # installed in the wrapper (as in the method described in
+    # https://nixos.org/nixpkgs/manual/#r-packages) aren't visible.
+    # The below turns R_LIBS_SITE into some R startup code which can
+    # correct this.
+    echo "# Autogenerated by wrapper.nix from R_LIBS_SITE" > $out/${passthru.fixLibsR}
+    echo -n ".libPaths(c(.libPaths(), \"" >> $out/${passthru.fixLibsR}
+    echo -n $R_LIBS_SITE | sed -e 's/:/", "/g' >> $out/${passthru.fixLibsR}
+    echo -n "\"))" >> $out/${passthru.fixLibsR}
+    echo >> $out/${passthru.fixLibsR}
   '';
 
   meta = {

From 9290751ab41562e28c678839b329f6915980014e Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Sat, 28 Jan 2017 13:34:36 +0100
Subject: [PATCH 057/899] glpk: 4.56 -> 4.61

See https://lists.gnu.org/archive/html/info-gnu/2017-01/msg00011.html
for release announcement
---
 pkgs/development/libraries/glpk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix
index d4ff7d9603f..03f8ff3bc76 100644
--- a/pkgs/development/libraries/glpk/default.nix
+++ b/pkgs/development/libraries/glpk/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "glpk-4.56";
+  name = "glpk-4.61";
 
   src = fetchurl {
     url = "mirror://gnu/glpk/${name}.tar.gz";
-    sha256 = "0syzix6qvpn0fzp08c84c8snansf1cam5vd0dk2w91mz2c85d18h";
+    sha256 = "1adbvwiaqrv9pql9ry3lhn2vfsxnff2vh4fs477d90kpfx0xwrlq";
   };
 
   doCheck = true;

From eda5bca00ac9c0e52c91d3fa6f801a5c4fef05ca Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 28 Jan 2017 17:33:20 +0100
Subject: [PATCH 058/899] geogebra: 5.0.271.0 -> 5-0-320-0

---
 pkgs/applications/science/math/geogebra/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index 0e16e1fb305..8c02af752e7 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -2,18 +2,18 @@
 
 stdenv.mkDerivation rec {
   name = "geogebra-${version}";
-  version = "5.0.271.0";
+  version = "5-0-320-0";
 
   preferLocalBuild = true;
 
   src = fetchurl {
     url = "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2";
-    sha256 = "5dd5be1cde27c9b567f79c38048045864064b69c0d2b469ae93e1fca5f543475";
+    sha256 = "039mrjwgkj3z51zq4xpchzr4msz5xgscgmp36dr1wms1kl42vibk";
   };
 
   srcIcon = fetchurl {
     url = "http://static.geogebra.org/images/geogebra-logo.svg";
-    sha256 = "55ded6b5ec9ad382494f858d8ab5def0ed6c7d529481cd212863b2edde3b5e07";
+    sha256 = "01sy7ggfvck350hwv0cla9ynrvghvssqm3c59x4q5lwsxjsxdpjm";
   };
 
   desktopItem = makeDesktopItem {

From a903c9c8e39416e6a165bcbeccfb1c830719894b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 28 Jan 2017 17:40:04 -0600
Subject: [PATCH 059/899] dropbox: use `paxmark m` to fix Dropbox when
 grsecurity enabled

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

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index f665e0ea325..60bcadf7463 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -146,6 +146,8 @@ in stdenv.mkDerivation {
             fi
         fi
     done
+
+    paxmark m $out/${appdir}/dropbox
   '';
 
   meta = {

From ffc498c4900bbc993b88ef5525698e06fd91beca Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sat, 28 Jan 2017 19:47:25 -0800
Subject: [PATCH 060/899] nvidia_x11: add missing vulkan files

---
 pkgs/os-specific/linux/nvidia-x11/builder.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 32502bb7b6c..b739fde15f7 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -19,7 +19,7 @@ buildPhase() {
         sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source)
         sysOut=$(echo $kernel/lib/modules/$kernelVersion/build)
         unset src # used by the nv makefile
-        make SYSSRC=$sysSrc SYSOUT=$sysOut module
+        make SYSSRC=$sysSrc SYSOUT=$sysOut module -j$NIX_BUILD_JOBS
 
         cd ..
     fi
@@ -31,6 +31,9 @@ installPhase() {
     mkdir -p "$out/etc/OpenCL/vendors"
     cp -p nvidia.icd $out/etc/OpenCL/vendors/
 
+    mkdir -p "$out/share/vulkan/icd.d"
+    cp -p nvidia_icd.json "$out/share/vulkan/icd.d/"
+
     mkdir -p "$out/lib"
     cp -prd *.so.* tls "$out/lib/"
     rm "$out"/lib/lib{glx,nvidia-wfb}.so.* # handled separately
@@ -68,7 +71,7 @@ installPhase() {
         ln -srnf "$libname" "$libname_short"
       fi
 
-      if [[ $libname_short =~ libEGL.so || $libname_short =~ libEGL_nvidia.so ]]; then
+      if [[ $libname_short =~ libEGL.so || $libname_short =~ libEGL_nvidia.so || $libname_short =~ libGLX.so || $libname_short =~ libGLX_nvidia.so ]]; then
           major=0
       else
           major=1

From a4b8a6753214e2cb927251decde4b93631ecc71b Mon Sep 17 00:00:00 2001
From: Anmol Sethi <anmol@aubble.com>
Date: Sat, 28 Jan 2017 16:46:47 -0500
Subject: [PATCH 061/899] fzf: from 0.15.9 to 0.16.2

---
 pkgs/tools/misc/fzf/default.nix | 11 ++---------
 pkgs/tools/misc/fzf/deps.nix    | 13 +++++++++++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index da5817c8850..f0a1b63e831 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "fzf-${version}";
-  version = "0.15.9";
+  version = "0.16.2";
   rev = "${version}";
 
   goPackagePath = "github.com/junegunn/fzf";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "junegunn";
     repo = "fzf";
-    sha256 = "0r099mk9r6f52qqhx0ifb1xa8f2isqvyza80z9mcpi5zkd96174l";
+    sha256 = "160474x0m3fzxi2ddy53chzhmlrx6lvialjknfxb72rm938fc845";
   };
 
   outputs = [ "bin" "out" "man" ];
@@ -33,13 +33,6 @@ buildGoPackage rec {
     ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${name}
   '';
 
-  preFixup = stdenv.lib.optionalString stdenv.isDarwin ''
-    # fixes cycle between $out and $bin
-    # otool -l shows that the binary includes an LC_RPATH to $out/lib
-    # it seems safe to remove that since but the directory does not exist.
-    install_name_tool -delete_rpath $out/lib $bin/bin/fzf
-  '';
-
   meta = with stdenv.lib; {
     homepage = https://github.com/junegunn/fzf;
     description = "A command-line fuzzy finder written in Go";
diff --git a/pkgs/tools/misc/fzf/deps.nix b/pkgs/tools/misc/fzf/deps.nix
index 651c76e361f..170761078c9 100644
--- a/pkgs/tools/misc/fzf/deps.nix
+++ b/pkgs/tools/misc/fzf/deps.nix
@@ -23,8 +23,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/junegunn/go-shellwords";
-      rev = "35d512af75e283aae4ca1fc3d44b159ed66189a4";
-      sha256 = "08la0axabk9hiba9mm4ypp6a116qhvdlxa1jvkxhv3d4zpjsp4n7";
+      rev = "33bd8f1ebe16d6e5eb688cc885749a63059e9167";
+      sha256 = "0xcymw0fm0ir8d9swh1bkpknnqgx5ijjsj433z4d9riy8h8ywpw8";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "854ae91cdcbf914b499b1d7641d07859f3653481";
+      sha256 = "19hj2nv2awc6zhpiapv8xv2yjdwfpxhvx5wnr99if6kg0y1ybsa7";
     };
   }
 ]

From eba33cbf54c0615a7ca03119c2b4f44769b7e0e4 Mon Sep 17 00:00:00 2001
From: Lenz Weber <lenz.weber@mayflower.de>
Date: Thu, 26 Jan 2017 09:33:47 +0100
Subject: [PATCH 062/899] rambox: 0.4.5 -> 0.5.3

---
 .../instant-messengers/rambox/default.nix        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix
index e0b86dfc633..15df03ac90d 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix
@@ -6,7 +6,7 @@ let
   bits = if stdenv.system == "x86_64-linux" then "x64"
          else "ia32";
 
-  version = "0.4.5";
+  version = "0.5.3";
 
   myIcon = fetchurl {
     url = "https://raw.githubusercontent.com/saenzramiro/rambox/9e4444e6297dd35743b79fe23f8d451a104028d5/resources/Icon.png";
@@ -15,7 +15,7 @@ let
 
   desktopItem = makeDesktopItem rec {
     name = "Rambox";
-    exec = name;
+    exec = "rambox";
     icon = myIcon;
     desktopName = name;
     genericName = "Rambox messenger";
@@ -26,8 +26,8 @@ in stdenv.mkDerivation rec {
   src = fetchurl {
     url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox-${version}-${bits}.tar.gz";
     sha256 = if bits == "x64" then
-      "0z2rmfiwhb6v2hkzgrbkd4nhdvm1rssh0mbfbdmdwxq91qzp6558" else
-      "0gq0ywk1jr0apl39dnm0vwdwg1inr7fari3cmfz3fvaym7gc8fki";
+      "14pp466l0fj98p5qsb7i11hd603gwsir26m3j4gljzcizb9hirqv" else
+      "13xmljsdahffdzndg30qxh8mj7bgd9jwkxknrvlh3l6w35pbj085";
   };
 
   phases = [ "unpackPhase" "installPhase" "postFixup" ];
@@ -42,19 +42,19 @@ in stdenv.mkDerivation rec {
   ];
 
   installPhase = ''
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Rambox
-    patchelf --set-rpath "$out/share/rambox:${stdenv.lib.makeLibraryPath deps}" Rambox
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" rambox
+    patchelf --set-rpath "$out/share/rambox:${stdenv.lib.makeLibraryPath deps}" rambox
 
     mkdir -p $out/bin $out/share/rambox
     cp -r * $out/share/rambox
-    ln -s $out/share/rambox/Rambox $out/bin
+    ln -s $out/share/rambox/rambox $out/bin
 
     mkdir -p $out/share/applications
     ln -s ${desktopItem}/share/applications/* $out/share/applications
   '';
 
   postFixup = ''
-    paxmark m $out/share/rambox/Rambox
+    paxmark m $out/share/rambox/rambox
   '';
 
   meta = with stdenv.lib; {

From 2fdfb123a07babe0d19a223546a0ab09eb619416 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 29 Jan 2017 15:19:43 +0100
Subject: [PATCH 063/899] Revert "qgis: enableParallelBuilding"

This reverts commit 632934862b61ed9bd761a14fc2633d1281e8652f.

Still sometimes fails on hydra
---
 pkgs/applications/gis/qgis/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index a4d0d21ef40..d32aaba8468 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake makeWrapper ];
 
-  enableParallelBuilding = true;
+  # fatal error: ui_qgsdelimitedtextsourceselectbase.h: No such file or directory
+  #enableParallelBuilding = true;
 
   # To handle the lack of 'local' RPATH; required, as they call one of
   # their built binaries requiring their libs, in the build process.

From a8b69884669298f39703817438a9393ca9fa5ebd Mon Sep 17 00:00:00 2001
From: Pradeep Chhetri <pradeep.chhetri89@gmail.com>
Date: Fri, 27 Jan 2017 20:11:38 +0530
Subject: [PATCH 064/899] zookeeper: 3.4.6 -> 3.4.9

---
 pkgs/servers/zookeeper/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix
index 7cf95ca7e9e..4eecfa41810 100644
--- a/pkgs/servers/zookeeper/default.nix
+++ b/pkgs/servers/zookeeper/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, jre, makeWrapper, bash }:
 
 stdenv.mkDerivation rec {
-  name = "zookeeper-3.4.6";
+  name = "zookeeper-3.4.9";
 
   src = fetchurl {
     url = "mirror://apache/zookeeper/${name}/${name}.tar.gz";
-    sha256 = "01b3938547cd620dc4c93efe07c0360411f4a66962a70500b163b59014046994";
+    sha256 = "0dgmja1lm7qn92x2xfmz5qj2k6sj2f6yzyj3a55r7iv1590l1wz7";
   };
 
   buildInputs = [ makeWrapper jre ];
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     homepage = "http://zookeeper.apache.org";
     description = "Apache Zookeeper";
     license = licenses.asl20;
-    maintainers = with maintainers; [ nathan-gs cstrahan ];
+    maintainers = with maintainers; [ nathan-gs cstrahan pradeepchhetri ];
     platforms = platforms.unix;
   };
 }

From ca7a4ec55224e550619723c34d532186ef298aa2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 29 Jan 2017 08:43:40 -0600
Subject: [PATCH 065/899] firefox-bin: update hashes for 51.0.1

---
 .../browsers/firefox-bin/sources.nix          | 368 +++++++++---------
 1 file changed, 184 insertions(+), 184 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index a8c322b163e..587e807b168 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -4,922 +4,922 @@
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ach/firefox-51.0.1.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "b03b784892648b2df1c3f5acc9e0a8bab9a7e95afbeda249dfa57f4bbabfd2d750602c64b85ff6d1ea4676294086ea2b847e64a8920450ca6849d6c54b3f881e";
+      sha512 = "264a80d657603925d3ac0e848e60e3593a94e20eaaad4aba1767fc35c8bdd826d7fffbf7aa7be9fc8e380bbc174d53937eb24f887db18fa69ee375f72e8ef092";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/af/firefox-51.0.1.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "4d1c5407450e9afbf8e630fa588d6b26c6cd5d9c405d422413064f1e81d089f65f59df4022dbf6f0601cc36d56b222a45f925b792ed7df3182e0999d5655e393";
+      sha512 = "ca4498387c7786f96e3e7220b6a072cb5df0daaf00dade13a149e61ba725229e47f84622f196034caa608c9c2ef49a14450a9816fd3accb62c29063344d354ca";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/an/firefox-51.0.1.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "71938ac8176197164408b389c28061d634dd3d895b28a7ad35c4236e3a6561be7e4f04c0c4fd14dfa9e4c87d0c9cd245ed656cfc2bb68d4666a5bb2e93740a49";
+      sha512 = "7abba14523671201798f8abb53233472f56fd961d679aee52b4ae9be1c9b5afe547cb1c10a5f6aa80cd5b41eeb0a3d04edc60a62ed00b1bc21ad8cb9dc86906e";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ar/firefox-51.0.1.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "a0b1ca6edaa03e5e73e7a298490f394a2884690c0e012678686eba4d32a16c1f049a0fc2417627cf36e54c918dd0f86ef37fe6555b5ce80de18999ea08a537a2";
+      sha512 = "429aa2cf388d1efd0e6d9658b9464d06bf6aa42cce1b9b0d4bf2d85a350fbf307d45a205d9303ff386fbbba56a637c19d6c7695a78b9947d29ccaec285053864";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/as/firefox-51.0.1.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "1e07c2cf24eb3aa244134d8ed1d11dd3b1151b9e700921afb60336491c0f301fcc4b289e354b490f9d84cca96417b09dab7df06951f8568019976e2baf999894";
+      sha512 = "670102d9e6b50aa44d9d035af068dfd55d5b009a8e189e0e0d1e6d3404918c0e009e3e573b3de2601801e7c792746885d32aeb48235921c4cbf7874b82f06a73";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ast/firefox-51.0.1.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "dbdaf693ea1143f78fe3a06461d0a1653c57459633b1d5236a9c3ce74f1c888664d7b455fd0fb2733c0823c22088d58314ee9f4ccfa62726257b83fe1cdac435";
+      sha512 = "e6e6236bc496bab83bb64c7fcd2444d4f81fa49c9b6914d2d9abd2cced829f22b75705b3755525277d0d5a1193d0766cdaf936423889c77a2773ab28d953c738";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/az/firefox-51.0.1.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "1fbb9efa1dddf1577b5532fb59f73994c54aac26e4ccfe643204224844f5dc1398ae077703b5df33589646257ad2f46ce4bc38a3e9575c8842c716bf18d1c497";
+      sha512 = "16b6fed737a5d2fdeb18945cd71f8e844abfcc1402ade665260d2644612579e76111a53548dd5c645c5816fec7c8162df91d687eb6b9dc84ad520af2a9580dde";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/bg/firefox-51.0.1.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "fee53d9245bffeaa7c696b1cdc2119b0f683caf9352ac2e8336745e45a799ef1729577af968006cb2240a49872673175f3ec0a706b76d4bc5962c56912b895bb";
+      sha512 = "dd311d55e182408ba16853dec80d13fabc957e9ff9e6098f040698b35fea28b4579827ca35b21188f1e6287b749fd1ac94b3bb9979b75caf5b10b90686f425ac";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/bn-BD/firefox-51.0.1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "d6909918b51dd5a1c80909e480de0503ef85ffb1b53a7421d134386e5db94850c1605eccddf588b4646aef90e91917b3fb0c74f6560e1c0543d45a2f9fbd8bc6";
+      sha512 = "857a13768160d71dfe5dd806933c85006e63508b6dce63545a0618c20531204b672dac7b2634dbba3a453277cfc53a9395215287ea51b18642d8e8c97258c704";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/bn-IN/firefox-51.0.1.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "cfea68c984ca43b840d3d8d13347c3ac2ba38e5d38623384aa5a3559b6fe175415124ca06ef3f4848193fc20e0ee0a6c4a497c5bc3b7589e05cd756bfa56bf53";
+      sha512 = "602c352dd5de9a90128318c72496b2439531a5f4c4d16b28060686396db0b84c1300255eb8cb5dc6e6560971e6283d3c4bbe4376939177e4fbc0192898922a7f";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/br/firefox-51.0.1.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "1225ec28b6f63cd5be087a61f0f6761362bae12ae975c2805e109019fce0b0fc7dce4bb0e7891bffd18a8395ee41f6344ae654314894c1fa1eb0a30851ea3b21";
+      sha512 = "fa8ba39abf6691c4127b5d4f6002405eff04fee2522ac274ce57c349ae042f5f47ee7cdb3519608d6415629aadf6a5894f575dab79ae3055fba383cf2680cc54";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/bs/firefox-51.0.1.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "7d5bc886b60a04aa81ea77d412738ef350dfa6c76c9c653d5c9f7627717ee94a0ed9131d3a1a75f25306bd496eba225e9a645b44f59fcd5a16bea64a128664bc";
+      sha512 = "c8960b8cf4055c7a9032a3d5c10bbc59bf1b828909bfcb57f45a8d05dff07111d18da1644a18cdccb653630d77ebc17d435109d289f1d378335db043ae2c142f";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ca/firefox-51.0.1.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "ebeecb92f79a67c1bba9ec43509a431328318607c7c460f13ddfc17d3253ad4f2de06cef27ba7adbffaab2562af48f3eec8b1b5137d4b8abc8b2a960515fe9b3";
+      sha512 = "3b8cbbb0b8a14640f2b919fcfb67d4274e6ac9c6f612bb4baf5c368752d76fcdbea7c795cdf23b00f3bd64ddb2ae4af950cdb7a0637f621ab0ef382c1f6933cc";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/cak/firefox-51.0.1.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "d507417ce14e60af385d8cc3eb16b74d311ae50797bc836d0f137d2ed69f41aceeb4273a4f10de64dc1d93ec29952e3a95bea6bb1c628467c410266edf8ddfc6";
+      sha512 = "e7a325d7ffed7db337c5fa4c3bfd31bf8b7703041de16f8024821f1d89487f36131616d460db8518d71d20af4285d43a040331d304c5b828fabdce181f736965";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/cs/firefox-51.0.1.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "60b1690077c1375df44642ec55954f690af6240a2d1782c93ca1df6cda7c64f50bd0034f6d66f4629e8d6d5716fb46afeb2850201d63d72f6122da57bc278788";
+      sha512 = "32a4b758b2cfac67f19a7fe7ad7d04b49122921e2b3c1c8236d8be3452b665aa54c13dcd9e2d2b298dc017b864f56aa9b6f06d174be46ca41a722226a15eaf01";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/cy/firefox-51.0.1.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "dfad805b88d1b928253a8d86a89581b0db4cb505b373d6488cb05701048a1e99131b6078d337cce16f5fc7daa0af331ec4fb328329af2c663af8ae28a221c58a";
+      sha512 = "908bc9d3d9ada201a2fa81a83f6773c635c3dbec0e08b464c6dab5a311d667291fe7f5ee403ff13e5cd923d01cbfc0d9e2a0de3a2a7469af4bbf4afc8368ef4d";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/da/firefox-51.0.1.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "6fcc47e0a019fc5af5fb14753221a89bb63c18d4695ed2a369781b2d89ae0c1c127cada90582908ff690d4b08015686f963bd0df137686cad99eefb31dcf1bb9";
+      sha512 = "e10fd9c7ee4496a674cb18414f0bfbd1671d21aad4bf41a63432540555a6f4059faf50e488bb76241a1e15884fdf7c43ec289e2641d9ee13f63985062526cd07";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/de/firefox-51.0.1.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "31efe6ee9551246018811a63d89274dc126955745ca68c97035f207ca0b5ad250b2f8672132f6ca5c70676e09174f227ef9e1b5488857a9a5da5b5fd41fe2aad";
+      sha512 = "07221eea748fbad6ffca0b7f77e4995039e28e506a790d5e858d4d88cd80737f1a366735a4a826358a9aa76ee1b454d99f8fc8732f4082e91c9a9e5ce40a9b81";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/dsb/firefox-51.0.1.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "f93c6bc53c51454128f0435eca79cd46f94e49e1513854ceb9835322c84b282f81536efefb6520f01842ad10c70c0d85b72a89de9952c03fe8626b3a02ad2bf3";
+      sha512 = "9e2f1eee45e5dc1b8f7ab5c72c734c85bdd21544500c45ba1b85580cc110c02499cc69b596d979633e64b3aee7b1408e27862c761d4451b749399815199d3694";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/el/firefox-51.0.1.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "8acdcbe7ef6a977a7f59e1543b960b428faacfab756b298310c0971d0e90b10c382ec211d7866ac5aec2bfb15cc9b276be8bb82b8f036babedba989ffed3664f";
+      sha512 = "270b1fd5fcf6958929e81c38a5ae2d8b5ee3de62e64eb6e7e7b80a8520759f1bddf03eec408165853ae624918194c57c2b7b496b4146a78ef42bc4b5b77a1d55";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/en-GB/firefox-51.0.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "3aaa1f296dc15a5e2555c5aa1d5c2e2f2ff91ac76a65955cc633b19bb50c449e0d0e1f2b6772278884d4d9fbe3d35c2bbcfdb3f85e23838bf132aabe37b5f117";
+      sha512 = "79bc0e031f3ad065e5309dc20ff509d9d6fa85c2669548b24be9e2b8fd9347ce354b51faea65943b421941ba20d8d0fb22c79b89ad380a37ff52ccf330343f33";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/en-US/firefox-51.0.1.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "58bfd3dd0aef94d735ae73779ef8d729bf421e48e345baf413c0bdb5085644a79dd786a4e21713bd8006ba2e48d3a3cb3c94b97dbfb5d90f546549518770c88d";
+      sha512 = "724a778bf54c6778838378c07481c5eed2cc7984c1a9809e352b6bcbd2562c060f6f39b6308caec2e62c05f8631753796a7b2714afda0606bab70b3ef3acc15c";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/en-ZA/firefox-51.0.1.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "67b05904cfef62154aac12a5bcd77046672a599f3df323fda5f12e1bfcccd0bacc31556c6708dea70c1b459e7dbcfc7284248b528aed1fdc1bf336eabcbbbcfb";
+      sha512 = "ffb4d4554ffdab057507fe29c0fb56a74e683b3bfbf19b26a52f23336918c788a476b549df3b4f57dc79c555bc36af620f46bcbb7c6467855952a024c75f7213";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/eo/firefox-51.0.1.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "87cd52dea514edffa98ce40f45a209a11d1543b7f23007639e66557dd687824a9aa785f1eeb4b1f3aab17ffa8ee18e3628eba592dd3b91c940677e18adbca0a5";
+      sha512 = "42768a6de7144ccd63c6a58c6fa2913004cdc3d7f35bfbb3d47ecc8a705672d2b95e8e8389fdc6715bcaff48b2c1a335c23f39a2c07d03b4cb660146fa811a7d";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/es-AR/firefox-51.0.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "d731b583b8b0ff0ecccd3bd1b32fcbd0152a353c6eb9525866185d8e42eaf4dbf13ff008893b7c35045ac8a699608e7b7aef4a02c69fc764cde12cc507f5afb3";
+      sha512 = "36da6cd0f8aea2419ba618b11f47764510c109c18bfbac380234b10c864a991a211742be3c058b4a8a59944324c7b32f65b4b3b8a9bc25460e6b4ef99e5d12e5";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/es-CL/firefox-51.0.1.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "4d2064a404832b26364691eaf8923adabad698bc8ad1bb0681be36ef7b154f02f3a63c8e45ffe848891cc33af9f4992e3a8ff0240db78028a8148ee250cbee58";
+      sha512 = "e3dbcdad48741a73aeebc46ab4771b4ea2324e6b0a9e6af020e0c5929528458cc3d66931dc67de4bf93b90afbb7f79078436c3da1ddc35779fbf40b8aad0ef1f";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/es-ES/firefox-51.0.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "1ce27c43e05606d837c65f218e144e695a081146b868e7a3706a876744db0e183392c63f992efe8484d398ae02d521ed6092518131cf4b53647bdde015cb8cd0";
+      sha512 = "1353c9d7fbe55d579486488d94d34b5acc0a87f6155ec2aa106ad6b2df53ee6813e19346bbfd920d5d0582bdb9c16dee667ebc384d48e06026fcf79590dc30fd";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/es-MX/firefox-51.0.1.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "2f0d6765fa85678f8b9a4c820e2e36ef3ad8fbe50db07cd3ccb5749b62aff3026eb09316d4840fb9dd537581ec39753205923460a150dd7b3d4c812fef8dcbeb";
+      sha512 = "fc93aaa68159c75d5c53d253e71aa87d099f499ff54a10606f0b87912837a1b85d897719d69753f6f84d389cbdf64a4a9306a9d19b809892032431d1a142b03c";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/et/firefox-51.0.1.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "3b6675306eb32e809778386ea92db02a5b4274ac2e62e0f071527fe4ea38e862180d2fe992c3e37f49e8157c1910ba6600256121bb191c00c80c236d3333c3e0";
+      sha512 = "e665a3e923bcd1ed070c1c4852d385f61ef43b5e6b39ad1eb0f547666d9c1cf82022638b9b60ef25f1621499ec930fec09367634ac972f7ce4c95f9bfb21cd15";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/eu/firefox-51.0.1.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "09b87fad711ce298c53b468dfa561526390c8c45c3c2edf25a76212889b7a1b965d1cfcd8c60a15fd6072ba3a7fc3a26e40a9c92ae363295ec9e2a0d12039fd4";
+      sha512 = "aaad849c7de92f4dcda618b882b82f9c1ccf1de45454162f90f7beebe060d2f2c53e21dbc7a50ccfe24c505608f45aebd1744900647d7131234a55e79e4e8a6d";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/fa/firefox-51.0.1.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "b5cb640ddb95ed2f7a36435b5a6c22d562b35e44506d0acc61adb5341cb0fd1a092f1b64257af190d8e6d8e8e5d956cafae3f6d116c69bd22e4c19bb78fa494e";
+      sha512 = "ac4f9518cf658c2438bc6037cccbdfc5f3af40b4c2ec89c6ef82f43b171f3d781ff067ad096322cf316c4b46dd27f7e0da68291289d6f03e81d1b90f3c436d2c";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ff/firefox-51.0.1.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "15cbf240bd5302d984e2d63a239e3d83f48b9a31413d81c2b76c389d9ff59e9da69c759efa925c2731d070f8e12fbd7c9791769b4315a991857282a745b261bd";
+      sha512 = "0a788a34a6f8ac67da73ff0531ceda803a911f30b77957d31b47e5acab221a55501daa94643ebd2d824b475591edb147ae66a06fe2641915c8a18adaaedeecd6";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/fi/firefox-51.0.1.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "b8785753cd8192653e459ad92fbeeedc88bb860d8b2a1eab97a4eb16726ffe4c70f4a27d14fba3d987f0f5c187a69fa473f8ffcbe34240cb0bf0379ea72e713a";
+      sha512 = "c163e07e2097469be8dfaa57b6b722e9787c617cd8833e043b742a4d1424e7835e2c661412aae353fe0373bd163548102fd0b30dc37fbffe53444f0791c1777b";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/fr/firefox-51.0.1.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "418292c6cefc45a33057062d2a86299479ca0001fafe30a8369cb79e2390195dabc379001d2060ff3175fb96bbc0ce6063a2fcd0e8294aa8fcd4c231eb7a6dd8";
+      sha512 = "481a00f96cd79c04fde00ea39e560193575c1244d6e13c38ff4a81299cf944909a24bc8c8e0ff2a280bd9d4d7e8ca77b66e0532dc0643967ab52f27148dcab5a";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/fy-NL/firefox-51.0.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "07db4c4d56e4d9416d8e2c94b712b27071e66c906c189f615d1e15ebbf9b2df6354f433ce71ba8ea60da870e1551bce477d256cccc5f7b03ce2df37249b183f2";
+      sha512 = "37d8b6df59f8433efbd55de434b2639e83b6306065017b62c8f2d1730dc84842081abd9669eb48ea862b36c0c62f84a0ec03eaac7be17463129b46a03426d8da";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ga-IE/firefox-51.0.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "950fd2a1d7280574ce4f50cd6be29d00cd322fc63c41b7babadd5b615cd12f350e2f2aed8cf744a753583ef313a2fd6948d5b3d444d49bcfd865b1df92b80c11";
+      sha512 = "a6516adb884d070f4e6265e89e9a20b99f06f4093eb01df612f19748a1dc5fa07ed949a5d90030b8c512203717f0c9cdfdb307e1dfc2fbcd9def2bb7caf92dd3";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/gd/firefox-51.0.1.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "7d0174ae5c3874350b8c2444c12dcecc180261445f1cce36a196196f0040057d8b78ba4ae081d287343e7e3455410662b55a306d021c536e3b5ffc4705048051";
+      sha512 = "1d8710d83abf7e185aa73da047efd15d7e0b9667b80737528900a15b9a6aacd20588c963366f2aa08c7772444843b642e53bb2d3ababbb8b9812926d7c5a858e";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/gl/firefox-51.0.1.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "68b2d8a3f53ed32826c70850af3c8e7507e7aa5b19c0ceba86d4ca5759630f28250b67cbb3727b524c80b66b03af4e6ad7a6d1494743e28bdc8cdcd4bab10824";
+      sha512 = "08fee9be09fa365e188cfbe00dfb50c9b82a5228ec9d9feac7b4f01de43097f20dae4cd4f05da9983cff7d9504a5443854e8c13e8114a0977e65875406942007";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/gn/firefox-51.0.1.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "ed0786dca5c95efede7c9c58b0f8b2a08068fe309b7456807d96c0681fb963ddcda1fb461cbac96c20472b0b084abc5fb2dba3f24f5f763d2d31728a3b16adb9";
+      sha512 = "4a21dc3c3355c08bf98d6366acfceb84841f50f5686dac61e87def3995c0e0df399834640722ce1c278e461096996320d7eac9af400bb08d1bbfb95cbfafb694";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/gu-IN/firefox-51.0.1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "f9d6ab4c713d3f3f1c9a2328290668b7b65abbb739419f74f262da090f2b88cab96fa1ebb768626b9fe84908ba92554a1c556281ec7c97f65801af053a14f195";
+      sha512 = "0d565d1e41f9b57cd71d30034f576877650941c4e2250b49668232aa7cfc9a3e8c37dbda3e1e8eafc594fab09ac90e4b3f6b52c90613a9b236d9dc4092c65e50";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/he/firefox-51.0.1.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "c1129b0826fe24b3bef9b0e1464fe8e6116f595e8d201d31c1d442255ba218d3614d88fcfbf14c3f52ce7119de61542a49cd2b4cda6be92323006c59073e6d29";
+      sha512 = "c0c87223d0c51b2d4df51ccf1d48938cbc2860f90b32a8d32fa69c7a4768c550deb9e9ee3f720404d51fb1461e0f25b56dc927449acc6a5d5dd23ac64fb4bf61";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/hi-IN/firefox-51.0.1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "0e409a2ad739a6f180811cd6df64840c1f35179ee2a3cda615b774784962b1cad8a35196ce05ff332778fdf250b23dcf0e7a157524b43759cc89ea39424dbd60";
+      sha512 = "6c0de623688af6a3eefa1a5a230979d2342d2414d27acca2e64646a9c82356cad47898d9fa791202bbe97464fad6e0903a12d73b15088d36062e89132c8e6d79";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/hr/firefox-51.0.1.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "159edb41972a2abb884c8b5910260554fed8d14d26e828f78fde9a13d9fc7a1e57803965e36e23173c224e02c49ad9d483729c72acf94e80824d4d74ecb9a694";
+      sha512 = "637ab29f7bc717b33007970bc23abbf75bcdc39df3be75c71830ec27874269a948aefdec854bf051d702f4201525a279f3f250734a35b773bbcc44e47888cb10";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/hsb/firefox-51.0.1.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "190ed5d87aced775d35b1bf909c1c832a61bd6ec8c2053724d948952d8eb2a83b7015b62589286f90ca09b02acc75f904f46a5a155720e7b728e9cd9c3187a30";
+      sha512 = "92b7c0e1ecdeb485ea616ed025589add7305be63d401c37ea0372b2bf75d90c41fb8fbdb99de1c21c61da6f8f59ab1c403d512cc0c19828c10336a9f1a315903";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/hu/firefox-51.0.1.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "a45a9a5e6af526acaa23d4b7f84d91ead0eb581989def50d57ed82ca4b8aa00c0bb6bec2ec891d5c154d0f4472fd72e7bce9a619c1860ea27dc9dc3f627ac8a1";
+      sha512 = "04e1aa441756e4452d1f8d762a5ba16af0121a3dae2a1fd1f33c223531a5f17f5cd1713b9fe81ee2c3746117df8942c26ed8e27e39e82644684babb060e32eb3";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/hy-AM/firefox-51.0.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "242a85f6329090814ed94a3cfea96f3c4459fe751e7741844104ad93913e5f3a27335ab736746baf89b06c619e062b5efe94de000137e4f26309cf2dacbecfe1";
+      sha512 = "a962703c41aa3a9712b9ec98b5c00b621b844de5e277f98db65f9b682222ef580e2bfb259cdd6fc4a165ff319ba62daba3e0445b4cff0c47e4582249e6dd1add";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/id/firefox-51.0.1.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "3ee7915e8b8d6cfb3bb2714ee8c5c6d25e27e4612389c33a1ae34b230afef9ed24dc4bc2debbbf5c1fedeb60d843c1849f754050a0c1153db3ed6116cc7c0a70";
+      sha512 = "fb8a70915b978d61510f843de20e3f6549331fa5e625fd831b1ad7745e33c55cbfdf0afc8fad51e82b92ff60cf88a8a9bfdf4471036aebb75380b713401d03fc";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/is/firefox-51.0.1.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "8df53c86d929fdfe64393d8005c4e5a8c1d7cc25a088699f26827cc917d8150582faac8d312e209e72d5a0d3ea53c17688f64f58f76944519df1e55d8fccb82e";
+      sha512 = "28af7725b79fbb2ea49514413e886c7e8572d55d943c99c2a08887ba8371526e3879735ca29989465a5fc7a35b09d781740b97988c3667d212c5d3eed5467e00";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/it/firefox-51.0.1.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "3fc00fcb1ed9d024aaf87ef82978131333958661644ade9aba463247dc1c0f9110e0123b9a3ad050ad1eed449300bb4280ae92f9721e67809acd5fd4842b7192";
+      sha512 = "c470694846df0b78cf0a9b43215d3e187720953508109e04b6d11c2803dd981bf4c0c2116e804246f95643ea8a8c47c4c4cebe7cf45a867ae50e98b34cd68681";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ja/firefox-51.0.1.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "0edf9c17390ca3f75441808f7b54b2f5b61028b641a35d296d7265acb64322827845ea089c2d1149c55514513a3c76903ea3ddbe5d1bafe7b8f1e35fa16ba5cf";
+      sha512 = "96c6f130818df3e642c3f43ea05180629ab9ce80cce7da668873c7cac7745d5448815d00c9dc7be88e48384c0603e2019fabd5743e4c48da6aff4495bb54c740";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ka/firefox-51.0.1.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "996747630e56969a5a1fe238a1503d33353c25202b8c795300bb6b6c5ff313847f85ec5ee5b53d6862d124bda0628c734098a446e62d229dd4858ff33c41a911";
+      sha512 = "7559a392bb227029cc6950d21e222f48744fa7cdba666219ce66697b7ab97c7d036539ee4527d956a0d74c2fe9fd6129c71c6a0faf36062cf001c2b68c973ceb";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/kab/firefox-51.0.1.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "128e2f29ceb1c22376ebe81a494ba94d50a7cb4693ab77dbebcd5096ed9494758a989aa6db88274c9e397945f6b6cd8d2a94ba35ead6be05c1e78eff3c0c2618";
+      sha512 = "f98b871784261f0569aac50f10780bcc79e338d0b385c605a3e348b050e54279e4387daffec826710b8703b2ad38fe8d63d54cf3c12d94da8368091668d9ab3b";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/kk/firefox-51.0.1.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "6055133f8531df38726ec46e6a9f864cee6b04fb323c8008b098cf5fef4b1cddc1683bd94d8659614c3379a9cae38ae1e0a9f8e2f976ab0eda40d66a6a04f8bf";
+      sha512 = "6ecfba23dce0b0ec23c4b309aafc6b6d89a69e889be31dcdffbeed90da4bbecc58c18dfbee6dcb9e09d65a495fc57535457aa7750ebab364cb46a73c548724a4";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/km/firefox-51.0.1.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "4ebc9142914314e8dbde018dcd245d3905781dfe5c31969ad647b6c6c88bb82dcdb1cd943c735f00130a1da26dd08b64990c51b1852465138e0689556b300e21";
+      sha512 = "b9eef61d168e7f73c537e276c7c4d4ec5ef4e886c10c5c1e0d16c22e07fb68ca39d64b7c0308ae662c73ebd1d1a760638da6000db4ed7a07853f096632df690a";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/kn/firefox-51.0.1.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "3444bcb239eb034b2d9d18b0b957c9ce69a7bb884e6283825553a1aabf343865f914e965ed8d25a7534ee0ea33622f85a6c13c48ae455703ff5322000cdcb335";
+      sha512 = "df5cae66a6b62d74d3b55e96135099bee9744edca2e5f3b0e8b21aa9f3cb6228d4477c63d62c18f95eeb06ba774187d214cdf0161be20c7aed7ca9d835722f11";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ko/firefox-51.0.1.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "b81ab42cd90ebd07b9d39b2cd12cbfd16e732890b5b9abbb7753bb5980c2c777de93a2ee3415f2ad28928eb7176fbfc86e4fb59e6d01b2dc69c3652f49aa1b07";
+      sha512 = "c5d023c4f0034950dbef00bf4ac4945f1e8853e10fbcdb904268bcbb855f5997fa091d7739683776af097524a5a0a602bd05dbab9ede702ec8532b18465ed47e";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/lij/firefox-51.0.1.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "1e14cfd6d66e8fdf3397bec910be3cfa032b5653f5b0ed5a8abd5eed4e43d7ee81b51d933e1ec1afaf000d5c4dee2f2c091c834b0559be7addf0c706ac87e3ec";
+      sha512 = "1c25e8bdae267c9673783f55dc99a23ba14c904a6763950098591f3a5db2e0007d11fa52506ed86018edfdffa5c3e6a7d3000bc0d30a69381b3a92d9f14192a0";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/lt/firefox-51.0.1.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "8c8ad13eb19ebe66f3920fbcc51e99902a66224f2ac3035e929709597522a29d65ee69d6aa00e0b6994b34069088f8e34abf527d7f23e8f216aa5824b8b0a200";
+      sha512 = "7c95e21dae9a449617f3405614f8ab934fadd93de771a4aa44a718ccb20e2976922cf88121d9dd3f2fbee892de7d435915b0fc7aa80ec720b297e668beeb042f";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/lv/firefox-51.0.1.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "0eca04ee8090706d24c481e7dfc8424fbba1106cb42565c57c2071c8089da043bae76294761960d23e0c52fa17b6bb43a74fe61c481875639ed956625d055c20";
+      sha512 = "61928f84cd78ca91ad758e4b4fe391a3d50cdae457c66a14511e8770c0f1ba76c986c8a1e07728717642d77557fe8d7f70513f5cf2884566e092482f5b98e18d";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/mai/firefox-51.0.1.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "7c033b5f2960e697ff21fe20be9e59e80906fc0b6e40edd8f12857b7e53c79cff2c3f5b90f084a11750ee4a9e8d7db014b40362bbf70d857db013929e3ce503f";
+      sha512 = "61ccb7600c1510d6e0480f35f63286cfd095edfeaa24e9ac2540a22fd1ea0c246d221e6e5b4d1f68bdbb1c9071b480240bc660097d2a761ff4166e1b3a6a629c";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/mk/firefox-51.0.1.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "5af4666ba379a7c70ef23776deaef3a14724e2c4acd498702c7acd84548d978e2f563def0227152864ac047979b24dd6de601dd53dea046e7bb7555c914b9f26";
+      sha512 = "89ba4db24bc1e1689925885446846a915adc1bc590f2f65752c54cdf6a69ca21333a4d6ef1b3e9d7252fb890de0ec41b0c6c229b9cd0d03b167e1bf4829befa0";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ml/firefox-51.0.1.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "acc0c1a8ea26e245d031462c9a535a149a3e99867f65117c427868920413b0c7397505f36fedcbc4fa3b4307380196abc04a6b4f50da07ca2a072a6add0432ae";
+      sha512 = "2889ed4020dd1ef59d90dcf727d2758937708b1189bee785640bde9d12b32fdd252cc181c193462fb01421fcac7fe71f5989cdb21a46d8a27939bd814dec1177";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/mr/firefox-51.0.1.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "adc68983863c262bebf01c3cec52690a8351e161b857fb4d12acf4b24b9985d74fc8d55c48f09410dc14ffb0090303c8a604d3f3f427c57d8bd7383073504ae7";
+      sha512 = "d85c03d1dde8003d7f877585e1bd86bf1cd9c3685fa2a3b25d1a0cbe5496b9cf09aa44940babe42fecbe22ab8a261d585695bb441b2e84f29fe4d9721b494361";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ms/firefox-51.0.1.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "976a78fcc2db7a52353f14ee47ab80f7467675cd88855b22ad01ebdf3f793771adbde902e2e717f860d112654a13e4ebc0f9a93220166493df34e602176a5509";
+      sha512 = "9e88c9ca69dcc1acb3509d8197a73af221b38e0154e19a0912743064c1a877e23f9966ca111caadebd0245aba019832720aa7e95ac9bcd41c45852aadf7607e3";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/nb-NO/firefox-51.0.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "7ed2c61c430ea79a21ddfdf6915fddfd8c3fa92f39f25483eb2ac333fc904e7a338af7318fccdb569938ad4b9f72bdbed94cbd57f56ce2cbe61d038d9df754b4";
+      sha512 = "2b59fc05c2bb90cdd1c8841aca920bb9dd2f4ce125384b1cc91279f3e125668e54bbe8e73efab1d3dc018130f9c1188f0ef7d2d0031255bab6bc16b820b53ddd";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/nl/firefox-51.0.1.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "fdddc7f023aeedaed6494b2f67bf372284280c9d99bf77186150dab0882dafb185fadeebeaf77c6ba87cffbc409eb68b610cde39795a23a28635e68022a6cbf8";
+      sha512 = "cdd2c8feacd7e22dab6762289f9fe7b42dd8581adf70df47f5fe1c69083ad369da2daa8964f846787085bf6932abada8c447b15a7b5693cdd32f4c00eecbb3e8";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/nn-NO/firefox-51.0.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "104e51e300cf628d36c4d5fd677a489b67bf197266787ad2ba531bc33869afa4b49d14a43e23ab7f1c750fb4f2ce07a0945dc779d88b21305545503c2f9d4574";
+      sha512 = "c902e7ad7024e0e2b1acc5ac3b1006edf1d4abc4213db17da4c92628ee3687051363645829db08fd2776221a3048f8373e3a13c6b02f4f13d81f420c93b03df9";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/or/firefox-51.0.1.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "2f847576b9b4dd5d231c21526c7886c21b7d11671f23165263eb555233d89eded61a6a6f1ac4c56823d0a2649702f285fb6e8efd8cec86cefb84c94bb762c7b4";
+      sha512 = "c62a5a2135553015bbbf688bc35fa4ebee02cebb5593f7d31e30f8648bdb715b37161d34ac8310a1a0c0f651c6f336e44a71097c6b09f5cb480b0f0a17e3fff8";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/pa-IN/firefox-51.0.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "4fbec873e3eaa04a1f3842aa0865454b3f13ad3b7e2959fcaa518236cbf99391e48b638934f1950d889994f76ada4eab946c9f28f9ff07796d46d5e5c37235d5";
+      sha512 = "d993d5808649dc7367c38aefe9dbd49d3e434784dc515e1203260da6a6d13968971cb63949f1cf9188d5a05467f07b420825ab752e7ef3f556ca37853f841733";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/pl/firefox-51.0.1.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "4155fcaf556d5fdd5d4e74a3f70927035236432a83c9e20e4b3900e2c75f74a04d630ea7a74c0e3325231c36e0c06a32a36ced31897d36a15b55ecfcfbd53c21";
+      sha512 = "e58720685e6e55671c332f916d65ea04301fabb05bc250a56c5aed1f9b1044b333d60ef729e08ca382d775dd35b86d84dd266cd5d5bc0d275f58350a598b7464";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/pt-BR/firefox-51.0.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "60e70d619c46ea9e7b8822a309f95bc51ad4d3cdd1ce49afb3fa0d7c6bf6f478a27e0cafdeed9217af1ea51b527394551a0ec6ee85ab62d59425c409c0a6d2a1";
+      sha512 = "f26934daddb1f43ef364cb4c97eb9f625a816a2aede791adbfeb3cf959ef1b1c9b75f2e1bdb907be1ea4640956e55ae4facdb67a3323099b12cb23faea0891c1";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/pt-PT/firefox-51.0.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "ebae124b88595082fedd8a692ed3e5399ae5666bfa92d2c0d0cb75bbe9c763679beb2cd27eb31ab99adec15f723ec62096bba028655ae094808a8cc05071aae8";
+      sha512 = "ea0657b1966553e286bb7c610adcea89da7d435675cf575ed4858f207092f0eda5dd3e91a5127679aaa3b8a17efcc660c363327f4ea20590a890cc43d2ebd5ae";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/rm/firefox-51.0.1.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "ccf8792db2fb2d0c3e26c2ab080dd6c03587b5827a77a15aafb6db1a2924eb8987b27e0c9ef8160c6e91377785e998926b69f3acbca050c79a8d5efedda7460a";
+      sha512 = "197b212a29f056b22d3cf5c881bc9dc1b2cd8f47ef5e90573975a180743d81e696f5a3a3ddcd414fcff66979c6fa0e33332e5ef5586ce6e0d2f3ae7e939cd9b9";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ro/firefox-51.0.1.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "af62128c8bc705feaecc52c3dfd15970e085dcfd7912e6a00e598f471a45b346d56530209869f34069f5b7830ff0a486d5bdd0b095f7a9a6285ba9ae9f2aa2a3";
+      sha512 = "06143af441806517a03a2ba1293316f1b2979cefa8395ed3b9f3579cc6d23da8ecdd219c8cb53f871d544149e0e2f18ffa9387cd57b2407336866775c56dbcf2";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ru/firefox-51.0.1.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "f48264fa017ba40a0e43af9fdf2c3591b2337b09ac5146d94da16a2ddee0a5237dd1d99210e3baf94b949ac03e3cfe04468fd9ed27543b62d3b0c10e77835de6";
+      sha512 = "9680dc697f2760163737a443b345c657da6eb2cd6d6bfab5016675815cdc4a4b393f6f9b91277bdbb2962c7cbd5cce3670a633398a5c59d86d45d47072a72b1a";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/si/firefox-51.0.1.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "d4496babb189fc5077b6c6689a54258534b94ce7034cc57a2892f2164e10eb5ac128b905e6e1e5cb6ffaf3e15ac7a0b0c141516a5e03b58ea1458fc3aefeb904";
+      sha512 = "24a870b434a3b58cb93d229f12b58b2316f83e0be6c5e30ff724468116679a90887269af42ffb0080b4bf0866084afdf7767d8d17d3f34a6dd9c30de8de3aa1d";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/sk/firefox-51.0.1.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "657dc82b1067ba145d8431157411dae31420d0fa3145005319d7978736a7faf48aede2dbbeec1994d591c0ba54293b83340da5105ca298ca79407015ac90a338";
+      sha512 = "60e5947239a89b616616c1a45375c46463b3a0ff0b2c5d37a4f5eeb6cc8992f21ee5ea87592710a89e1237512179fb84a93f471cbd8e8d7a8dfb506cec39eaac";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/sl/firefox-51.0.1.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "d4122054acaf61d4258ed5646296702d68d869d96a1d39636ea1ee833ef4649003fe76173be4aac5e829cb946dfac709c69c82d668729c2b75376067300cc06f";
+      sha512 = "c3b87002895c5cf12314f7f7c1d784228b50b892eda9c2e94a7630aa5f5bbd35a27963cb008063b53869ff18d6d003deb456ce6506f8a52c5ea11df3b736c312";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/son/firefox-51.0.1.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "f74a90d235203adf179c4874a8e429d3618effe4bd5d8928318b74769fad093c5e8adbd69c7629fbac108d13fd5dade65e268dfd419650498a0be3c925e5088f";
+      sha512 = "14437f5b71bc9902fad66e9d7cd3ce144c1dd19a8bfe1f6ce66f7f456da165cc9453b9f314e67e19fca3516d9b2a03b950befa96c2d36cd96593554eaa8a1aff";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/sq/firefox-51.0.1.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "815df30c1180c9859a3ed3c34daf8c1ffa434ccddf356691b92bf7db7a3daf6e7e62446d5720d03fc7cd98aeee0eead2e62def2410cca6cf25fc7f139027b8b4";
+      sha512 = "286d680dabb398e160a1454513938b46d32ab054136b5682533e41d1fea4d860ee192b7de48b822c17ee0386feb05ee2325fe1f135f82b28e8c98b1ab485be1d";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/sr/firefox-51.0.1.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "70264d2aef00a51cf773f1643745b84baa239bf7cd8b32fade26f7d8f56fb7ad00ae95922bde87e2ce368876d3946f7193501314444ac42c69ed0c0d9c811b65";
+      sha512 = "980ade36ef136932d668222af83d8be9180070c210813abd896ccf90cca0149af2f1b634d147dc63d88bc91a4a9b2411ac24ad50632e49281fb704875e537383";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/sv-SE/firefox-51.0.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "1252256ae15324828995d9ae3f1db02de62ed78f1fd127a98f63b0122e52ed3d526ce2fb83eceb704a11c6e113108bf58e44d88254247a523ef53a2bd35ae9cc";
+      sha512 = "95a23a1d149cb95927446fcbc74a6e083b390f1f844d3e783a003f2f7a6699e5f0c72b5090ff9f0cda27df90fb2d1bc34c9c70dca33ef22bd1330e916a1de42d";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ta/firefox-51.0.1.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "f29232bbe2c154e7db72c6f6a510cc113544c0f78e362f595558a4e20a9f2e7a211918a96985ce54cf88dfc51f701af99dd5c6db1719763624d038ccea55c713";
+      sha512 = "0fff10acf1d6f427ad848ad852395d70b441cb6a1fb4191ed4671dcf4320665bdd6b3bf697b75331650adcea2bcde8bb07b98e6d0c65912b1573bad6509e35a8";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/te/firefox-51.0.1.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "5fadafe8657fa30af9771603c369abce6bda416a725394282fdf3443b1b50e8078212c0d016a146940e5fb5d3e485847d4754c690d81f5cb61256abfeff3e0bd";
+      sha512 = "97fd1e8ce3b2910b99a10bae70b8b2f70abbe7d6306045bdd9b2cda65be070fa2cde5ef950716a22eafb6ac4f841179fe7b982575e8c7ed43e056c8277e5f744";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/th/firefox-51.0.1.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "9e831d2a54a9bb5bb6be7a07163395755f1a5fbeb2515f57e28f714c6480497d9203c49356849e908db5788427ef9a6be1bd90c36c787183e6cf1aed4c3627f3";
+      sha512 = "9da048c44fc7d219d1c6ee0c1298cf98019b1cb14a552d832cb858063e00e3750c364a0bce93bd89a84156ed5cf0e09d5addf0723baf6e607b6516fe1a2a2c6f";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/tr/firefox-51.0.1.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "4bb5562a2c4e0feb215cb2d6da6f793824a5622bbe245c6d87c19350e3134e1191474f8091063b2c8e0fe63233739035fa6d92c330892c5ac6ab8d6457390c90";
+      sha512 = "7e8aad1d86a396de699c103e2ea422fc2740cd9d70128b30280901ec9df9453fcaf60346db8b1cb82c06ae51108176ef8bcdd4278c1050cefbe71a4f29b3a1e2";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/uk/firefox-51.0.1.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "42f2e6cc7cd7f6f2af6cec1bb22645df65f493bc432660f72af74a16d30afe2dd7954a1fa2c6b8e1471ff813ba6921dd34483b32d6fc849c37c3e1c549cae795";
+      sha512 = "23be58f1f0f75a89fe5ca96c8322b1d3c60b136f479a23b0b96c62767520aa1f09864d7bfc111e924da6c035b03b1eb3f271aecc5799c3c97b7a928c7c8c4a65";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/uz/firefox-51.0.1.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "e45f93233461588cb89e3e8b9d0c52c9600835c76baf8bc44886b6f230ba96f189068199b0f5ca5fe15a92cc2051461edb13e5fce94029459c2cee7be18871a7";
+      sha512 = "fb1f9f93ca6db9510d00c2dc55745cdce67c1e274a952f678d3377d3b3911b20b7a3649acc49c8ad4ca276ae42900ef6560a7a17bf90f758d67208655b9b203d";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/vi/firefox-51.0.1.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "445e13bd76b01cfe01c6869139d896614931ccc37754998e063390788c2fcabba7e4e182fe8152a6c028477fb21619f3fd18bdde1dd05bb8dd84372db922ef0b";
+      sha512 = "925aed6825e77fa78453cab5fc1c2e92e91be01c2890f4fc93bf148c0423a37c3b4deadfb96b466f56cdb95ea0a983f0f4bc2cc41fb1926a4659a701c1d7362a";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/xh/firefox-51.0.1.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "9bbcc96b73024fb0b618a373f5b9e64943e24207fac2e1504b25daafc45c08f2c7f69027f5a392c0e6d1995b8ff54742cd4998af039cd89bd376ff0008b61551";
+      sha512 = "1b4297ae13c799cc43b9420c3c6edc7d92700788e77f6871b939fba18120745ad316919b4f8d18528df8da12dea0896ff5e1d78f8699edc72b6cf1f0357c0b6f";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/zh-CN/firefox-51.0.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "6242bf215048a46692062de813f8b0653b8ba9efe5f39d5fbb98a9f73309c1e6af7f9095cb7c7ce7ff8c5b1f1fd8bc6a57bb420b6679f26ae19e3622f779d5d2";
+      sha512 = "2e9683de094417d96718fb60222d85206b9610123db9bced5905c50da21b42e03133160ad523eeb74df33206e44a6889909dfaa2418b043c5e8024ef871a1502";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/zh-TW/firefox-51.0.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "37664a08df20a85eb5b5551eb206c4bae7e357ca8fb9de5472e3a52156a1fe9711335204e7cc88766a13a50a64967e48c55a99afec3f08ffe46048a5f68ec538";
+      sha512 = "aa1abf501d2ca6bbe71cea5ab885c85f57b88ee68390bdb5a33047f10dbb4e5d4f3c506ee44c62ca293edd3515e32da70d23027aeae23526cbfb9e16402cd803";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ach/firefox-51.0.1.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "9e7e313b7e8a37da5678e2fc6e2b810816f3c5f433b82341c351922ddc551046d6668aaf9b983ab63e6240f97b543169a0cce165029c4c1284e6c715313091dc";
+      sha512 = "b01fe99df4dd612bd6e5033782e2dedb5416c7cc9f1de0d659f056371e24340423cd098e7775164c8e605bf895b69a0aae287b131c1533d3175d8ef8b183ae3f";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/af/firefox-51.0.1.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "6aa4de8f06c227dd22bf1e1f3f8f4572aafb499e3d30fe5b528d24ee905d8770d177d8ed954e1d3e8ad94aa6e716d31918cea0a7194729db2dc51cc40078091d";
+      sha512 = "e42c48a74351afee8e40a791dfa1a20a7a867b4fbf6fbdc9141d4905293646a099c032cb9b52859612d9d16983d11d876bcea0dbc40fa9aa88333345d1d1a788";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/an/firefox-51.0.1.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "2b9b54b35abc72edfa64d957a9b0d95cc5713a4b36beac47464d4947a0a2e640664fecbcd8aa579df2353f6836e0f81d4674fa16d33e168a4adbc002821de4fd";
+      sha512 = "06670ef25bea3800b7a5639ac945c99b7ca67183f89425f597e515385b63c803159a0b18dc27805b9e718c4751ef5232ce9b6ba39c16073e35f47e7910e47624";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ar/firefox-51.0.1.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "44c966f2563538178b1cd0950bead8d2df67ec0425ca7327e9e4e2cff7bebac06aeae5d26503c1339d7ac59f2e01520a6a1a7205d948d8febcc953bf30d56af4";
+      sha512 = "662cc92061ee62619d4b4f397057ec8142572c74a370be74d75c837e853b97eb17dc798f77e0736f3ca6acd0a4183048e81c5f8a32d57776fa72ab0dfd4f1558";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/as/firefox-51.0.1.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "99cf367af60162c073783539eb99afda545cef701616ae33ed66994c00052cf90812efd5c874a8b98dc2c51dba8330ab8ce99176858f6cc5ae640ab2fedbc210";
+      sha512 = "e18f231ea53351d473a0ac4a84abc458fc88eafacc4fac7093657c4b226eef7e52c5b3a4d06616e5556a49929fa79dd68a2f3c1a73e04b9d85ede8ff5b8167c5";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ast/firefox-51.0.1.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "536d4bde6cdd888bd06f844f16d16fd15fbf1a7743f8dae2240414a348e64568959a7655f0f69a0338826154b959066e1d5097cb51fb8e59f6366a61c6091b40";
+      sha512 = "05e174a85606820829b279b2226b6f1d2b0f24f6c0b73162b3eaa5955270be8db38c5512aa33c51b0a5df1db304537df5975f061029963eefb5eb06c0174b9b7";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/az/firefox-51.0.1.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "4c46637588a9b0874e2982ad4130bc42c3a4b2defed8ee81e4e86b06deb66bb9e9b877c381de4f247e8e13992891be2c5a01dcccd7b62655a26fc62ddee1c9b4";
+      sha512 = "b8fc2bf0d78e511b6c97a731742eb5d36a1ed74f4f6f5a58c8f6652d507b99a51dd6036654d0954488055caeb449be235d006377c3e376b7a650cd14f92945dc";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/bg/firefox-51.0.1.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "a8fb6c9f9c7041e833b6f05944b9769cb38565a773817962dc7cc0698c85b15c5f9dec6b354edbf0baa34101d44d33057e6bb78364ae294989b3da8d88b3c605";
+      sha512 = "e10684f0a0f841cbce17a6dba5aacf780fa0c3226f0638d48a29ecd5c22f21b0b882623be6269edba707394f92a581e8719a78dcf28e31505654557add711049";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/bn-BD/firefox-51.0.1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "deaf8b9e7a825c62ca4a7135e070f0be616e7e9b4387976edd7492f4b40d94a57ff2db01d5ad2546831fde9a7ed346f298ae3e1ca2c070b723aec9cbdf0260b2";
+      sha512 = "a5bc927ef7615543b6ad8afa5b61ac08570be96ac0806c8330150ea9bd7e8dbcbc7c51a79bef45c865a05cfb776898435730954ba5b4d336063e0be4880b699c";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/bn-IN/firefox-51.0.1.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "da97d24ade2c241ba37ad20b1a6efc4a3742c218e4ccb8063e1255afcb4e03d77cb3f14b5591e7235ec42318f3e509d3c6b48a9bb94c5ac2c5e82bd270fbb3e5";
+      sha512 = "72d23cf99c23a4ba414469e823ff0b30947f37f0aeeaa857ab09b22fddb6b224a18f3c3a796288030a1a9ef03f9bf14faf7292e58682e75c5ddb1981a47c8171";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/br/firefox-51.0.1.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "6780103e36db348986fc3a442bb32afb1cfa238a800eab81d6b0629452d6915a6b199501c53730143cd4fcffa97a96718dd6be10a3fa10db6145c7dd0c5663c4";
+      sha512 = "cd5111cd1831c7d7f0498cca21a78f225b9a403cc7e791e0903c88012b6ba31c95b726e8f9df644791350b12a8df5a1d431331a75eb76c8c529935d6447797a7";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/bs/firefox-51.0.1.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "f9a0bb76c68ab8d78e095f9e41d95875f76f2052e9ad1e06dd8b6d16a70d35db91f109ad20c3c904b1a1190aa5c851cace0c56ac253c72b97a2e45992d783014";
+      sha512 = "0871b142576517d4dc2ec2a24322bd8cdc5206356f71ddfb3c71832a9f5e825b2c38471287f2b2e3a699b2331b088dab1291535b66bbd52805ae1dd78f64315f";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ca/firefox-51.0.1.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "b246544190cb1d6336046df019a21e84d7cbf360d96e4b9259379b5885e870e55041916534987d12cc7c215c46524a48ea8085ef09f2d5286adc76be4070be92";
+      sha512 = "4477a8b0650e39a27035913a956acb952f70f0a7c557ee2b97380b195296db4e2af03d08ea6ddf9d1aab699686375db06074796cb16d71807bca0afaa993840d";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/cak/firefox-51.0.1.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "98ea4dde99fdfe6f1b18e39f1d5d9eb5c805c7f6287fe6c1206b71622df184c57982560fe836493d351bb0ab6fdd37bab41e5f89be2a18a6d705595f618a507f";
+      sha512 = "e0cf154538d8580faafeea44494df16995605eae0f7afb97ebad219f4371de3d92127a05dfcc227eeb3cc161a7013f71e45848c41919e3a1ab918521c6e7bc32";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/cs/firefox-51.0.1.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "7b8dac698df7c415ad1b200ab437119fa39ca7a601c241145c0f2bffb89a5b97210f4f2173ad626818f006bf5f7ff5f3571911a2058f224326268bd53f11cee5";
+      sha512 = "f6d94786b8068452de617afbfb19d662defc0c00ec412e84ed0fc58ac0510f3b9b98cbe0e26ef98b2fee41d794b46cfbfd307373a04a71a0dbccb49fa29ea916";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/cy/firefox-51.0.1.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "30f1f7453f62bc18cb65d76590e6a780757600c7bef187debde4a1f68c1355148fd2dc4b63e5b98f6516f6542b47c1165ab594dbda0be4c5a2dc6a8d948db4d0";
+      sha512 = "a794ee2a28402fa0f671b727b16840a8cdf6152e44ff9b0c9bee7bf121a955e570f8d643ae9688db385850e6abd1b9f47574922ad0b3184772184e50370ac788";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/da/firefox-51.0.1.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "00daf69b001ecac3fb11c410fec9619e7f9b9ad32fe40fbe1baf96d555678d3c6addf78d55ff6c607e525618931e441276967b92124fd8c0ea5857d2880f8b31";
+      sha512 = "895da18fcfb79737dcfeac111be8a867df75473cc3efa65c81511b9f10a8b1b7373005e42ebafbad9e1f9bb6b1cae23034e66b012cd766c1d0826ac3c919b1a0";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/de/firefox-51.0.1.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "0c7cb4ea4929d7f807eef1a74ed1e9324e2e14c79651bd6ebce523d9c8668111304556aab2656ecdd6fa82028304439782ea9f654ee2108019fa5238e707b61a";
+      sha512 = "d212a73bcb4ce90982058e942ec08dbd4054149755dd1cb8f963984b5ad5e7a0c5847760fde105510476f2cea2cb1dca4ccde78a21e9a5769e605e61162505a3";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/dsb/firefox-51.0.1.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "53c2ead4d133f3b69ffb32ec7f6ac037d30e313cb85a6baff97ca997e3fccb0bc44c7258cb21e03231cd2283d8cfe50d0f6d1d64489a9b1e12e0a69fc57d6271";
+      sha512 = "bbbec4179f5ccd5569c0442deaa23015ea9b21a91eccc150838659d399608124ed34b4c57716c1386504e3b74088df705cb4807bf1a12e29b8bc22c5ed15907c";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/el/firefox-51.0.1.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "088a6357c7e0fbd0060b8ba1369a0611c896ea2d5a23d4d38d7803c6ca9871807d9453c9a831762f27cdaa43a9827097c344441d2da1ca03aebbef922d0b1e31";
+      sha512 = "f73864a004d1f1bc5460a30ca60f589e7a98d0017b299376e0166ba9bb64b1af6b1523739133c1651945345228130c53bb13c9e9a846afef363a74a9eaf780c4";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/en-GB/firefox-51.0.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "e65c80fdfb097deb980df7021908e8db839b82f89b5076f213a562572e6e6ad7072fa88cef68c9d1e5c6e21925691e90ad6a9ce96fb4d71b3da4b52d11fb457e";
+      sha512 = "e7e547490b3dd9ed8260c18077e056beab6d523323c51230200a9f1e019fbb8f691e4ad42d936aca546367434d1fe901eb00c1bb16663e47dd8c6f40f0793589";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/en-US/firefox-51.0.1.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "119643dda37b8ea552450302aec2b115c2fedaf707acce9ac314b464f47d03ee76358f63c30cf788298fdb6a25af0efbecae1ab1e72d2cb53190c648154b2e4d";
+      sha512 = "cf81bd8ea9a98bef6a4ba99e1ed1058bf9cecd2f43bbac310bee8226409512cde220b6a891421adb7166eac83715cbe7e8b41aa96a7ab1cb4d0d8d8a0f15dcbe";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/en-ZA/firefox-51.0.1.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "adcbbc09fe61f04daef46c673b4b7e294ad8c107b76ea1a22e46a1a5ab5eb3e84aae711c7b9edc882be67c529abd26f6183583da3423afd152325a98742763ab";
+      sha512 = "853dd3491519ad29536f0ec078aa2f1ab73f4e436aaf9f367a8ad74188818575016292b0b3b1f9da2e94f6b6caeacfc1fc64460d4f7360be63840e45c82361b3";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/eo/firefox-51.0.1.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "247f1b6f90de42abab245390a8a66fc7095ad058b6cdb5f930efc77d47e6b9c1062cea0367c266a192c64916cc8cf8fb55b09c35f92823131c22c35b0305ffac";
+      sha512 = "dd8be779d5bc57be841580a891cb22a2b0743f9cdcd014a6d2e7b430663c74b0d8553571eab972b902dfd5e2f5c19bd9caf6e6d82499595cb7e97ca57580be22";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/es-AR/firefox-51.0.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "4c456158008b7e355ddaecde20cd655b772164aa976abf612ac021ead6aa82420284dc6f16327f79cc12bd9c66854b8e5c9a6ae05f53b4e9901f0d6eff75d5a6";
+      sha512 = "7c8928c448295799e73dcdd2c762f52c4c239d09f16c83dbfd1ed1e3f7910144fa41a7d58fa721418d6ed6e6e6f7973de417af67b9dcd68f1db9d32e31d59b93";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/es-CL/firefox-51.0.1.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "de45a4d7660416e8da164be585c468c24c4b80fcf0a602b93cd60556759aee619d59d08d58e2ecf28e86e5de31c2bd820905861b441d9ae1bba693204ba67779";
+      sha512 = "58ddc5c2020191308d4a6ae23fe2f948592574bb5546a479d7fbfb0e3ace2e9bfbf53a0c26b2bee91e214d2284e8f1c38037b26bfc932c62c5d34dd11e24a84d";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/es-ES/firefox-51.0.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "b3dc903cedf008894c3afa52e503ca5266094c4766925b725f761d19a0bf7dad0ef546b36c9581c4b42de32ecf8727f752b7d3023ff97a307049fdc54045bbdf";
+      sha512 = "2aa9e83b82b23e7360cfe1aa8e70131ddd3ec32271ce951fe50aaefa1b45d083c01dfcbd2581dc2377cfca127c16d79f818e1ee09a858f6b0138574a5b8b6b33";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/es-MX/firefox-51.0.1.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "afc6090847e00c1ff9940516e7d15c048295e30e1055f9bae7f07990fb447d7ddb61a4ffa336b6f2283cadc972df86fd59f5abaa07d0399d999b8fd0c8d8354b";
+      sha512 = "689d87ac2ea33dadb20cf6b44426a63e5f058e899c29121caf2d83cf37b13de572e9c32c9e483dedb56f7de198c1745f7e5cab85988399e6790fdf337d85d2e6";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/et/firefox-51.0.1.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "1258aa0f0eeb2902ccf86e5aa97e5d174e926b57adfddced2667a9e3253a103866431dcded2ecff7411ff4f4e1866aef133eaca0921738a0bbf4a98faf813880";
+      sha512 = "18382e5c6cff469357ea010653665d03a7e9ff9588aa2d6657b98c09ae7f30c2c04c1507475596635843f222419f5caffcd95556eb9b4176ad8d60bf7c5d7f68";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/eu/firefox-51.0.1.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "540cf167ac1739e1c90290dfd0faec82924cd80e1db1d700b9a7e4ebd064895830b1b5675c5800eb4e5cc8042373e5e1b174d6fcbd0751204853e94809b89d5e";
+      sha512 = "5e5464dbfed7e91a087c7b67d715060ff97e24c83b99a68439b823992cd93bbdf994a2977a187761f92d911b19b5f53ce473628a45a8ea160c65bdab3f51c300";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/fa/firefox-51.0.1.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "0a3ca143ccac6d9fc950d9345839edeaceb68565b5f86706c3f39f1cab5aa74699f1f573c6768869bcbc0335042f11a8651401a0e6cff0849c36878b08e58a89";
+      sha512 = "34242b1cf86c83920947862561ceff073f818389164f05e88cab01d8949bba2b30a43e212be1bb71e2bb9a2498bd6ab604c52fa169d31b96864c07b747e4e5de";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ff/firefox-51.0.1.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "fd2588b2c179cfdbef55f43ca11218673a7ec818cb8e5002ba7d6957ac61dd4d1f296b00f2d39de85a14c5fffe3500ba939edadd15374e0eb6a9183d3fb4a856";
+      sha512 = "ee83ecc78c8b3c7c304971110df8fc9402e67ddcaa8d38bc6a7d0471f3122cbab2a69b578ed85b0d58b0f67bf5e775696e18685e706aacf5787b0d24931df517";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/fi/firefox-51.0.1.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "6dac643deb4db9139c522abf0b7cd86910d9f3783c3a7c41c60d2f017af742b495d64dd80e5945f045f7ade98e2668a5b5a684f61fb768cbc6ad7a22975a2246";
+      sha512 = "9eac668caa56dd7d819e388d994caa8633d18828e9ce469d0044b90e260a2fcf9b056c5d43274e6392830fa48420b6f3718988e88db70f2820ded2ed6b4527b0";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/fr/firefox-51.0.1.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "161bd06d7299a8dbc08e767c043864b77670f6919f028a746312709b84808d56d5f38558a3a4ddea19e0ebb03f283d020de8c60df9a2e7d67468a1d96fd08dff";
+      sha512 = "9abb5cac7ee05039c374444f7c03604df1b3a79055b1afb42550765ac3f337dcee93cb30f2076697149f560d3d0de4840304259dc9c79325ea04d5585432c1e9";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/fy-NL/firefox-51.0.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "b77fdd714cc5076981afcaec137065527f93e500a074b9a0beeb7ba85c78233d9a52735648688622f9a1e137a4e097081489d6307c5454330ac931e57f2ab469";
+      sha512 = "197d3aa8d9954f4bc6a3a318869310bcd4745b9c611c6df421c0c3f8bbacca48c7118322990a650e00104a429f16cc0eaa81fb56b68c4dca957b14cf2e2746c3";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ga-IE/firefox-51.0.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "265f422077a2ec1bd63a54295e6581ce1a559e9aab5b59cee79b4d38e1a494c6d15a7a1e4a211bdfe1c5671457a5ec8a8d67b436f31165f7b27e240bdaf2aec4";
+      sha512 = "b26159956597932d413e40789e8eda3191cd2e2581e22a4c450bf6a901dd3c40e330fd486a401fed5f2bd94d3affe4763debb118d524aa31d1ff7d1676e02c2d";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/gd/firefox-51.0.1.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "a0f9b3f528f189004eed28ff2a9582e8a992c127d62c20514afdad69bde793a6f63a12bd92fce9d900cf600147b0d8c462d69d2d9f48613d27997b1f3fceaa8f";
+      sha512 = "38623b6b077c5cee3f4f39bdad198d2a7453a851547a966fc211f4194bff6fee47e7e6022a7600726109fd7043b83ff37275958a1fccb863f57c4e60d175997e";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/gl/firefox-51.0.1.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "605fdaac3f85a2c64eeec3373fe8a6ddcf78529398f76f5c2ec06a10ea783d2a7962f03fae9dbbc08dd7c4aa8eab07bda55cb2f2f477f4b9971d7149d4a72dc7";
+      sha512 = "d9a4287c5c5c28c15d6ac3913ea8cd51b88701ee0c5c091a9127e753d5417eefa7d10bdd159ba63204111ad032498bf80b4c944a194d60a14343db4ee1770d56";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/gn/firefox-51.0.1.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "126eb2659750de31bdd346a0e1a255bcc1bd3e6e310c3739f5ec345a95cd2f1f78e381f6ce3d9a1079d3dd07ebc4cbab4af8544db746f42375f02e6a224a9b77";
+      sha512 = "f8ad4718fe88e594eca07cd8ceabd19a51cffb17337eead004b9871f7576fbea35cd5a51434b4225e831f4a76c4fb47f1669936d4ded0953160e978f07e3e6ee";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/gu-IN/firefox-51.0.1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "12e7b20d5344d9b866392814aba44ded081c200543ff7db4653df22358f4627b9cb93f1e93ca546b3eef864787342a02ab996b10248eaca8468b70f2347c358e";
+      sha512 = "0cd44e6375a7c11826428a7d13e9b59e73075452806f6f2d8d1e20cd9d32c36e4de684c511544aaf9845ddb6320f8f72657a9f56cae2ab10cc880428bcc55048";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/he/firefox-51.0.1.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "1f0a125f1febc79218cf0bf929a6f6e3ae7c0046ad738cfd6a4ca84cacdb4a7b6a52e1934ac6b9dee25860e23b944d2636a176ca47439e7920fc45fe026a88b3";
+      sha512 = "963562443976aa856b5d7e389d057c8bf17bb6045d5f763f5e3f46c500c5f6877d046bebb5515c726bb652b986bde4189fad3c84bc6b8812c7ab6aa47b629d8e";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/hi-IN/firefox-51.0.1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "cef6b463aa184cbef529c985e916f5ccf33bc4d8bcf693c685e92f4b211044efab5cd9966eafe75c0f933c716c3c519fc3df84653cecfe2a8452025e2674ae23";
+      sha512 = "2ea7bdbf502a950863574bf3502df03a6d2ce8128934f52aa33f2f1d41d41320a0eb0da6b51d0fffe8ffda1ab7dccf72fc904230f2b3f11b82421f55e494a4a8";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/hr/firefox-51.0.1.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "591e79886225686fcec87dfba67548decd953ebf8a06005e76ddcce545d6b060300ed7cd2e8abe222a5900f3dc44e81036356bcb7471a9e086a320946cdc8cfb";
+      sha512 = "f7f865feab6b90082a59b2d1cf4d5f73380baecdbdda5eabffab3926747c83f3668a5feb4a792e35b56ae47e2c690b2f97b23662f2d5868f6e7be4ec4828f43e";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/hsb/firefox-51.0.1.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "722a4f539dddf2d076d2e6eab4c5eb50229bdf0142473ce13488e106a115df2470b381b6f68827a80febe200a274de9a2532cc27ed61498051186e4c1b6e6e85";
+      sha512 = "5aefabeef739ce224cc4d1d3a83f9cca3a5626cb6a3d0026ecf068e5b4283bc16735107f78d5b4ca3748e56489a0463701f1ddc021772f3d3b97ea04254a7d4b";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/hu/firefox-51.0.1.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "992beb0c027990939a0536fcb77dd6a04f3cacac584df3349fc9ed3c06bae3b162bc530c1a4ec26a39240f8db0bad84686d4352e273d495c6d0f69b23ddbdfc2";
+      sha512 = "fe1c8538d5df66ddf27b2e8e4b2e01fffdba689103371bd5a58f0ed6fe08f704438c440277272a5eeb2c261e51cd6b81d92fc28c23fbd78f87afef3564656199";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/hy-AM/firefox-51.0.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "00ac6027b5dac840325f6bb21a13383cfc417827eb14e21948b768062eea52fda1b3b4c9d87e39255dd8a21d05e1120d0f39d3fd878edac9eb93c698be0f7682";
+      sha512 = "8ed0da0f6df8d2c6ef65f58fc06a25ea1d96b6c69161600b104772c61ddaa3d7a572b9e971e616a6870f57668bdea326b59bdcd968ffcff5485bf8e7399a60aa";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/id/firefox-51.0.1.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "3d6a12dfc4377cb180d4231c26df99058860103aa5395ff777799766f9786093cad0fceb9b72fb73325d1d1aa60b26e9be4cdb00cb875039fe2b0ec455f444a8";
+      sha512 = "6f90d870f2964e76b394ba419479f87ad30c0b7677b37305592e028f1611690fa59fe50f32bae694bd30854d8d0cb36c1dd0ff5cb04e3e8d0a3caa779797f734";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/is/firefox-51.0.1.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "fe74d79704315a2d8568280e56dc735050e91de4467989e81db3b65a6d42ba9c6401b1aa0e50bfa3442c902c8b5b5feb3e9d39d31ada0266f33993ab9fe2522f";
+      sha512 = "68559b8cc00c5d0ec92e274e30a10bcacf5c87096617e0a7a0ce30e495482ffd5f2b4f4bc9f61e0f5d41aba722ae2ee12d9a17e2124199717720bd6e4d1a4874";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/it/firefox-51.0.1.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "60b419cff2d17621fdeadb7b8f3dd5123a6a1aec1cae8ad60ed0e516d31483e7cd827cecbd10cfc8262b662c7950097a6da87c873a0c4cb4faa46c08b1467410";
+      sha512 = "3bbbdeae057aafe87b9b7c7c99b67de5c4a2642569570cba9456d680f726a5bace48d785f6871d1731375d0d92084bf30fc60a390dddbd410573f9ffc9c81fce";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ja/firefox-51.0.1.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "43486b8e0044838e0fe57669e86308081a6a9f6e5dc77ea3cecd881e9dea95f9e9bfc7bd217f0ff6bc9d2e16d2bb7ba193e8c0d5fe8a76e5c7f74971a71990f4";
+      sha512 = "38dbf45822d7d2cabe38f3d0b36a5c0dc93436d42554fc9802c9f69f34241553fc95256edaeb410c9eb16e640e1ba09fd3f6cef48c507660234a892ee1abef43";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ka/firefox-51.0.1.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "f94aa635d7804ea9145e88d2bb6c9ba0a53b33d02def9821ddb9693f2461858bbe1f05b26f2a60b019743dec3f48305fb4fe2f8ba249e9baf50b13c25fbd38ae";
+      sha512 = "d49b3024a54f3ff2ee08b5e9a416b4e3b5ff0a69407d34b8b66a165cd5c9d167adee6cc7107a611a250bbabbf90b798d152d049bcb5c6d59846098035a081afa";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/kab/firefox-51.0.1.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "a88287ed1d391986ec290c09b7b04fd484c1ea6b78669dc430ff8aeb63851fe8bc5e51896a8afdea648aa70f9bbc7f8d3ee82868766d2477d50c23af21d17640";
+      sha512 = "6baebe38ecb1412b464702e6ab5d2d46166fc3e4ccaa4e4fb3f012ef5049146136a0eec94849148800d4fc4a1f803caec9fe9ae60b330fd4d97662a61d9bb1a0";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/kk/firefox-51.0.1.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "0170abbaf6d9765c5bb6bf8b1667b51ddc8694f5470884d864b259f23ca824233459cb5a19e8f2411d89df07bc860fc89a16d7ace3f87ceabb50a487c5829eab";
+      sha512 = "8300f42545782543318c789f4537bcf12a4e1a1674ed34e11ad3ebc2583aa944ba4f7fb9a92268d36f4c95f4ab06d8b79bb6cf3bd859edbb98c0fc5bc2ac1891";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/km/firefox-51.0.1.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "c7239821e3aafbcbcb8c8ad46e0aa981ad77725f034105d6aa0566f3375639b77f9201391fd91df440a402d2465cf000695e495c9e678c5dfa66c085b7fc09e6";
+      sha512 = "8352dc1b0eee5476bc40ba81bd7e387bb36b781df823e900bff4cffa2fce5295aec05aaefe01e24640d3ca015d83d320e95caed91539504f71b2c4591ea9707a";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/kn/firefox-51.0.1.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "8088cd7a361ea4b231b61d24b289816f8c5e689eeb1b4f063df70d540f44065a0e9ce284db020a44704b48e2276dd5c555537380e39d2854327a64390be0d37d";
+      sha512 = "0767e6bbcd9db184206dbd8d6a8519bee3824451ef1f856608ebf6eb6bfff0266b3f4f680d47fccbe5e86f4b14d8243354f3ca8683d6741d76aa8fa77621e10e";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ko/firefox-51.0.1.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "676ac2be52a7980d007f498e3efa1574d68415ee5b8648597345de22b6fd80df483d9b8a309a4ad22f4a927d45d1c9d9b21447fdb1b8fa57f420227da5a72c18";
+      sha512 = "f9b18473ffddd1f9d9f63d29ce7ba7fbaddf195d57e791a7c2a03e634714b2dc2f811730d9ad1534f2bb6271a79522f32f1e88d365b664df54146db9366f6911";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/lij/firefox-51.0.1.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "e93d9d9337299528d569810388a5bc1dbd53d083df090a9308d4cf60f138aea786f7d96ca8b62612252deaa092176cdcda5280e04a9b680f3d63a166dc2478f0";
+      sha512 = "b72a26fc384860a17bd81f075b7080129711fc9b640b5c332958ece8c47540d2b3ca41c46f35999afdacb15e4f7928b2ba943ae10ed1ea3863a7222f30329756";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/lt/firefox-51.0.1.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "6c4a21aa700cf9a551f57516349d0e1ac490713fbd51aa8beeb0de6506c7ff5c06788a196132e53b4c4ab314ccd6598ac03df9a99a61b3d4998bfca86d1261ad";
+      sha512 = "2b8e656a402b935c640a17db9d3907bb99498180d36fc0b8f2eab2a007fea9d0dddd7283292f549aead49c6ec2c926eeba728e03975905adfc561f159eae5e42";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/lv/firefox-51.0.1.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "b41fc13a30af028f605eca804640a085e711c810debcd44cf148fe142bbd410c491b9edd7f0792200e77c3cbfcb3d75a3cd4aadf8bda9837f1006ab919540c4f";
+      sha512 = "b571c834c1181c5ba2685c8ae77165cc0dad5a60d45717d2fe9e2528814b2352748295a0817fc127057a1403bd5ee2c154d8eb2d876d3ac428638562c19fa3f6";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/mai/firefox-51.0.1.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "ef6ed49b36976b243452b866315b664d4fb949dd54ace116d86d1de74df5744c1aefb69bde7926f5b2cd78d904596c80b53971bc21e3e893201a25466abd284f";
+      sha512 = "1f703f3f3456d6fdb69f6702a8c7b8e069387862b99e09d9e85ba0d34d35f5ce30bca8268d1332930f55a9d7e614ae77afbfdae5caec7c1fbbc7abb8c9898710";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/mk/firefox-51.0.1.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "28fdd392fe782836a47f8a547108990cba1796f92fdeea5f63e8d466e470b13b3fa0ca805b0de580b2620b3674ae1d25c3daaceac723179bea7da615de9dc0c4";
+      sha512 = "526b2b8709942a6c3d071c39b03625e90aba2e298b89934c3623dd61bc0beb8680729ef8f716375abb0d487507eafe885407a995f3d4365cdaea8b2d0fb55070";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ml/firefox-51.0.1.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "14c1e47a65bdfec98cc0fa3c1cb9ed58de49526fbc0b934ba2d4dbbed2ae6e3942c4f4c3f15a637156fb50347e62fd32bd661621171039a178167f7fb69bef64";
+      sha512 = "0c36352abe8088a2d0fe151e6e7d39273dafc370e1222e8251859f99b89baa8782bf108cd97c2df7dc22fc1231c6cac5409a3c0bcdb1a849c7f894732bebf78a";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/mr/firefox-51.0.1.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "8f42dbefce445d592946f91acc7cc7323a0ea1a3e3c023222146f7650f4f4ef7c416e833c40c1b911273ca8ba100f20f5a8882165532c62f1d8af6d0e03cb022";
+      sha512 = "ba013b86e7b16f1d90b1e6328ef9932e3fed6b6e9f2961944ff4a3a00afd0d0c94f9db1b25c54191b50b798bad9e5f740c2b63e094077df562d39634074d1b01";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ms/firefox-51.0.1.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "05a23010aebce6a79129883102dad6d82ae941b2dbec92b2d1b532c52250f49122f11a8c0837f26e6a7142f88e4fe71b0133c9fe1cf88cfbb18eb66fa88e567e";
+      sha512 = "a5df3ab9feaaaf459f545154a0f30dafb384febc269e701974e221a6a33e2701777141b7ca15624eeae009e984f4e813d134823ba733955d2deaeccfb1add161";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/nb-NO/firefox-51.0.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "c2e48ec2489e854f76200de5940a17000c80a6f93f5c797a6e0c7e43a76b67a82bbbf9d3eec917f50170522a92cf09a08a2ca25ca892bc452fa4d8cbc6fa3989";
+      sha512 = "81e16991c9e68b8fffc47eda12c1858879781a1e512a244cdb5ea202ed4abc8366b587433568b1d31a943520bbf56416b62bd00a52a2db313de619f037f5e87e";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/nl/firefox-51.0.1.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "975713ddd22a227ba289ade6a8b7e6141b2c4923de4b33f22711b2b816af2c5305aa43c7bceb7a2f7aa35a0c6e59e4dfb577ba8282dbd1a322ac99dec8245b91";
+      sha512 = "31bc837dd0a974e51712f0e3be8fbd114ebb285d34329a4282d9d41c4927bb031738958997ba77f8ec5ecff09342d2c2dbc13bc8161e8d54d331c55e7df3684c";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/nn-NO/firefox-51.0.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "0918907a3ec9283c2d2d60db6d4d5efdab0f25b6c3522d8289bb46ca6f7b42a461342ffb2611e5e38e52f88846836688fa9f5b461d69f3c9f838413759f4ac5c";
+      sha512 = "361730a873a3912a10437eb3f766fde1a79f2a8f9f2302e6515fb5fdc34d615fea07a225f9ef25314d4cba2b83b35f9fceda7dbdb31433ebe9cacc2dbcc4794d";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/or/firefox-51.0.1.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "fb09ee90b4a4f97687310946b260caa8e115b6475305fbdef7d5d54d649d4f8cfbb2be5a3bd567f115f25ab294258726bdf34af25380c5cccc9647db0a523280";
+      sha512 = "cbdc0f8f11194bec2894daa29d92ac6c644ba55a6921315d3e30c560d761c226c0673a35c98e19e31afda3992583ce14ecb51ced97077a6a52196f30da7c127d";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/pa-IN/firefox-51.0.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "ef266ef4b57c3efae929fb4061dad5768746383e70a813b5d0cdb32206aa2b5ffc6ef8fa91952d37b61c72c0477050642103f5c63bc0ed0001ec514e9e65494d";
+      sha512 = "21819c58f4c7e9f98f714e6392283bb2e5aedc3866a5f7360535050d75f8b54b527593af4b0004accce95459545c176cbbefb09199be15e088123556e378c5b2";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/pl/firefox-51.0.1.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "f02f704f24109b34300ad7de8582b3c59a480d162dfadf7eb1d4821fa94e793978ec9f584468b3e0bc948adc1d0296b28dc7189e09752e5c2db31c7ce3596b76";
+      sha512 = "293090773a416b8282e8eda9904646390a0b17215a156cb63bee043bf68e69a28656ab880f9c825c280deea9b6c9e13ae55e08284f540c7b50d7b7844c5989f4";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/pt-BR/firefox-51.0.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "4e8e8fad4dabb933392ecbda9ed5938a3dab018e95c11ce5f70eaa810ef64525d8e71d61a5203d1e6feb1fe198312eb6f929ce2f0dd4cc93fbc3006cfdf7e0a9";
+      sha512 = "ce58560445849eb90798150ebe4ffe6bad23a6cf2bdffe1688b1e0e8da01c088334604a2d32ed9317ba63f9064f4a3ba406a282cf74ca64bbb5abfb0a6c37f6e";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/pt-PT/firefox-51.0.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "eecc2fe5fdb7fc8ce98f0df3a838d6c44d0471eb95fc27271bbcbea5178752e1d974c4e8f0b97efa2d9743fd7695286aaaf44015ae6b5efdfd334d57094b787c";
+      sha512 = "04f86eb4d434190f313a76a3b366c35cd132930ec5fbcdf6f5bafacbaa7433cb161c278ee28a120dcdb0ea70cd9d2a36cb5fd52d45b6811bf748bde11dc43398";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/rm/firefox-51.0.1.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "ed02a26930398b4b6e63a532fce29943b634568c6dc21ba931ae0e054c0b95eea1da8949f39f47272e7ff34c6b87caa14cff5ad4ebb956630a7178e2fbc3b440";
+      sha512 = "0e1307cae4e83a0c0b883c8b84c623ccdf5f91b2d39097eb4ba86db7cbca70982c9ddf76b7036ce5dc574fbec0f02ccede1bf5ff28e2a53c4afcecab33c0073b";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ro/firefox-51.0.1.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "b356ed1dd25084e1ebc5421c9925a7d6339d1bfff7d0fd69ab392b199a904cf31c8124c0ed3df3691be727492f0334b7edb3e1cec210f7eb84a64e37dd4d4847";
+      sha512 = "cb93e5a9ba39abab21069206a6267d87773177cda7d5966dfe76cf2a6ea83a00348a7f4b1aadfa890585874a9b2cc2e27cbaba73037f4026a56f7790ce0b7df4";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ru/firefox-51.0.1.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "da92e1e769dd673201d157bfdb4070fda84610ec2e313da7a44e75d33a269cd59927409a665689c5145f6e6f463246296aa070f2c471572545443c73f110714c";
+      sha512 = "3972def5e0d34011e33476306d748e6e8936bedd3a3a4746c21a572bbf1dc71db364b5b4f83506d677d9d148dfe49aefeb56bff91e4943910348e7ec58c791ae";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/si/firefox-51.0.1.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "08499f564b5c05dca975201d2d8e32fb09385a3596af9e0fa2965968231bd93fa00158e2746769abb17c891f6059221cd0dfc3bfda11ae7df5cf54f013e73d02";
+      sha512 = "216f65d5f9ec399cb4317123d4fe9186c3caa1c403df16acf86d1987c356c32db809155bc3d9904c7396951a09b8398e402bb93d269372c924da7e690a7569d1";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/sk/firefox-51.0.1.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "c6e778692f3d3d6c01eb61652cdd698192a7df305b6328d1627443e815aee5369ec4d2409becc32798debb3441d588d8d9ff4c76e3038e58d50c1ba812dd5567";
+      sha512 = "a23944d43660d5d151b8fa618303aa5cc673eec16868ceb3b1b1c7e197f6a707cc511f63ea07263fabf20ec75d630dd699f0ec8cb2c5fc53d1642b35c90b4e2d";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/sl/firefox-51.0.1.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "a041cde5bf67eb46f328ea90ec84cf293751959e11e952e2da77fe883cf105fd70ceeddef76b2e84d7a849d0cb3c3ac89dc7d839db910fa508a1261f3fbb0a99";
+      sha512 = "ff3bd653e64c26f387c231687d4f26502ba284138596bb1f5f75549476270be712242c42be07902faed80bc327bba49f2be37db3ffa5258a9c944c3408461cb0";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/son/firefox-51.0.1.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "3e74bd82ca8259bba5e8ded47bdde199ed64a5fdb44f381d2e981dd05c009159a811348f8369eb345c8cb0fc8ef9377d69ab069be0c3d0238cb3a8e634f3b188";
+      sha512 = "adfcae5aa31e9c153b53234c9c10ff51927b8785e0952c233aff08a3de800d7b0076c9304368a0ffd52ef91b9aab1dd0718a5228c28300b03fac69edfebba0dc";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/sq/firefox-51.0.1.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "637e81118bf019d916e26f229a02756ebb1b7eb3f2a9131905320a4fd4a8bc13efbb2d2c85fb52b7ccdf3c02afe7a439754cd0222501c5ebd18069bcbb8146e1";
+      sha512 = "32f039f1f05771766d0413d0ed9a526c5cb21a0ebf5688ed577afa73e39d482cbec87878c8acd2ddf56e048992ef0c37725a6209d89add9fab72c48bcf135553";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/sr/firefox-51.0.1.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "6ebfd3264b6daaf2726614f12ccae7485773b1fcb3d55b8cba748157bdd81e9d57de5e65553fc928b6fc59a9bf346761b37321caa07b461fa757885d551bbf2d";
+      sha512 = "22a0ec9854a80f0ca6aeaf8baa98d72d0781b6e67af899701686a8b4def205b90d9b9084a2d0b160b690d4fbfc6eb55c6bb6cfaffe9f1e394b484f264fade306";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/sv-SE/firefox-51.0.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "3ba5a114559edb15375abf9011d9c7cef5b35d1182f43d2ee7d38d37e5ae802506c207c0a96dbce8f8a87ed35cc874a4c0748968cc86b460693144240cc2f22d";
+      sha512 = "3f1204d3b069dbfcfac753ec72ca7265008f2543c14455fec81f4cab1cacb815c1529e7c9b50672552acf6855c2de81645428bb5ae43d514d2aeab3c750159d1";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ta/firefox-51.0.1.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "ccc13342dd8d110bb63670c1beacf2ec3e0aa48ddf775f9f8181d2733f0072dbcd465e88a4ea2c2ade503b7bc41c193d16cf4f3a6857748600cdda002c5bda00";
+      sha512 = "4f32b734fd4e4cfa1f031516176ba82b9128cf7f9577eef1b5243aaf20dc719697c86330fe58feb54aa650109fd33a97ce3e6c0d5639ca7a40d90208a0a195f7";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/te/firefox-51.0.1.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "6df83ac1eb710aa56bfeba8f2bbb52b002ba5d4a63a3ffa0fd2b9dda076d1594d5507753478ceea89c703ba07b2b78be5b2f0bc7ad15365164f251f6cfb13f3c";
+      sha512 = "55cc6c548a2f0a89ecbced9aa9903089d04771d97e71f99ca943f73c489e8f3dd0fb0a3f999d641d5162b3f43a0b2058eec62ee5009f7d796ac89d013ac15426";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/th/firefox-51.0.1.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "ed32a1b1d7bbbe625c8b528fadff8195c81bca4fa64a9b3e230066e801cd315d14d6c356fe48253a8d796127cbfb0ff0db58b25953054a2c83f55549c6c3cfdf";
+      sha512 = "64202fab7515634d5cc12845902e4c0df6b1e4b59606f1c4ca779ed684edd329915b9e133b19b465ac6343d5af91572b767171f56c7ea2883d1dd216a39eb1b8";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/tr/firefox-51.0.1.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "3e69c04d8993d290293c2d925bd93e1f4269733992c260d5ff61d111acfe0cfb82ee7ac03c78332d45742e36e3a3c8ec4b22110e6feeb5484fc5c4a7568b431f";
+      sha512 = "aec62567d934fae018c8ab4273c7f3a7350ea1e14820990374ab2542c512e005536e851b6fe315667c9ec63d48ed391ffa896fe7cbd24405945ed7f8aca4d945";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/uk/firefox-51.0.1.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "7f52ba8eef6515e267b05a48a97eafc5672b5cc77b67836d44207cc72f7b886b8d9aacd8259359433d1515046d72f97836980b9d01c281c8620b0ff693abe7e4";
+      sha512 = "e1f3df0c6637cfa394ae0d2829b24b486d0af39d46f7747e77e579e0ad4325663ba312504f5cdbc5fc2da378e7205a5e9528df99e61af20b9df58f8cf1cd54db";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/uz/firefox-51.0.1.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "d3af1571479bfceb3a9118cf90d5c5530072ff1845d2624f33549ce42581eb257d01e8e5985866114772d8c0e1a8be5d52e7d6d0a30ccee4dc9536cd6a07f4e7";
+      sha512 = "c095ff29e2c42920975400b0f80a55e22b3334859d82dde662fd9a8889884bdb045601522e961f4d0f6c6c934a5d42cc838fd263e91337fa9838479acb2064fc";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/vi/firefox-51.0.1.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "7fd67bb789c2520b9a4a1cd59f0a5713ca2eb8eddca3188a041907047ddb28d2bddfe439f2c85f75c473ddb3df08f4e783d4312af2da5bb13b57ad8dda3aed4c";
+      sha512 = "14ae54681bd1a6e48f94c6d624e00a034689489e631f4216beb019baa51f35f00eb2a764c66a4e79762c9d1188659b78e5ad50b8187354863abe9b501d4fef77";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/xh/firefox-51.0.1.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "81678e379685fe35a23c4c2f490837c8454ae9b65f6f91ac18cb3a4e0c5c475021aa175783e09d99151014604a3aec944252812cce0355b75b7a39bb8b498400";
+      sha512 = "6bcba0e20540cb93811aae08f6b10e0cf6a9108528fd0f00aa84d2af9d982578d4e03f034e6d0f155fac4519ff0ea90f3d8aa4731aafc179a5a497a26d224ef9";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/zh-CN/firefox-51.0.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "1212c93a2ac3f77e13199fe5c7a518bbe9a5ce573c241777e462167c02ccf3d232dfc9b15c05ad85110ff14df0cf31dfb74209dc50f7a99db068928aa3f723a9";
+      sha512 = "ffa67e88d736bdb41dd7bc046bdfa02161f3c703e992615cd98df788cce5e9f97a610f8b7b31e825dcf17dff790029081aa13316433db2c2ecd06de6aec4f811";
     }
     { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/zh-TW/firefox-51.0.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "cd2a813befedf187cc11e8374043658a78bed9620681e66e226292c8f754f0b21c865cdb71c7b289acfb040c77361ee5c3a1ab42c34b9e893293270b1a9151a8";
+      sha512 = "d67b82836f4035ac4050751b9235d49bafb2bbea2da9d1b209451e0fc3cbf54ce70b4111d66f107a22be30baa6b6a043c2736f6e05961f0aa3cff95531601134";
     }
     ];
 }

From fe6c4eb8e661ca054c479938a90be8eb89bd111f Mon Sep 17 00:00:00 2001
From: Tom Doggett <nocoolnametom@gmail.com>
Date: Thu, 26 Jan 2017 15:28:40 -0800
Subject: [PATCH 066/899] gcalcli: init at 3.4.0

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

diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix
new file mode 100644
index 00000000000..7d5f16cfde1
--- /dev/null
+++ b/pkgs/applications/misc/gcalcli/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, pkgs, lib, python, pythonPackages }:
+
+pythonPackages.buildPythonApplication rec {
+  version = "3.4.0";
+  name = "gcalcli-${version}";
+
+  src = fetchFromGitHub {
+    owner = "insanum";
+    repo = "gcalcli";
+    rev = "v${version}";
+    sha256 = "171awccgnmfv4j7m2my9387sjy60g18kzgvscl6pzdid9fn9rrm8";
+  };
+
+  propagatedBuildInputs = with pythonPackages; [
+    dateutil
+    gflags
+    google_api_python_client
+    httplib2
+    oauth2client
+    parsedatetime
+    six
+    vobject
+  ] ++ lib.optional (!pythonPackages.isPy3k) futures;
+
+  meta = with lib; {
+    homepage = https://github.com/insanum/gcalcli;
+    description = "CLI for Google Calendar";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 86b45daecb2..ae116f8bc85 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13370,6 +13370,8 @@ with pkgs;
 
   game-music-emu = callPackage ../applications/audio/game-music-emu { };
 
+  gcalcli = callPackage ../applications/misc/gcalcli { };
+
   gcolor2 = callPackage ../applications/graphics/gcolor2 { };
 
   get_iplayer = callPackage ../applications/misc/get_iplayer {};

From 41a0d0587233803a133024054c307a903f1cfcb6 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 29 Jan 2017 17:04:57 +0100
Subject: [PATCH 067/899] git-hub: 0.10 -> 0.11.0

Includes fixes for CVE-2016-7793 and CVE-2016-7794.
---
 .../version-management/git-and-tools/git-hub/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
index f67d575b5b3..82549fd9a57 100644
--- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "git-hub-${version}";
-  version = "0.10";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
-    sha256 = "0zy1g6zzv6cw8ffj8ffm28qa922fys2826n5813p8icqypi04y0k";
+    sha256 = "1lpi373vzr6gda0gic7w37qhipfg7bjpn8nwjjgz44vf2vjlhf9k";
     rev = "v${version}";
     repo = "git-hub";
     owner = "sociomantic-tsunami";

From 5867045469fe69aa87048dc9d65120e120b97762 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sun, 29 Jan 2017 21:09:17 +0800
Subject: [PATCH 068/899] terragrunt: 0.9.3 -> 0.9.6

---
 pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index aad37ca4d56..98e8beefd06 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "terragrunt-${version}";
-  version = "0.9.3";
+  version = "0.9.6";
 
   goPackagePath = "github.com/gruntwork-io/terragrunt";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev    = "v${version}";
     owner  = "gruntwork-io";
     repo   = "terragrunt";
-    sha256 = "0i6sqgyxhi6icp7nps9prc40m9wsbr71v967kgl2865sgb214rdx";
+    sha256 = "0x4qpf4jqrm55rg5xifk6gz4gy42506k5g1l5461xln0rsmifpkf";
   };
 
   goDeps = ./deps.nix;

From 92cb10a2536b50bac1d38a5a3f312560b7072453 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 29 Jan 2017 17:54:12 +0100
Subject: [PATCH 069/899] i2pd: 2.10.0 -> 2.11.0

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

diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index 56af632e616..b7527cf97ce 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -4,13 +4,13 @@ stdenv.mkDerivation rec {
 
   name = pname + "-" + version;
   pname = "i2pd";
-  version = "2.10.0";
+  version = "2.11.0";
 
   src = fetchFromGitHub {
     owner = "PurpleI2P";
     repo = pname;
     rev = version;
-    sha256 = "0lw0vcibp3v5xz855h4x2rs3ff7yx86znzjfnfri348wg413js5c";
+    sha256 = "1ky4ckv5p86xxgjkgxdi48c9q9h4pff2blilg03bxks8f8dxfy9f";
   };
 
   buildInputs = [ boost zlib openssl ];

From e324c02aa5f90664d1dcb73017b2501ffbaaf1fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 29 Jan 2017 18:00:52 +0100
Subject: [PATCH 070/899] nixos: i2pd, follow redirect

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

diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index abb7a4e9137..c5b27350b3c 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -8,7 +8,7 @@ let
 
   homeDir = "/var/lib/i2pd";
 
-  extip = "EXTIP=\$(${pkgs.curl.bin}/bin/curl -sf \"http://jsonip.com\" | ${pkgs.gawk}/bin/awk -F'\"' '{print $4}')";
+  extip = "EXTIP=\$(${pkgs.curl.bin}/bin/curl -sLf \"http://jsonip.com\" | ${pkgs.gawk}/bin/awk -F'\"' '{print $4}')";
 
   toYesNo = b: if b then "true" else "false";
 

From 18599495c4dbaff63adc4451e9f1315cf8b5ec08 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 29 Jan 2017 18:42:58 +0200
Subject: [PATCH 071/899] stdenv: make is64bit evaluate true on aarch64

This should fix the NSS build.
---
 pkgs/stdenv/generic/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 2010e35f58a..c61d0e2d641 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -343,6 +343,7 @@ let
              || system == "x86_64-openbsd"
              || system == "x86_64-cygwin"
              || system == "x86_64-solaris"
+             || system == "aarch64-linux"
              || system == "mips64el-linux";
       isMips = system == "mips-linux"
             || system == "mips64el-linux";

From 0abc1a7668c8805257f5c3af1d3955613558de0b Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Sun, 29 Jan 2017 10:56:13 +0100
Subject: [PATCH 072/899] alot : 0.3.7 -> 0.5

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index aee320cea1f..c9d8475baf8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -805,7 +805,7 @@ in {
 
 
   alot = buildPythonPackage rec {
-    rev = "0.3.7";
+    rev = "0.5";
     name = "alot-${rev}";
 
     disabled = isPy3k;
@@ -814,7 +814,7 @@ in {
       owner = "pazz";
       repo = "alot";
       inherit rev;
-      sha256 = "0sscmmf42gsrjbisi6wm01alzlnq6wqhpwkm8pc557075jfg19il";
+      sha256 = "1hzajfh0f21k97xip9blg7zifiv3y5k33swp2h9sc57qd7qkr5i6";
     };
 
     postPatch = ''
@@ -831,6 +831,7 @@ in {
         self.python_magic
         self.configobj
         self.pygpgme
+        self.mock
       ];
 
     postInstall = ''

From 3f774f6c51f1a374ef985e326b116614268eb290 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 25 Jan 2017 16:19:56 +0100
Subject: [PATCH 073/899] hackage2nix: enable hydra builds for brick

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index bd4b212b52b..fd23a2a2069 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2619,7 +2619,6 @@ dont-distribute-packages:
   breakout:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   breve:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   brians-brain:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  brick:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   brillig:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   broccoli:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   broker-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]

From c1c0cf3de704df474fc3820adb11ba2f63a9f8bb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 24 Jan 2017 23:34:49 +0100
Subject: [PATCH 074/899] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.0.4-8-g0d49e12 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/4be631c8331a59af11583cb37813409a77493fe8.
---
 .../haskell-modules/hackage-packages.nix      | 1395 +++++++++++++----
 1 file changed, 1111 insertions(+), 284 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 276965d28d2..a505b8b2ea5 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -5773,6 +5773,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "GLUT_2_7_0_11" = callPackage
+    ({ mkDerivation, array, base, containers, OpenGL, StateVar
+     , transformers
+     }:
+     mkDerivation {
+       pname = "GLUT";
+       version = "2.7.0.11";
+       sha256 = "da270ef3027f48fd62115e6f1e90a44334e3da5524e4619dbab6d186f5511b5d";
+       libraryHaskellDepends = [
+         array base containers OpenGL StateVar transformers
+       ];
+       homepage = "http://www.haskell.org/haskellwiki/Opengl";
+       description = "A binding for the OpenGL Utility Toolkit";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "GLUtil" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
      , filepath, hpp, JuicyPixels, linear, OpenGL, OpenGLRaw
@@ -8169,6 +8186,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HTTP_4000_3_5" = callPackage
+    ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
+     , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
+     , network, network-uri, parsec, pureMD5, split, test-framework
+     , test-framework-hunit, time, wai, warp
+     }:
+     mkDerivation {
+       pname = "HTTP";
+       version = "4000.3.5";
+       sha256 = "bca0bf130666e924abaf3daff22be6e27928f83f91d6a34cbc39616497908aed";
+       revision = "2";
+       editedCabalFile = "6b9a05236856d7cd5523b18339cc577f3d2522609558816b072f33aa94c9bbc9";
+       libraryHaskellDepends = [
+         array base bytestring mtl network network-uri parsec time
+       ];
+       testHaskellDepends = [
+         base bytestring case-insensitive conduit conduit-extra deepseq
+         http-types httpd-shed HUnit mtl network network-uri pureMD5 split
+         test-framework test-framework-hunit wai warp
+       ];
+       homepage = "https://github.com/haskell/HTTP";
+       description = "A library for client-side HTTP";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HTTP-Simple" = callPackage
     ({ mkDerivation, base, HTTP, network }:
      mkDerivation {
@@ -11155,6 +11198,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Lykah" = callPackage
+    ({ mkDerivation, array, base, blaze-markup, blazeT, clay
+     , containers, directory, filepath, filesystem-trees, formatting
+     , ListLike, mtl, old-locale, pandoc, regex-compat, regex-posix
+     , safe, split, template-haskell, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "Lykah";
+       version = "0.0.2";
+       sha256 = "1978ba358278a38cf7f22d60983c4b2d87111e785e9a24109b94e2aa26199cd5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base blaze-markup blazeT clay containers directory filepath
+         filesystem-trees formatting ListLike mtl old-locale pandoc
+         regex-compat regex-posix safe split template-haskell text time
+         transformers
+       ];
+       executableHaskellDepends = [
+         array base blaze-markup blazeT clay containers directory filepath
+         filesystem-trees formatting ListLike mtl old-locale pandoc
+         regex-compat regex-posix safe split template-haskell text time
+         transformers
+       ];
+       homepage = "http://johannesgerer.com/buchhaltung";
+       description = "A static website and blog generator";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "MASMGen" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
@@ -16620,17 +16692,17 @@ self: {
   "TaxonomyTools" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cassava, cmdargs
      , directory, either-unwrap, EntrezHTTP, fgl, hxt, parsec, process
-     , Taxonomy, vector
+     , Taxonomy, text, vector
      }:
      mkDerivation {
        pname = "TaxonomyTools";
-       version = "1.0.0";
-       sha256 = "6019493009c6b720fdabae83c939460780dca06ec67251160814f1dca842f26a";
+       version = "1.0.1";
+       sha256 = "e424ba53cf01ba63d58c83745a56e0f2eada4eb6b5ce0c30f280e0ad2955cb95";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson base bytestring cassava cmdargs directory either-unwrap
-         EntrezHTTP fgl hxt parsec process Taxonomy vector
+         EntrezHTTP fgl hxt parsec process Taxonomy text vector
        ];
        description = "Tool for parsing, processing, comparing and visualizing taxonomy data";
        license = stdenv.lib.licenses.gpl3;
@@ -18892,13 +18964,15 @@ self: {
      }:
      mkDerivation {
        pname = "accelerate-arithmetic";
-       version = "0.0.1";
-       sha256 = "819c4d6b24bf5858bf9ef77a002724d1685f80ac8c2c074b329ac3a51a0f7224";
+       version = "0.1";
+       sha256 = "0f7d4142618ba5d134cd0bf4d20f7e5f3df171cbf05c7d3526a6a50dd0ffa20a";
        libraryHaskellDepends = [
          accelerate accelerate-utility base QuickCheck utility-ht
        ];
-       testHaskellDepends = [ accelerate base QuickCheck ];
-       homepage = "http://code.haskell.org/~thielema/accelerate-arithmetic/";
+       testHaskellDepends = [
+         accelerate accelerate-utility base QuickCheck
+       ];
+       homepage = "http://hub.darcs.net/thielema/accelerate-arithmetic/";
        description = "Linear algebra and interpolation using the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -18958,13 +19032,13 @@ self: {
      }:
      mkDerivation {
        pname = "accelerate-cufft";
-       version = "0.0";
-       sha256 = "a7f5f2ee43acebd1a5caf6fd268b05def2d279485bf1e7021a0299097ef9ca89";
+       version = "0.0.0.1";
+       sha256 = "d78fd117e67ad141910f1a95ec5c82beb351bfe9a144c8cdb36fe94950055c8d";
        libraryHaskellDepends = [
          accelerate accelerate-cuda accelerate-fourier accelerate-utility
          base cuda cufft
        ];
-       homepage = "http://code.haskell.org/~thielema/accelerate-cufft/";
+       homepage = "http://hub.darcs.net/thielema/accelerate-cufft/";
        description = "Accelerate frontend to the CUFFT library (Fourier transform)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19048,8 +19122,8 @@ self: {
      }:
      mkDerivation {
        pname = "accelerate-fourier";
-       version = "0.0";
-       sha256 = "58acf3266fb8007706c97c69024b5fdf2be08b5e1a1975944c7fd40848a9ec2c";
+       version = "0.0.1";
+       sha256 = "3ce3fbeaa6f7b280ffcca54fd524f4666487bb79813cf7a3f98601517cd87f82";
        libraryHaskellDepends = [
          accelerate accelerate-arithmetic accelerate-utility base containers
          QuickCheck transformers utility-ht
@@ -19058,7 +19132,7 @@ self: {
          accelerate accelerate-arithmetic accelerate-utility base QuickCheck
          utility-ht
        ];
-       homepage = "http://code.haskell.org/~thielema/accelerate-fourier/";
+       homepage = "http://hub.darcs.net/thielema/accelerate-fourier/";
        description = "Fast Fourier transform and convolution using the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19140,10 +19214,10 @@ self: {
     ({ mkDerivation, accelerate, base, utility-ht }:
      mkDerivation {
        pname = "accelerate-utility";
-       version = "0.1";
-       sha256 = "fbbe0d70a474d82bdfe7d4b6ded152145df23dc0f1fcc256e9a20b1ae9f4b0d8";
+       version = "0.1.1";
+       sha256 = "570f779a9ef35e6ddbbf2843cad38148c7c07f21686fbc4f4c87c3579de34135";
        libraryHaskellDepends = [ accelerate base utility-ht ];
-       homepage = "http://code.haskell.org/~thielema/accelerate-utility/";
+       homepage = "http://hub.darcs.net/thielema/accelerate-utility/";
        description = "Utility functions for the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -21544,8 +21618,8 @@ self: {
     ({ mkDerivation, base, syb, template-haskell }:
      mkDerivation {
        pname = "algebraic-classes";
-       version = "0.7";
-       sha256 = "76ecdf393bb6f9d1e3b429ba1af82b49bd20b966914cb17d307625f7498e5e38";
+       version = "0.7.1";
+       sha256 = "2c7f14f25fad0fa316de29fa34fbb73ca61e1a7b4aa9f79a8c437abe3f1e1770";
        libraryHaskellDepends = [ base syb template-haskell ];
        homepage = "https://github.com/sjoerdvisscher/algebraic-classes";
        description = "Conversions between algebraic classes and F-algebras";
@@ -27070,10 +27144,9 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "arithmatic";
-       version = "0.1.0.2";
-       sha256 = "1de210330bfde4124c1fc898b71bfc423926c6dc91fbc78b01ad927af3b02939";
+       version = "0.1.0.3";
+       sha256 = "5825d0d6a8c000ec334b3a6eaa4601a8e329c672bb230b01a564dd2a87a2b45f";
        libraryHaskellDepends = [ base ];
-       doHaddock = false;
        description = "do things with numbers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -28277,6 +28350,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "attic-schedule" = callPackage
+    ({ mkDerivation, attoparsec, base, control-bool, doctest, foldl
+     , protolude, system-filepath, text, time, turtle
+     }:
+     mkDerivation {
+       pname = "attic-schedule";
+       version = "0.2.0";
+       sha256 = "23c66396ce46fdb6c617b074257dbda3172e5621bc8079dcc1849c09ed6f35e3";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         attoparsec base control-bool foldl protolude system-filepath text
+         time turtle
+       ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "http://github.com/passy/attic-schedule#readme";
+       description = "A script I use to run \"attic\" for my backups";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "atto-lisp" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-textual
      , bytestring, containers, deepseq, HUnit, test-framework
@@ -29032,6 +29125,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aviation-cessna172-diagrams" = callPackage
+    ({ mkDerivation, aviation-cessna172-weight-balance, aviation-units
+     , aviation-weight-balance, base, colour, diagrams-cairo
+     , diagrams-core, diagrams-lib, directory, doctest, filepath
+     , hgeometry, lens, mtl, parsec, plots, QuickCheck, quickcheck-text
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "aviation-cessna172-diagrams";
+       version = "0.0.2";
+       sha256 = "ca9d567106b63c285f6ce149019073a04ecd020e3dc1bda91bcd843e4afae417";
+       libraryHaskellDepends = [
+         aviation-cessna172-weight-balance aviation-units
+         aviation-weight-balance base colour diagrams-cairo diagrams-core
+         diagrams-lib hgeometry lens mtl plots
+       ];
+       testHaskellDepends = [
+         base directory doctest filepath parsec QuickCheck quickcheck-text
+         template-haskell
+       ];
+       homepage = "https://github.com/data61/aviation-cessna172-diagrams";
+       description = "Diagrams for the Cessna 172 aircraft in aviation";
+       license = "unknown";
+       broken = true;
+     }) {aviation-cessna172-weight-balance = null; 
+         aviation-units = null; aviation-weight-balance = null;};
+
   "avl-static" = callPackage
     ({ mkDerivation, base, QuickCheck, test-framework
      , test-framework-quickcheck2
@@ -33065,32 +33185,23 @@ self: {
      }) {};
 
   "biohazard" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, async, attoparsec, base
-     , base-prelude, binary, bytestring, bytestring-mmap, containers
-     , directory, exceptions, filepath, hashable, hybrid-vectors
-     , iteratee, ListLike, nonlinear-optimization, primitive, process
-     , random, scientific, shake, stm, template-haskell, text
-     , transformers, unix, unordered-containers, vector
-     , vector-algorithms, vector-binary-instances, vector-th-unbox, zlib
+    ({ mkDerivation, aeson, async, attoparsec, base, base-prelude
+     , binary, bytestring, bytestring-mmap, containers, directory
+     , exceptions, filepath, hashable, iteratee, ListLike, primitive
+     , random, scientific, stm, text, transformers, unix
+     , unordered-containers, vector, vector-algorithms, vector-th-unbox
+     , zlib
      }:
      mkDerivation {
        pname = "biohazard";
-       version = "0.6.9";
-       sha256 = "b69e935377daf170cea90cfb5d7cc765527d5b606d1dacf30b93cccfb2228628";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.6.10";
+       sha256 = "d966220ae495fb0b4ac792ac02aea3a8786f7a792ce7dcf0e88d4ee27378ebda";
        libraryHaskellDepends = [
-         aeson aeson-pretty async attoparsec base base-prelude binary
-         bytestring bytestring-mmap containers directory exceptions filepath
-         hashable hybrid-vectors iteratee ListLike nonlinear-optimization
-         primitive random scientific stm template-haskell text transformers
-         unix unordered-containers vector vector-algorithms
-         vector-binary-instances vector-th-unbox zlib
-       ];
-       executableHaskellDepends = [
-         aeson aeson-pretty async base binary bytestring containers
-         directory filepath process random shake stm text transformers unix
-         unordered-containers vector vector-algorithms vector-th-unbox
+         aeson async attoparsec base base-prelude binary bytestring
+         bytestring-mmap containers directory exceptions filepath hashable
+         iteratee ListLike primitive random scientific stm text transformers
+         unix unordered-containers vector vector-algorithms vector-th-unbox
+         zlib
        ];
        homepage = "http://github.com/udo-stenzel/biohazard";
        description = "bioinformatics support library";
@@ -34359,8 +34470,8 @@ self: {
      }:
      mkDerivation {
        pname = "ble";
-       version = "0.1.0.0";
-       sha256 = "718781b4acc79797450e46340060088ce5d1a110e3cb8d525b0b0ee5a675fd12";
+       version = "0.1.3.0";
+       sha256 = "adddceeeca53d3ef79dc6e3d8a01f41d3382d8227a794c5df8adbae24ae799fb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -35533,23 +35644,22 @@ self: {
      }) {};
 
   "brick" = callPackage
-    ({ mkDerivation, base, containers, contravariant, data-default
-     , deepseq, dlist, microlens, microlens-mtl, microlens-th, stm
-     , template-haskell, text, text-zipper, transformers, vector, vty
+    ({ mkDerivation, base, containers, contravariant, deepseq, dlist
+     , microlens, microlens-mtl, microlens-th, stm, template-haskell
+     , text, text-zipper, transformers, vector, vty
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.16";
-       sha256 = "ebc1dea2d4891e7a66d3b3ee965b6ed16c9ad74ab5143836fa7e1c81dc0c19ff";
+       version = "0.17";
+       sha256 = "891cb3323b1de2ed27849399cf8ab1ed1467560813a6182edb53b3726e4b3b68";
        libraryHaskellDepends = [
-         base containers contravariant data-default deepseq dlist microlens
-         microlens-mtl microlens-th stm template-haskell text text-zipper
-         transformers vector vty
+         base containers contravariant deepseq dlist microlens microlens-mtl
+         microlens-th stm template-haskell text text-zipper transformers
+         vector vty
        ];
        homepage = "https://github.com/jtdaugherty/brick/";
        description = "A declarative terminal user interface library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "brillig" = callPackage
@@ -36598,6 +36708,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bytestring-typenats" = callPackage
+    ({ mkDerivation, base, binary, blake2, bytestring, cereal
+     , cryptohash, deepseq, entropy, QuickCheck
+     }:
+     mkDerivation {
+       pname = "bytestring-typenats";
+       version = "1.0.0";
+       sha256 = "b02618cf4130b1b83e93670d3d5cf8436cc8ae49ffafa2298156506b35642381";
+       libraryHaskellDepends = [
+         base binary blake2 bytestring cereal cryptohash deepseq entropy
+         QuickCheck
+       ];
+       testHaskellDepends = [ base bytestring cryptohash QuickCheck ];
+       homepage = "https://github.com/tsuraan/bytestring-typenats";
+       description = "Bytestrings with typenat lengths";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bytestringparser" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -37447,6 +37575,25 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "cabal-rpm_0_11" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath, old-locale
+     , process, time, unix
+     }:
+     mkDerivation {
+       pname = "cabal-rpm";
+       version = "0.11";
+       sha256 = "c705a4fc4bcdf64989d26b94b52381ab465db542e0a99e8614ced9fe872ed9d5";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base Cabal directory filepath old-locale process time unix
+       ];
+       homepage = "https://github.com/juhp/cabal-rpm";
+       description = "RPM packaging tool for Haskell Cabal-based packages";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cabal-scripts" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -39529,15 +39676,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cayley-client_0_3_2" = callPackage
+  "cayley-client_0_3_3" = 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.2";
-       sha256 = "f6e8b5cd6909554b8a75dedd303df0948fd3d27826b053ab2fc5779e7a7e5bc7";
+       version = "0.3.3";
+       sha256 = "0c94c59e68b148b1bbae85ea89a8676e8b108b8f51accf84295bf40bf5f2e5e3";
        libraryHaskellDepends = [
          aeson attoparsec base binary bytestring exceptions http-client
          http-conduit lens lens-aeson mtl text transformers
@@ -41974,7 +42121,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
-  "clckwrks_0_24_0_1" = callPackage
+  "clckwrks_0_24_0_2" = callPackage
     ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base
      , blaze-html, bytestring, cereal, containers, directory, filepath
      , happstack-authenticate, happstack-hsp, happstack-jmacro
@@ -41988,8 +42135,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks";
-       version = "0.24.0.1";
-       sha256 = "94e21d56e4a1e7efcc3f8f39252ff1ee6b74b3dd3408fd265dddbdf1606cdede";
+       version = "0.24.0.2";
+       sha256 = "2b1ec612cfb2071de5bdfc166be7d392cc7a00df5e95c53b9b7a3a407e5563d5";
        libraryHaskellDepends = [
          acid-state aeson aeson-qq attoparsec base blaze-html bytestring
          cereal containers directory filepath happstack-authenticate
@@ -42085,8 +42232,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks-plugin-ircbot";
-       version = "0.6.15";
-       sha256 = "1e6e9747a27e24258448b98d82217f9f69317beea18e4607accab1aa3df0ee88";
+       version = "0.6.17.2";
+       sha256 = "683b9db965858f5ff428175e7d3e0e3822278a182fb1d96aec727d7132a00a2b";
        libraryHaskellDepends = [
          acid-state attoparsec base blaze-html bytestring clckwrks
          containers directory filepath happstack-hsp happstack-server hsp
@@ -42094,7 +42241,7 @@ self: {
          safecopy text web-plugins web-routes web-routes-th
        ];
        libraryToolDepends = [ hsx2hs ];
-       homepage = "http://clckwrks.com/";
+       homepage = "http://www.clckwrks.com/";
        description = "ircbot plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42124,6 +42271,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clckwrks-plugin-media_0_6_16_2" = callPackage
+    ({ mkDerivation, acid-state, attoparsec, base, blaze-html, cereal
+     , clckwrks, containers, directory, filepath, gd, happstack-server
+     , hsp, hsx2hs, ixset, magic, mtl, reform, reform-happstack
+     , reform-hsp, safecopy, text, web-plugins, web-routes
+     , web-routes-th
+     }:
+     mkDerivation {
+       pname = "clckwrks-plugin-media";
+       version = "0.6.16.2";
+       sha256 = "bcd36e122d0ab4b791f738d6accb8a98488b73842cef3c4721f6fb89dc62d986";
+       libraryHaskellDepends = [
+         acid-state attoparsec base blaze-html cereal clckwrks containers
+         directory filepath gd happstack-server hsp ixset magic mtl reform
+         reform-happstack reform-hsp safecopy text web-plugins web-routes
+         web-routes-th
+       ];
+       libraryToolDepends = [ hsx2hs ];
+       homepage = "http://clckwrks.com/";
+       description = "media plugin for clckwrks";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clckwrks-plugin-page" = callPackage
     ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks
      , containers, directory, filepath, happstack-hsp, happstack-server
@@ -42150,7 +42321,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clckwrks-plugin-page_0_4_3_8" = callPackage
+  "clckwrks-plugin-page_0_4_3_9" = callPackage
     ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks
      , containers, directory, filepath, happstack-hsp, happstack-server
      , hsp, hsx2hs, ixset, mtl, old-locale, random, reform
@@ -42160,8 +42331,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks-plugin-page";
-       version = "0.4.3.8";
-       sha256 = "57be510f5d829eb54a37e2777748250923283f8d9eb1690abb069368c36c00e6";
+       version = "0.4.3.9";
+       sha256 = "4e3095f11f8b627cb74779aaa7356a5a19ed6ce9eade1af741e7417aab4b43e4";
        libraryHaskellDepends = [
          acid-state aeson attoparsec base clckwrks containers directory
          filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl
@@ -42503,8 +42674,8 @@ self: {
      }:
      mkDerivation {
        pname = "clit";
-       version = "0.2.2.3";
-       sha256 = "ae1261e3bec1ff034b9fa5fea1be1592f0a32d4581d96d9b4c834554d839c1fc";
+       version = "0.2.2.4";
+       sha256 = "0642761a2e3a3426e0ca676503b0c00f7434f3b1d807e799005382e18680109d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -43636,6 +43807,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "colorful-monoids" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "colorful-monoids";
+       version = "0.2.0.1";
+       sha256 = "0becada75e006e88563631bf0a33a241e40772d04b15220d660f16c02cf4b331";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/minad/colorful-monoids#readme";
+       description = "Styled console text output using ANSI escape sequences";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "colorize-haskell" = callPackage
     ({ mkDerivation, ansi-terminal, base, haskell-lexer }:
      mkDerivation {
@@ -45704,6 +45888,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "connection_0_2_7" = callPackage
+    ({ mkDerivation, base, byteable, bytestring, containers
+     , data-default-class, network, socks, tls, x509, x509-store
+     , x509-system, x509-validation
+     }:
+     mkDerivation {
+       pname = "connection";
+       version = "0.2.7";
+       sha256 = "46d452dc92ebc6e851a9f9ac01dd2d29df846795dfce039cf07ba7102a323235";
+       libraryHaskellDepends = [
+         base byteable bytestring containers data-default-class network
+         socks tls x509 x509-store x509-system x509-validation
+       ];
+       homepage = "http://github.com/vincenthz/hs-connection";
+       description = "Simple and easy network connections API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "connection-pool" = callPackage
     ({ mkDerivation, base, between, data-default-class, monad-control
      , network, resource-pool, streaming-commons, time
@@ -45850,6 +46053,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "constraints_0_9" = callPackage
+    ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl
+     , transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "constraints";
+       version = "0.9";
+       sha256 = "b7b4135ceacdd18d291bbd83277cc21bbb066d0e16ce35f879619f17c1c8d29d";
+       libraryHaskellDepends = [
+         base binary deepseq ghc-prim hashable mtl transformers
+         transformers-compat
+       ];
+       homepage = "http://github.com/ekmett/constraints/";
+       description = "Constraint manipulation";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "constructible" = callPackage
     ({ mkDerivation, arithmoi, base, binary-search, complex-generic }:
      mkDerivation {
@@ -45901,7 +46122,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "consul-haskell_0_4" = callPackage
+  "consul-haskell_0_4_2" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , connection, either, exceptions, http-client, http-client-tls
      , http-types, HUnit, lifted-async, lifted-base, monad-control
@@ -45910,8 +46131,8 @@ self: {
      }:
      mkDerivation {
        pname = "consul-haskell";
-       version = "0.4";
-       sha256 = "f81c503aae87cb38659848d1d797eb1e7ffbf9c2b72836e30f2e5b05267c9bda";
+       version = "0.4.2";
+       sha256 = "b10812b70dfbce7037f9f23eda71fa2fa6fc97ed309bd63c00f226522d30d80a";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring connection either
          exceptions http-client http-client-tls http-types lifted-async
@@ -47707,16 +47928,18 @@ self: {
      }) {};
 
   "crawlchain" = callPackage
-    ({ mkDerivation, base, bytestring, directory, HTTP, network-uri
-     , split, tagsoup, time
+    ({ mkDerivation, base, bytestring, directory, http-streams
+     , network-uri, split, tagsoup, text, time
      }:
      mkDerivation {
        pname = "crawlchain";
-       version = "0.1.1.7";
-       sha256 = "93c39d63111fd8bdc4222a763ff1cb289b4e1e9b5342a3f0273fa6180a6062f1";
+       version = "0.1.2.0";
+       sha256 = "1016c3a0de17b1807443d342a281310bb81a13df36a33294ffe72bd6fdb13b9f";
        libraryHaskellDepends = [
-         base bytestring directory HTTP network-uri split tagsoup time
+         base bytestring directory http-streams network-uri split tagsoup
+         text time
        ];
+       testHaskellDepends = [ base split tagsoup ];
        description = "Simulation user crawl paths";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48081,17 +48304,18 @@ self: {
      }) {};
 
   "criu-rpc-types" = callPackage
-    ({ mkDerivation, base, proto-lens, proto-lens-protoc }:
+    ({ mkDerivation, base, proto-lens, proto-lens-protoc, protobuf }:
      mkDerivation {
        pname = "criu-rpc-types";
-       version = "0.0.0.1";
-       sha256 = "eb5cbe012507a81ede156858b262f69270308592ba1faf097e00b90eff496aad";
+       version = "0.0.0.2";
+       sha256 = "ffba61e1bcf0f6975f2411a2facfb4fcf2f5921c3adefdd0caa0b5e331bad586";
        setupHaskellDepends = [ base proto-lens-protoc ];
        libraryHaskellDepends = [ base proto-lens proto-lens-protoc ];
+       libraryPkgconfigDepends = [ protobuf ];
        homepage = "https://github.com/wayofthepie/haskell-criu-rpc-types";
        description = "Criu RPC protocol buffer types";
        license = stdenv.lib.licenses.mit;
-     }) {};
+     }) {inherit (pkgs) protobuf;};
 
   "crockford" = callPackage
     ({ mkDerivation, base, digits, QuickCheck, safe }:
@@ -56037,8 +56261,8 @@ self: {
        pname = "distributed-process-client-server";
        version = "0.1.3.2";
        sha256 = "2c905624d5486b7bc8bd1a4763b139e7eb364b20467c9abddd553f9afbd3601f";
-       revision = "1";
-       editedCabalFile = "de3bac2148543dcd00c7cebdaf95a7403d7b0f966683bf9ee23fe4eb8d33fcc6";
+       revision = "2";
+       editedCabalFile = "aedbbade08de4e7483cc9bc84e41ca9e6227a279480e025a27c78f31f1775413";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-async distributed-process-extras fingertree
@@ -56122,8 +56346,8 @@ self: {
        pname = "distributed-process-extras";
        version = "0.2.1.2";
        sha256 = "c1a4e1a5e3ec30089251db40fd479b19c5fd74c9dd8ca50f8eb32aaf9747a048";
-       revision = "2";
-       editedCabalFile = "e487c5799fa82b7e6b88ddf2d58e21d9add876a967b2820f502ac5c5307aec31";
+       revision = "3";
+       editedCabalFile = "a7d9628e4fa3b916e130422a1370532cda52e1b1a2818574a38e9335fe0074c7";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          fingertree hashable mtl stm time transformers unordered-containers
@@ -57054,6 +57278,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "doctest_0_11_1" = callPackage
+    ({ mkDerivation, base, base-compat, code-page, deepseq, directory
+     , filepath, ghc, ghc-paths, hspec, HUnit, process, QuickCheck
+     , setenv, silently, stringbuilder, syb, transformers, with-location
+     }:
+     mkDerivation {
+       pname = "doctest";
+       version = "0.11.1";
+       sha256 = "5b6ab30f0bf4061707b7bb33445da4c8a00df3e8b3ed04cf7c86f18a6007ad2a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base-compat code-page deepseq directory filepath ghc ghc-paths
+         process syb transformers
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base base-compat code-page deepseq directory filepath ghc ghc-paths
+         hspec HUnit process QuickCheck setenv silently stringbuilder syb
+         transformers with-location
+       ];
+       homepage = "https://github.com/sol/doctest#readme";
+       description = "Test interactive Haskell examples";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "doctest-discover" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , filepath
@@ -59343,12 +59594,12 @@ self: {
      }) {};
 
   "effects" = callPackage
-    ({ mkDerivation, base, containers, newtype, void }:
+    ({ mkDerivation, base, containers, newtype-generics, void }:
      mkDerivation {
        pname = "effects";
-       version = "0.2.2";
-       sha256 = "64807819354882e0deab7212e6faf9dab1a36108f645ddc211ef25beb1005f7b";
-       libraryHaskellDepends = [ base containers newtype void ];
+       version = "0.2.3";
+       sha256 = "80c116525a7aa51a779614dfb75f945954e1509eb424dbbf14fc0b1bf4a7959c";
+       libraryHaskellDepends = [ base containers newtype-generics void ];
        homepage = "http://github.com/sjoerdvisscher/effects";
        description = "Computational Effects";
        license = stdenv.lib.licenses.bsd3;
@@ -60527,6 +60778,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "empty-monad" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "empty-monad";
+       version = "0.1.0.0";
+       sha256 = "bea74c847e505c3432c39de3e419f2f65d88b6c2ec83415d184409c8ffe56605";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/vadimvinnik/empty-monad";
+       description = "A container that always has no values";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "enchant" = callPackage
     ({ mkDerivation, base, c2hs, enchant }:
      mkDerivation {
@@ -63473,6 +63736,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fast-logger_2_4_8" = callPackage
+    ({ mkDerivation, array, auto-update, base, bytestring, directory
+     , easy-file, filepath, hspec, text, unix, unix-time
+     }:
+     mkDerivation {
+       pname = "fast-logger";
+       version = "2.4.8";
+       sha256 = "444cdd6e795b79de8b7e14d62f43c9231e7388ab63cb6f9b6f395555422d30ac";
+       libraryHaskellDepends = [
+         array auto-update base bytestring directory easy-file filepath text
+         unix unix-time
+       ];
+       testHaskellDepends = [ base bytestring directory hspec ];
+       homepage = "https://github.com/kazu-yamamoto/logger";
+       description = "A fast logging system";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fast-math" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -65669,8 +65951,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "fizz-buzz";
-       version = "0.1.0.2";
-       sha256 = "b7845c186b3471b9db735e98361540890eb7c94fe8c9c4d97991a339e01d7426";
+       version = "0.1.0.3";
+       sha256 = "642bf826fe8ef18d95a5f9640171b82f637a7717811bd87fe5ea14044e5616b0";
        libraryHaskellDepends = [ base ];
        description = "Functional Fizz/Buzz";
        license = stdenv.lib.licenses.bsd3;
@@ -70886,6 +71168,8 @@ self: {
        pname = "ghc-mod";
        version = "5.7.0.0";
        sha256 = "2aab240c89ab6513807cea4e2065d474274a5ae20f8edc4f77df8e2eafb9e5ca";
+       revision = "1";
+       editedCabalFile = "2a98257b2c370e8d557b4924c77e088d8220e17558317174dfc35b2e0c94d1e3";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [
@@ -72219,8 +72503,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtksource";
-       version = "3.0.11";
-       sha256 = "fb130bc4894aa689ecccb01be94ef246585ddba296fef5145a688e9c14027646";
+       version = "3.0.12";
+       sha256 = "b7babfb18749b73f32dab35c464f641381b1ebc333cbdd6fe2167825db45476c";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
@@ -73758,15 +74042,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "glabrous_0_3_0" = callPackage
+  "glabrous_0_3_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , cereal, cereal-text, directory, either, hspec, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "glabrous";
-       version = "0.3.0";
-       sha256 = "3e1547d3e2ec7098e52262961bb710683ff83422793ce68b59cc9a0918831490";
+       version = "0.3.1";
+       sha256 = "419c5ec7c93c981ced838d6711e18565883abbb3b229d34a6fc904722e678ec8";
        libraryHaskellDepends = [
          aeson aeson-pretty attoparsec base bytestring cereal cereal-text
          either text unordered-containers
@@ -73869,14 +74153,46 @@ self: {
     ({ mkDerivation, base, lens }:
      mkDerivation {
        pname = "glaze";
-       version = "0.2.0.0";
-       sha256 = "ab8552b9ccf26ddcf3af418a4ab8f7225e24f2141fc4171f8e10f6bfd8f6d7c5";
+       version = "0.2.0.2";
+       sha256 = "16b27081d6c2dac74748e6dbcbfdc6855d48c2ebc730648bf74d34ae6a44c92c";
        libraryHaskellDepends = [ base lens ];
        homepage = "https://github.com/louispan/glaze#readme";
        description = "Framework for rendering things with metadata/headers and values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "glazier" = callPackage
+    ({ mkDerivation, base, lens, mmorph, mtl, profunctors
+     , semigroupoids, transformers
+     }:
+     mkDerivation {
+       pname = "glazier";
+       version = "0.6.2.2";
+       sha256 = "c10d7626aaf6c431c97ce019f92f950df59d83ecb1b3d149ffdac3dafca3abd6";
+       libraryHaskellDepends = [
+         base lens mmorph mtl profunctors semigroupoids transformers
+       ];
+       homepage = "https://github.com/louispan/glazier#readme";
+       description = "Composable widgets framework";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "glazier-pipes" = callPackage
+    ({ mkDerivation, base, glazier, lens, mtl, pipes, pipes-misc
+     , transformers
+     }:
+     mkDerivation {
+       pname = "glazier-pipes";
+       version = "0.1.1.0";
+       sha256 = "8ef62edb1dadc2de9ba322dd3567887ab7dcb766b9c54b84ad140424e22344de";
+       libraryHaskellDepends = [
+         base glazier lens mtl pipes pipes-misc transformers
+       ];
+       homepage = "https://github.com/louispan/glazier-pipes#readme";
+       description = "Converts Glazier widgets into a Pipe";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gli" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , friendly-time, http-client, http-client-tls, http-conduit
@@ -73966,31 +74282,26 @@ self: {
 
   "glirc" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring
-     , bytestring, Cabal, config-value, containers, data-default-class
-     , directory, filepath, gitrev, hashable, hookup, HsOpenSSL, HUnit
-     , irc-core, kan-extensions, lens, network, process, regex-tdfa
-     , socks, split, stm, text, time, transformers, unix
-     , unordered-containers, vector, vty
+     , bytestring, Cabal, config-value, containers, directory, filepath
+     , gitrev, hashable, hookup, HsOpenSSL, HUnit, irc-core
+     , kan-extensions, lens, network, process, regex-tdfa, socks, split
+     , stm, text, time, transformers, unix, unordered-containers, vector
+     , vty
      }:
      mkDerivation {
        pname = "glirc";
-       version = "2.20.2";
-       sha256 = "acefc316a6075dbeb2fa95bf1ee99a8e4c3097eaf5be9273d676719d07a94b00";
-       revision = "2";
-       editedCabalFile = "78d1b995b9b7bcb4dc012341c65b8e4d6c4893c8db7c6b66146cfe0726ca1be3";
+       version = "2.20.2.1";
+       sha256 = "95b148b68701f7a1f521e0884ab405fe61bbb5a4a1a47d399e536cad1a400110";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
        libraryHaskellDepends = [
          async attoparsec base base64-bytestring bytestring config-value
-         containers data-default-class directory filepath gitrev hashable
-         hookup HsOpenSSL irc-core kan-extensions lens network process
-         regex-tdfa socks split stm text time transformers unix
-         unordered-containers vector vty
-       ];
-       executableHaskellDepends = [
-         base data-default-class lens text vty
+         containers directory filepath gitrev hashable hookup HsOpenSSL
+         irc-core kan-extensions lens network process regex-tdfa socks split
+         stm text time transformers unix unordered-containers vector vty
        ];
+       executableHaskellDepends = [ base lens text vty ];
        testHaskellDepends = [ base HUnit ];
        homepage = "https://github.com/glguy/irc-core";
        description = "Console IRC client";
@@ -77502,6 +77813,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "google-oauth2-for-cli" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, filepath
+     , hspec, http-types, req, time, wai, warp
+     }:
+     mkDerivation {
+       pname = "google-oauth2-for-cli";
+       version = "0.1.0.0";
+       sha256 = "ccbb42b8d946442399d057cf211df23f46a8d95bd82a6965bc078e5385d2232d";
+       libraryHaskellDepends = [
+         aeson base bytestring directory filepath http-types req time wai
+         warp
+       ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/ishiy1993/google-oauth2-for-cli#readme";
+       description = "Get Google OAuth2 token for CLI tools";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "google-oauth2-jwt" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL
      , RSA, text, unix-time
@@ -77979,10 +78308,10 @@ self: {
      }:
      mkDerivation {
        pname = "graflog";
-       version = "3.0.0";
-       sha256 = "4f1022278257fb078ba136050f4f919047bdc0f9a9a3e4d97b9cdcd2740feaf6";
+       version = "6.1.0";
+       sha256 = "60575c60b20dc7d52f4297f2d979b3074fd093dae2bbb700ba132f45e50dc3c3";
        libraryHaskellDepends = [
-         aeson base bytestring containers text text-conversions
+         aeson base bytestring containers mtl text text-conversions
        ];
        testHaskellDepends = [
          aeson base containers hspec mtl test-fixture text
@@ -80337,8 +80666,8 @@ self: {
      }:
      mkDerivation {
        pname = "habit";
-       version = "0.2.1.2";
-       sha256 = "d15b24cf6c949469fecaa0e3da8faab350626b260c1dfbce915ba1be4c5e4bea";
+       version = "0.2.2.0";
+       sha256 = "59aa5d9f13c7aefd9f8134d764b2f8f8fb9a3b42cb7a42737296e36618e9cf22";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -87042,6 +87371,8 @@ self: {
        pname = "hasql-migration";
        version = "0.1.3";
        sha256 = "2d49e3b7a5ed775150abf2164795b10d087d2e1c714b0a8320f0c0094df068b3";
+       revision = "1";
+       editedCabalFile = "571db02447c6691e7307dd00ff2a6836ed3bacd1ec95b45f057e30e78b07da94";
        libraryHaskellDepends = [
          base base64-bytestring bytestring contravariant cryptohash
          data-default-class directory hasql hasql-transaction text time
@@ -87517,6 +87848,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hax" = callPackage
+    ({ mkDerivation, aeson, array, base, blaze-html, blaze-markup
+     , boxes, bytestring, containers, Decimal, directory, filepath, mtl
+     , split, template-haskell, text, transformers
+     }:
+     mkDerivation {
+       pname = "hax";
+       version = "0.0.2";
+       sha256 = "0ed30e279a8519572333385e0d8ca707a96b98245d0885dc272ddd086fd9f241";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson array base blaze-html blaze-markup boxes bytestring
+         containers Decimal directory filepath mtl split template-haskell
+         text transformers
+       ];
+       executableHaskellDepends = [
+         aeson array base blaze-html blaze-markup boxes bytestring
+         containers Decimal directory filepath mtl split template-haskell
+         text transformers
+       ];
+       homepage = "http://johannesgerer.com/hax";
+       description = "Haskell cash-flow and tax simulation";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "haxl" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
      , deepseq, exceptions, filepath, ghc-prim, hashable, HUnit, pretty
@@ -88675,6 +89032,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hedis_0_9_7" = callPackage
+    ({ mkDerivation, async, base, bytestring, bytestring-lexing
+     , deepseq, HUnit, mtl, network, resource-pool, scanner
+     , slave-thread, stm, test-framework, test-framework-hunit, text
+     , time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hedis";
+       version = "0.9.7";
+       sha256 = "594c2d210745a72559de6a6a5f3fa646bf400fd0bb990c8f29d3390d1a2d6d87";
+       libraryHaskellDepends = [
+         async base bytestring bytestring-lexing deepseq mtl network
+         resource-pool scanner stm text time unordered-containers vector
+       ];
+       testHaskellDepends = [
+         async base bytestring HUnit mtl slave-thread stm test-framework
+         test-framework-hunit text time
+       ];
+       homepage = "https://github.com/informatikr/hedis";
+       description = "Client library for the Redis datastore: supports full command set, pipelining";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hedis-config" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hedis, scientific, text
      , time
@@ -90370,8 +90751,8 @@ self: {
      }:
      mkDerivation {
        pname = "hgrev";
-       version = "0.2.0";
-       sha256 = "c92ae1487c35e619f725b13b16c0845b7fbabcdb8beaa5abb67b831d0ad912ef";
+       version = "0.2.1";
+       sha256 = "0bb7b8f2fbb23e94bfacaf171d6affa13093ce2045ceeb1af47b783b51d5874d";
        libraryHaskellDepends = [
          aeson base bytestring directory filepath process template-haskell
        ];
@@ -91172,15 +91553,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hip_1_5_0_0" = callPackage
+  "hip_1_5_1_0" = callPackage
     ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, colour
      , deepseq, directory, filepath, hspec, JuicyPixels, netpbm
      , primitive, process, QuickCheck, repa, temporary, vector
      }:
      mkDerivation {
        pname = "hip";
-       version = "1.5.0.0";
-       sha256 = "b8d04faecd4b6adaaa3b0625eef17f0658794ee6fcfa64c522104a0df30206b9";
+       version = "1.5.1.0";
+       sha256 = "6b779b4befbfcae4cf2e5b232481b337f51730c83423771397c8332d93832a3f";
        libraryHaskellDepends = [
          base bytestring Chart Chart-diagrams colour deepseq directory
          filepath JuicyPixels netpbm primitive process repa temporary vector
@@ -91651,14 +92032,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hjsonpointer_1_1_0_1" = callPackage
+  "hjsonpointer_1_1_0_2" = callPackage
     ({ mkDerivation, aeson, base, hashable, hspec, http-types
      , QuickCheck, semigroups, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "hjsonpointer";
-       version = "1.1.0.1";
-       sha256 = "ebdd6c5528da76fd59871ca14903576e2b5ca8a1327ec952ae0957ed6b37c2ed";
+       version = "1.1.0.2";
+       sha256 = "fe6826b2ede3ce7541e5c88bda78dd66cc76725f14b06533bb5ecadddcb2cc65";
        libraryHaskellDepends = [
          aeson base hashable QuickCheck semigroups text unordered-containers
          vector
@@ -91700,7 +92081,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hjsonschema_1_5_0_0" = callPackage
+  "hjsonschema_1_5_0_1" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , directory, file-embed, filepath, hashable, hjsonpointer, hspec
      , http-client, http-types, pcre-heavy, profunctors, protolude
@@ -91709,8 +92090,8 @@ self: {
      }:
      mkDerivation {
        pname = "hjsonschema";
-       version = "1.5.0.0";
-       sha256 = "a8295fff702386bc03777c0a01455e4f13539795153a60b5b3f5bb24d188ff95";
+       version = "1.5.0.1";
+       sha256 = "1ac15c8f32621c50fa4b445a0f17ac7a58dc716867aed4f6e1bb7478d0e288a3";
        libraryHaskellDepends = [
          aeson base bytestring containers file-embed filepath hashable
          hjsonpointer http-client http-types pcre-heavy profunctors
@@ -91933,8 +92314,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-iadd";
-       version = "1.1.3";
-       sha256 = "ee0a1d448a761f471a777f7e7b66af11bd5955df3e5823970db5bf4602a8b350";
+       version = "1.1.4";
+       sha256 = "a2f52abe59637dc63c5b08f79311a8ea4543df18661fdd46b519c8746af90b6c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92034,8 +92415,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-ui";
-       version = "1.1.1";
-       sha256 = "fea7b5bee2611dee3fac71bfdfcbd5bf80ec7396a45c67e804e880c6d6729d2d";
+       version = "1.1.2";
+       sha256 = "5cc85502297f3ccf31990ebbe60178ee9f90ea434e86756f39e2848f0ae788d1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -94235,8 +94616,8 @@ self: {
      }:
      mkDerivation {
        pname = "hothasktags";
-       version = "0.3.7";
-       sha256 = "0fed99175f0b3b6e6852a17e2c46f12ee9463daff37894d9d0381409ff98c4e3";
+       version = "0.3.8";
+       sha256 = "07b00026a1b8e47719736ae6c64fe2396396c50c8367f82361e6fa4142dcf301";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -94773,6 +95154,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hpio_0_8_0_6" = callPackage
+    ({ mkDerivation, async, base, base-compat, bytestring, containers
+     , directory, doctest, exceptions, filepath, hlint, hspec, mtl
+     , mtl-compat, optparse-applicative, QuickCheck, text, transformers
+     , transformers-compat, unix, unix-bytestring
+     }:
+     mkDerivation {
+       pname = "hpio";
+       version = "0.8.0.6";
+       sha256 = "3e46024f61f4dda52e5edafa3bbcab1d2dfe7f5f68a32c6f8480cecfd864cb94";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base-compat bytestring containers directory exceptions
+         filepath mtl mtl-compat QuickCheck text transformers
+         transformers-compat unix unix-bytestring
+       ];
+       executableHaskellDepends = [
+         async base base-compat exceptions mtl mtl-compat
+         optparse-applicative transformers transformers-compat
+       ];
+       testHaskellDepends = [
+         async base base-compat bytestring containers directory doctest
+         exceptions filepath hlint hspec mtl mtl-compat QuickCheck text
+         transformers transformers-compat unix unix-bytestring
+       ];
+       homepage = "https://github.com/dhess/hpio";
+       description = "Monads for GPIO in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hplayground" = callPackage
     ({ mkDerivation, base, containers, data-default, haste-compiler
      , haste-perch, monads-tf, transformers
@@ -97573,15 +97986,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec_2_4_0" = callPackage
+  "hspec_2_4_1" = callPackage
     ({ mkDerivation, base, call-stack, directory, hspec-core
      , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck
      , stringbuilder, transformers
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.4.0";
-       sha256 = "8c8119027bb7c6529bb513b53dca1b55d1df3b7c8f083de0c513d993594a873b";
+       version = "2.4.1";
+       sha256 = "c6d29aea545769b116e14ca7ca2c64d7e18649fc792adb98623b119d3a80f6da";
        libraryHaskellDepends = [
          base call-stack hspec-core hspec-discover hspec-expectations HUnit
          QuickCheck transformers
@@ -97667,7 +98080,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-core_2_4_0" = callPackage
+  "hspec-core_2_4_1" = callPackage
     ({ mkDerivation, ansi-terminal, array, async, base, call-stack
      , deepseq, directory, filepath, hspec-expectations, hspec-meta
      , HUnit, process, QuickCheck, quickcheck-io, random, setenv
@@ -97675,8 +98088,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-core";
-       version = "2.4.0";
-       sha256 = "0703c133b0f85df86c9b0b9bf00fa9ef1c51ca914ac6aef8b15ec6b9db78c353";
+       version = "2.4.1";
+       sha256 = "b2ea5b6a37542fa138060085ee7bf82ab0ab130f2c287a57ae05a4f83ae437da";
        libraryHaskellDepends = [
          ansi-terminal array async base call-stack deepseq directory
          filepath hspec-expectations HUnit QuickCheck quickcheck-io random
@@ -97710,12 +98123,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-discover_2_4_0" = callPackage
+  "hspec-discover_2_4_1" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta }:
      mkDerivation {
        pname = "hspec-discover";
-       version = "2.4.0";
-       sha256 = "563d0b596cac68f5c0dcb8f361cd017bed32f817835e8c6b5858d1902e743bb3";
+       version = "2.4.1";
+       sha256 = "e0670831f06a8924779cc81d4eb706b35d3a7176cba6bee5df506de961e8d5f3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath ];
@@ -98096,6 +98509,8 @@ self: {
        pname = "hspec-smallcheck";
        version = "0.4.1";
        sha256 = "c5ddd014ad58679554d2726a4442a124d7a3a9fad04c928c610cdc46773fc0f5";
+       revision = "1";
+       editedCabalFile = "b53fe047da5d19509d2b756c094a2acba8f7cc7011b750b0ae3f77176a53c5f6";
        libraryHaskellDepends = [ base hspec-core smallcheck ];
        testHaskellDepends = [
          base hspec hspec-core QuickCheck smallcheck
@@ -98105,6 +98520,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-smallcheck_0_4_2" = callPackage
+    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, smallcheck }:
+     mkDerivation {
+       pname = "hspec-smallcheck";
+       version = "0.4.2";
+       sha256 = "ba09d4b2eb1c6ff2d680aa09b36eb6c0b395cc258ae716b8d1db511073385ed3";
+       libraryHaskellDepends = [ base hspec-core smallcheck ];
+       testHaskellDepends = [
+         base hspec hspec-core QuickCheck smallcheck
+       ];
+       homepage = "http://hspec.github.io/";
+       description = "SmallCheck support for the Hspec testing framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-snap" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers
      , digestive-functors, directory, HandsomeSoup, hspec, hspec-core
@@ -101027,6 +101458,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hurriyet" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, hspec, http-client
+     , http-client-tls, text
+     }:
+     mkDerivation {
+       pname = "hurriyet";
+       version = "0.1.0.0";
+       sha256 = "ed580d1bbb870e3c1a95d777ff83cde2120b8d9dde57700352080ce35ea7131e";
+       libraryHaskellDepends = [
+         aeson base bytestring http-client http-client-tls text
+       ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/yigitozkavci/hurriyet-haskell";
+       description = "Haskell bindings for Hurriyet API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "husk-scheme" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
      , filepath, ghc-paths, haskeline, knob, mtl, parsec, process, time
@@ -105351,16 +105799,14 @@ self: {
      }:
      mkDerivation {
        pname = "integer-logarithms";
-       version = "1";
-       sha256 = "9a34b7a9ea6cf0e760159913f41305f786fd027efce3c4e4fe700c2a46cf103c";
-       revision = "2";
-       editedCabalFile = "ee7f145ff4250ef4babd7e0b679b1a26c79da0897da2453cc12281a78f992a04";
+       version = "1.0.1";
+       sha256 = "0f453f8eb8b19122eac37d04ea95e9da5f9f07eb9ad750c174c3522e7d3a784c";
        libraryHaskellDepends = [ array base ghc-prim integer-gmp ];
        testHaskellDepends = [
          base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck
          tasty-smallcheck
        ];
-       homepage = "https://github.com/Bodigrim/integer-logarithms";
+       homepage = "https://github.com/phadej/integer-logarithms";
        description = "Integer logarithms";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105867,6 +106313,8 @@ self: {
        pname = "invertible";
        version = "0.1.2";
        sha256 = "3ee47b2ba98ff687c4988a1b065be8791523f169a57c006c719c58bd368bd344";
+       revision = "1";
+       editedCabalFile = "26bd0b94b44b28ce135b2520c82cadba5934a9eadf09229608a2e3eb439078a9";
        libraryHaskellDepends = [
          arrows base haskell-src-meta HList invariant lens
          partial-isomorphisms Piso semigroupoids template-haskell
@@ -106948,11 +107396,13 @@ self: {
      }:
      mkDerivation {
        pname = "itemfield";
-       version = "1.2.2.1";
-       sha256 = "fe8bfe62a98a286f86f80f65cd3d5c09097fcc75eafda4281e8c19f999233b90";
+       version = "1.2.4.0";
+       sha256 = "31739fdc0bd51d88b3120f449a218d19508cb93e471619f6b93e7d5a1ba3498f";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base brick microlens text vty ];
+       libraryHaskellDepends = [
+         base brick data-default microlens text vty
+       ];
        executableHaskellDepends = [
          base brick data-default microlens microlens-th random text vty
        ];
@@ -111919,8 +112369,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdacube-gl";
-       version = "0.5.2.2";
-       sha256 = "9dda0c70df5caddee65ca89cabb4e7b169f413f7bf54cab15ec66b3df9154c5e";
+       version = "0.5.2.3";
+       sha256 = "be33bde75e5753c134cba7dd2e98e8f31870bd0bfb3787659a3cf357c677dd2b";
        libraryHaskellDepends = [
          base bytestring containers JuicyPixels lambdacube-ir mtl OpenGLRaw
          vector vector-algorithms
@@ -113733,22 +114183,21 @@ self: {
      }) {};
 
   "legion" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, binary, binary-conduit
-     , bytestring, canteven-http, conduit, conduit-extra, containers
+    ({ mkDerivation, aeson, base, binary, binary-conduit, 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
+     , monad-logger, network, Ranged-sets, scotty, scotty-resource, text
+     , time, transformers, unix, uuid, wai, wai-extra, warp
      }:
      mkDerivation {
        pname = "legion";
-       version = "0.8.0.3";
-       sha256 = "eaa865b6ded7ecb0110298a61a5768fce49e3ef270e5a45db6a0cc2d2a7ba166";
+       version = "0.9.0.0";
+       sha256 = "a40c85edad14c4dca15d3d4ef6b3c240c5afb30a3798ab63acc43f6f1d5a08ce";
        libraryHaskellDepends = [
-         aeson attoparsec base binary binary-conduit 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
+         aeson base binary binary-conduit bytestring canteven-http conduit
+         conduit-extra containers data-default-class data-dword directory
+         exceptions http-types monad-logger network Ranged-sets scotty
+         scotty-resource text time transformers unix uuid wai wai-extra warp
        ];
        homepage = "https://github.com/owensmurray/legion#readme";
        description = "Distributed, stateful, homogeneous microservice framework";
@@ -113805,16 +114254,18 @@ self: {
      }) {};
 
   "legion-extra" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, canteven-log, containers
-     , data-default-class, legion, network, safe, split, yaml
+    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
+     , canteven-log, conduit, containers, data-default-class, data-dword
+     , directory, legion, network, safe, split, stm, transformers, yaml
      }:
      mkDerivation {
        pname = "legion-extra";
-       version = "0.1.0.6";
-       sha256 = "e9471ff2b1d50596bbe86fd414e78bcd31aa78b867ac3439fddd58e21d24c0c5";
+       version = "0.1.2.0";
+       sha256 = "20619c18f0b4155fdef8a358338a987e41bc0ae3081990cdfcf3354cc4c67bec";
        libraryHaskellDepends = [
-         aeson base bytestring canteven-log containers data-default-class
-         legion network safe split yaml
+         aeson attoparsec base binary bytestring canteven-log conduit
+         containers data-default-class data-dword directory legion network
+         safe split stm transformers yaml
        ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/owensmurray/legion-extra#readme";
@@ -115383,6 +115834,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lifted-async_0_9_1_1" = callPackage
+    ({ mkDerivation, async, base, constraints, HUnit, lifted-base
+     , monad-control, mtl, tasty, tasty-hunit, tasty-th
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "lifted-async";
+       version = "0.9.1.1";
+       sha256 = "31ac44b834723c9b9d40a319135a712802f2690d700df283d0a380fcd8d48e40";
+       libraryHaskellDepends = [
+         async base constraints lifted-base monad-control transformers-base
+       ];
+       testHaskellDepends = [
+         async base HUnit lifted-base monad-control mtl tasty tasty-hunit
+         tasty-th
+       ];
+       homepage = "https://github.com/maoe/lifted-async";
+       description = "Run lifted IO operations asynchronously and wait for their results";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lifted-base" = callPackage
     ({ mkDerivation, base, HUnit, monad-control, test-framework
      , test-framework-hunit, transformers, transformers-base
@@ -117582,6 +118055,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "log-domain_0_11" = callPackage
+    ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq
+     , directory, distributive, doctest, filepath, generic-deriving
+     , hashable, safecopy, semigroupoids, semigroups, simple-reflect
+     , vector
+     }:
+     mkDerivation {
+       pname = "log-domain";
+       version = "0.11";
+       sha256 = "4750cd5b2b9b6317493c39c264f7a1fe68f50f8ef30ac1e1c6c42c35b78242cb";
+       libraryHaskellDepends = [
+         base binary bytes cereal comonad deepseq distributive hashable
+         safecopy semigroupoids semigroups vector
+       ];
+       testHaskellDepends = [
+         base directory doctest filepath generic-deriving semigroups
+         simple-reflect
+       ];
+       homepage = "http://github.com/ekmett/log-domain/";
+       description = "Log-domain arithmetic";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "log-effect" = callPackage
     ({ mkDerivation, base, bytestring, extensible-effects, fast-logger
      , time
@@ -121398,23 +121895,22 @@ self: {
      }) {};
 
   "mega-sdist" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, containers, directory
-     , http-conduit, http-types, network, shelly, system-fileio
-     , system-filepath, tar, text, transformers, zlib-conduit
+    ({ mkDerivation, base, classy-prelude-conduit, conduit-extra
+     , directory, filepath, http-conduit, tar-conduit, typed-process
+     , yaml
      }:
      mkDerivation {
        pname = "mega-sdist";
-       version = "0.2.10.4";
-       sha256 = "8f5e7a5edb1c21a8a219867ec670b7def9b764ce0326caea0bf1ff84cfa10575";
+       version = "0.3.0";
+       sha256 = "afbfc37f2ebbf8bbe880297f784e81a63886dc14aacb2ed921d6c63c66abbf81";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base bytestring conduit containers directory http-conduit
-         http-types network shelly system-fileio system-filepath tar text
-         transformers zlib-conduit
+         base classy-prelude-conduit conduit-extra directory filepath
+         http-conduit tar-conduit typed-process yaml
        ];
        homepage = "https://github.com/snoyberg/mega-sdist";
-       description = "Handles uploading to Hackage from mega repos (deprecated)";
+       description = "Handles uploading to Hackage from mega repos";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -125457,8 +125953,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "more-extensible-effects";
-       version = "0.1.0.0";
-       sha256 = "e7d3dfd5e6982f7a071acca3180d2968c621fb91b50fa44aaa64f22734b46357";
+       version = "0.1.0.4";
+       sha256 = "01b798127f9d19235b911d468d0380571251b1662233a9e608be962805a884ea";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/qzchenwl/more-extensible-effects#readme";
        description = "Initial project template from stack";
@@ -132368,6 +132864,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "opaleye-trans_0_3_4" = callPackage
+    ({ mkDerivation, base, mtl, opaleye, postgresql-simple
+     , product-profunctors, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "opaleye-trans";
+       version = "0.3.4";
+       sha256 = "84925620c5d596657a3d2467e0fbe297fad2876362da7f063d6b6034910d6e60";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base mtl opaleye postgresql-simple product-profunctors transformers
+         transformers-base
+       ];
+       executableHaskellDepends = [
+         base opaleye postgresql-simple product-profunctors
+       ];
+       homepage = "https://github.com/WraithM/opaleye-trans";
+       description = "A monad transformer for Opaleye";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "open-browser" = callPackage
     ({ mkDerivation, base, process }:
      mkDerivation {
@@ -133932,8 +134451,8 @@ self: {
      }:
      mkDerivation {
        pname = "overload";
-       version = "0.1.0.2";
-       sha256 = "9880a0c4d5ffbfb6b681a785b581d1bac0fadcb677d0dc5edf6ea75bf01fa598";
+       version = "0.1.0.3";
+       sha256 = "d57d1c8af311c6a01bb83a4ecd5687ead614744ebed32b6d5ab46a0c7f4fa4d7";
        libraryHaskellDepends = [
          base simple-effects template-haskell th-expand-syns
        ];
@@ -134505,6 +135024,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pandoc-citeproc_0_10_4" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+     , containers, data-default, directory, filepath, hs-bibutils, mtl
+     , old-locale, pandoc, pandoc-types, parsec, process, rfc5051
+     , setenv, split, syb, tagsoup, temporary, text, time
+     , unordered-containers, vector, xml-conduit, yaml
+     }:
+     mkDerivation {
+       pname = "pandoc-citeproc";
+       version = "0.10.4";
+       sha256 = "1dcfffe0dc26d0a1b5ef5688a09c1bb81231702169196e6faed8ddef360d848f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default directory filepath
+         hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
+         setenv split syb tagsoup text time unordered-containers vector
+         xml-conduit yaml
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty attoparsec base bytestring filepath pandoc
+         pandoc-types syb text yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring directory filepath mtl pandoc pandoc-types
+         process temporary text yaml
+       ];
+       doCheck = false;
+       homepage = "https://github.com/jgm/pandoc-citeproc";
+       description = "Supports using pandoc with citeproc";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pandoc-citeproc-preamble" = callPackage
     ({ mkDerivation, base, directory, filepath, pandoc-types, process
      }:
@@ -134697,15 +135250,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pandoc-types_1_19" = callPackage
+  "pandoc-types_1_17_0_5" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , ghc-prim, HUnit, QuickCheck, string-qq, syb, test-framework
      , test-framework-hunit, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "pandoc-types";
-       version = "1.19";
-       sha256 = "2bdd244a1a8fda8d3da07b7e0ffbfe54d7808709bb35825963177b112d4dcccf";
+       version = "1.17.0.5";
+       sha256 = "c8825588b587ff5ed0c105156a11a43f3b752279997231cfc13102809bbc51b3";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq ghc-prim QuickCheck syb
        ];
@@ -136132,21 +136685,22 @@ self: {
 
   "patch-image" = callPackage
     ({ mkDerivation, accelerate, accelerate-arithmetic, accelerate-cuda
-     , accelerate-fft, accelerate-io, accelerate-utility, base, Cabal
-     , filepath, gnuplot, hmatrix, JuicyPixels, utility-ht, vector
+     , accelerate-cufft, accelerate-fourier, accelerate-io
+     , accelerate-utility, base, Cabal, filepath, gnuplot, hmatrix
+     , JuicyPixels, utility-ht, vector
      }:
      mkDerivation {
        pname = "patch-image";
-       version = "0.1.0.1";
-       sha256 = "82cadcdd7aee8793777de191c2f0fe7702bf0e110b2b95031d88c4f9386d4353";
+       version = "0.1.0.2";
+       sha256 = "5dfe265b69765a8a9e2ef550da10a6a65c56fde23ad2124046bafe2c2ec95e35";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         accelerate accelerate-arithmetic accelerate-cuda accelerate-fft
-         accelerate-io accelerate-utility base Cabal filepath gnuplot
-         hmatrix JuicyPixels utility-ht vector
+         accelerate accelerate-arithmetic accelerate-cuda accelerate-cufft
+         accelerate-fourier accelerate-io accelerate-utility base Cabal
+         filepath gnuplot hmatrix JuicyPixels utility-ht vector
        ];
-       homepage = "http://code.haskell.org/~thielema/patch-image/";
+       homepage = "http://hub.darcs.net/thielema/patch-image/";
        description = "Compose a big image from overlapping parts";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137997,23 +138551,22 @@ self: {
 
   "pgdl" = callPackage
     ({ mkDerivation, base, binary, brick, bytestring, Cabal, conduit
-     , conduit-extra, configurator, containers, data-default, directory
+     , conduit-extra, configurator, containers, directory
      , directory-listing-webpage-parser, filepath, http-conduit
      , http-types, microlens, process, resourcet, tagsoup, text, time
      , transformers, unix, vector, vty
      }:
      mkDerivation {
        pname = "pgdl";
-       version = "10.6";
-       sha256 = "f3b2c7b1871a0a906db45d963233e2cd124ac206526a37421552e6456d57d249";
+       version = "10.7";
+       sha256 = "e9e91142bff59bff5768af8c927c10133c68f1a8504115999b5623d6cd3bfe73";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base binary brick bytestring Cabal conduit conduit-extra
-         configurator containers data-default directory
-         directory-listing-webpage-parser filepath http-conduit http-types
-         microlens process resourcet tagsoup text time transformers unix
-         vector vty
+         configurator containers directory directory-listing-webpage-parser
+         filepath http-conduit http-types microlens process resourcet
+         tagsoup text time transformers unix vector vty
        ];
        description = "browse directory listing webpages and download files from them";
        license = stdenv.lib.licenses.publicDomain;
@@ -139181,6 +139734,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pipes-fluid" = callPackage
+    ({ mkDerivation, async, base, constraints, hspec, lens
+     , lifted-async, mmorph, monad-control, mtl, pipes
+     , pipes-concurrency, pipes-misc, stm, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "pipes-fluid";
+       version = "0.3.0.0";
+       sha256 = "6a7a26c90797f3e7b14686b7f16be6ecc2f54b0ee752e268bab77533e6f19e1c";
+       libraryHaskellDepends = [
+         base constraints lens lifted-async monad-control pipes stm
+         transformers transformers-base
+       ];
+       testHaskellDepends = [
+         async base constraints hspec lens lifted-async mmorph monad-control
+         mtl pipes pipes-concurrency pipes-misc stm transformers
+       ];
+       homepage = "https://github.com/louispan/pipes-fluid#readme";
+       description = "Reactively combines Producers so that a value is yielded as soon as possible";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pipes-group" = callPackage
     ({ mkDerivation, base, doctest, free, lens-family-core, pipes
      , pipes-parse, transformers
@@ -139306,8 +139882,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-misc";
-       version = "0.2.0.0";
-       sha256 = "d8c56177820ec3d4f7532f98f98026b2e8c9b618572d8fcd97fc4b7446c4e992";
+       version = "0.2.0.1";
+       sha256 = "ef48d83421e90d2f13d8d90e1b7fcd34130eec0bbbefe635c0efa5a6c46b6a04";
        libraryHaskellDepends = [
          base lens mtl pipes pipes-category pipes-concurrency semigroups stm
          transformers
@@ -141830,8 +142406,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-typed";
-       version = "0.4.5";
-       sha256 = "bc60941a88edb91045e1b18c6d94d8466ecaa3eb763facefa9c65d579a5576c4";
+       version = "0.5.0";
+       sha256 = "c6b93a05eff7b5a315dfe26abdd6885dd9290dec3096c3cc795c16bc1395f2ff";
        libraryHaskellDepends = [
          aeson array attoparsec base binary bytestring containers cryptonite
          haskell-src-meta HDBC memory network old-locale postgresql-binary
@@ -142172,8 +142748,8 @@ self: {
      }:
      mkDerivation {
        pname = "preamble";
-       version = "0.0.19";
-       sha256 = "7946241c38661d637d83ad4a5bb624636c9b81770458a5c640be97523e1775d1";
+       version = "0.0.21";
+       sha256 = "7b5918a713a9d56c85bc36027541809ccf5a60706c0e74f0875fa059cbf8dc24";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -142744,16 +143320,14 @@ self: {
 
   "pretty-simple" = callPackage
     ({ mkDerivation, ansi-terminal, base, containers, doctest, Glob
-     , lens, mono-traversable, mtl, parsec, semigroups, text
-     , transformers
+     , mtl, parsec, text, transformers
      }:
      mkDerivation {
        pname = "pretty-simple";
-       version = "1.1.0.2";
-       sha256 = "0286520edbca9018b254b2a0a8839b03904c1da4919dfd19433bb9c7c7ada1a2";
+       version = "2.0.0.0";
+       sha256 = "e64bfc73a962bba3f773e8e271d63e3e25924e1a6febbea7d3935d37ae856fbe";
        libraryHaskellDepends = [
-         ansi-terminal base containers lens mono-traversable mtl parsec
-         semigroups text transformers
+         ansi-terminal base containers mtl parsec text transformers
        ];
        testHaskellDepends = [ base doctest Glob ];
        homepage = "https://github.com/cdepillabout/pretty-simple";
@@ -142991,8 +143565,8 @@ self: {
      }:
      mkDerivation {
        pname = "printcess";
-       version = "0.1.0.2";
-       sha256 = "53907a189318381f5b6d77a15fa36eff274bc1f500f974dba060896d5d7e2418";
+       version = "0.1.0.3";
+       sha256 = "5f6c220f9e0251785c8b250df3636c2d012d2a670677df46dad64ca4949eb52a";
        libraryHaskellDepends = [ base containers lens mtl transformers ];
        testHaskellDepends = [
          base containers hspec HUnit lens mtl QuickCheck transformers
@@ -145616,15 +146190,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) qhull;};
 
+  "qif" = callPackage
+    ({ mkDerivation, attoparsec, base, microlens, microlens-th
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text, time
+     }:
+     mkDerivation {
+       pname = "qif";
+       version = "1.1.0";
+       sha256 = "c0e432203b4b9bb3c225670e58aeee0cd75a83914f518e9b092e9980d3579f9a";
+       libraryHaskellDepends = [
+         attoparsec base microlens microlens-th text time
+       ];
+       testHaskellDepends = [
+         attoparsec base microlens QuickCheck tasty tasty-hunit
+         tasty-quickcheck text time
+       ];
+       homepage = "https://github.com/acw/qif";
+       description = "A simple QIF file format parser / printer";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "qr-imager" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cryptonite, directory
-     , haskell-qrencode, jose-jwt, JuicyPixels, lens, MissingH
-     , optparse-applicative, process, vector
+     , haskell-qrencode, hspec, jose-jwt, JuicyPixels, lens, libqrencode
+     , MissingH, optparse-applicative, process, vector
      }:
      mkDerivation {
        pname = "qr-imager";
-       version = "0.2.1.2";
-       sha256 = "0830675a25f49cdb3322304feb90e0779536fdbcea805e5ddca2328ae5a07c39";
+       version = "0.2.2.0";
+       sha256 = "ea05cd1bad4720bbd0927c118add95e83e4d92a576d81c4f1b56d32b726d3e47";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -145632,13 +146226,14 @@ self: {
          jose-jwt JuicyPixels lens MissingH optparse-applicative process
          vector
        ];
+       libraryPkgconfigDepends = [ libqrencode ];
        executableHaskellDepends = [ base ];
-       testHaskellDepends = [ base process ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/vmchale/QRImager#readme";
        description = "Library to generate QR codes from bytestrings and objects";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs) libqrencode;};
 
   "qr-repa" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cryptonite, directory
@@ -147152,6 +147747,8 @@ self: {
        pname = "random";
        version = "1.1";
        sha256 = "b718a41057e25a3a71df693ab0fe2263d492e759679b3c2fea6ea33b171d3a5a";
+       revision = "1";
+       editedCabalFile = "7b67624fd76ddf97c206de0801dc7e888097e9d572974be9b9ea6551d76965df";
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base ];
        description = "random number library";
@@ -149772,6 +150369,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "regex" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, directory
+     , hashable, heredoc, hsyslog, regex-base, regex-pcre-builtin
+     , regex-tdfa, regex-tdfa-text, shelly, smallcheck, tasty
+     , tasty-hunit, tasty-smallcheck, template-haskell, text, time
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "regex";
+       version = "0.0.0.1";
+       sha256 = "16068310c4d27651f270bb8221d03860407fa2c13e128bd34dd561315362d183";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base bytestring containers hashable heredoc hsyslog
+         regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text smallcheck
+         tasty tasty-hunit tasty-smallcheck template-haskell text time
+         transformers unordered-containers
+       ];
+       executableHaskellDepends = [
+         array base bytestring directory regex-base regex-tdfa shelly text
+       ];
+       testHaskellDepends = [
+         array base bytestring containers directory hashable heredoc hsyslog
+         regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text shelly
+         smallcheck tasty tasty-hunit tasty-smallcheck template-haskell text
+         time transformers unordered-containers
+       ];
+       homepage = "https://iconnect.github.io/regex";
+       description = "A Regular Expression Toolkit for regex-base";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "regex-applicative" = callPackage
     ({ mkDerivation, base, containers, smallcheck, tasty, tasty-hunit
      , tasty-smallcheck, transformers
@@ -154218,6 +154848,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "safe-exceptions-checked" = callPackage
+    ({ mkDerivation, base, deepseq, hspec, safe-exceptions
+     , transformers
+     }:
+     mkDerivation {
+       pname = "safe-exceptions-checked";
+       version = "0.1.0";
+       sha256 = "d807552b828de308d80805f65ee41f3e25571506b10e6b28b0b81de4aec0ca3f";
+       libraryHaskellDepends = [
+         base deepseq safe-exceptions transformers
+       ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/mitchellwrosen/safe-exceptions-checked#readme";
+       description = "Safe, checked exceptions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "safe-failure" = callPackage
     ({ mkDerivation, base, failure }:
      mkDerivation {
@@ -155044,8 +155691,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbp";
-       version = "2.1.5";
-       sha256 = "dd1ac555546ded3c178780c157d86d1075bd8a41f777bafffb9c94f9ef8a4f17";
+       version = "2.1.6";
+       sha256 = "85387a8556d0b25b009ab48b6bcbafb5ac91bfb7dc5442838376f913be59924b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -157001,8 +157648,8 @@ self: {
     ({ mkDerivation, base, containers, doctest, smallcheck }:
      mkDerivation {
        pname = "semiring-num";
-       version = "0.5.4.0";
-       sha256 = "f96f42f4cb9bc0c34f4cc0e41178ad23c60fd4f5ff6f1059df5d352df54564e5";
+       version = "0.6.0.0";
+       sha256 = "08011a1b89aa4ce9ba643add8af48dcaf9304db9d22807a4257b0a5f87c16126";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers doctest smallcheck ];
        homepage = "https://github.com/oisdk/semiring-num";
@@ -158296,23 +158943,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-js_0_9" = callPackage
+  "servant-js_0_9_1" = callPackage
     ({ mkDerivation, base, base-compat, charset, hspec
-     , hspec-expectations, language-ecmascript, lens, servant
-     , servant-foreign, text
+     , hspec-expectations, language-ecmascript, lens, QuickCheck
+     , servant, servant-foreign, text
      }:
      mkDerivation {
        pname = "servant-js";
-       version = "0.9";
-       sha256 = "7a4b5055029c327f6bb90b8283a655ab0f3cc2da426ee94ec1b5d8d4eade6c34";
-       revision = "1";
-       editedCabalFile = "5d19fb0f6529051622c12e8e55fa32123f36a5d1b45a229a822e2ea7c409df1b";
+       version = "0.9.1";
+       sha256 = "bbc8a860d7b84f716fcff7337654115cf6b7ba756d9a325cc0b1124cf82ade27";
+       revision = "2";
+       editedCabalFile = "babc912d297dfde6d2f7ae019458ae5d5f363b5930566a7827df219746aad537";
        libraryHaskellDepends = [
          base base-compat charset lens servant servant-foreign text
        ];
        testHaskellDepends = [
          base base-compat hspec hspec-expectations language-ecmascript lens
-         servant text
+         QuickCheck servant text
        ];
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "Automatically derive javascript functions to query servant webservices";
@@ -160225,10 +160872,10 @@ self: {
      }:
      mkDerivation {
        pname = "shikensu";
-       version = "0.1.3";
-       sha256 = "73d50978e7b6a0c1d1784ab607572411da44aafce58defe45938f2b427b85713";
+       version = "0.2.1";
+       sha256 = "3984671ee884f828df248aa5d9033ece376ecb30cb0f689a4a4aa10a93d697f8";
        libraryHaskellDepends = [
-         aeson base bytestring directory filepath flow Glob
+         aeson base bytestring directory filepath flow Glob text
          unordered-containers
        ];
        testHaskellDepends = [
@@ -160898,18 +161545,18 @@ self: {
      }) {};
 
   "simple-effects" = callPackage
-    ({ mkDerivation, array, base, interlude-l, lens, list-t
-     , monad-control, mtl, transformers, transformers-base
+    ({ mkDerivation, array, base, exceptions, list-t, monad-control
+     , MonadRandom, mtl, text, transformers, transformers-base
      }:
      mkDerivation {
        pname = "simple-effects";
-       version = "0.6.0.2";
-       sha256 = "f8f887e433a4f68a506966b2d41f614cb39602f8bb3b802535f91c2391711a36";
+       version = "0.7.0.1";
+       sha256 = "be3d3ca1fbfc2aee432190f0e737b73478116493beb176216dcad0b1a8c0bc4d";
        libraryHaskellDepends = [
-         array base interlude-l lens list-t monad-control mtl transformers
-         transformers-base
+         array base exceptions list-t monad-control MonadRandom mtl text
+         transformers transformers-base
        ];
-       testHaskellDepends = [ base interlude-l ];
+       testHaskellDepends = [ base ];
        homepage = "https://gitlab.com/LukaHorvat/simple-effects";
        description = "A simple effect system that integrates with MTL";
        license = stdenv.lib.licenses.bsd3;
@@ -162011,20 +162658,20 @@ self: {
   "skylighting" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, bytestring
      , case-insensitive, containers, Diff, directory, filepath, HUnit
-     , hxt, mtl, pretty-show, QuickCheck, regex-pcre-builtin, safe
-     , tasty, tasty-golden, tasty-hunit, text, utf8-string
+     , hxt, mtl, pretty-show, random, regex-pcre-builtin, safe, tasty
+     , tasty-golden, tasty-hunit, text, utf8-string
      }:
      mkDerivation {
        pname = "skylighting";
-       version = "0.1.1.1";
-       sha256 = "27722ea3ac638ace239b241a27a6c66ea9ca1580d5eb97985ec766b88acc4775";
+       version = "0.1.1.2";
+       sha256 = "fb4ae79689b64d0749c6de9e16bcd9a31d8195b8ff4945b8e5bfa54140cfb0cf";
        libraryHaskellDepends = [
          aeson base blaze-html bytestring case-insensitive containers
          directory filepath hxt mtl regex-pcre-builtin safe text utf8-string
        ];
        testHaskellDepends = [
-         aeson base bytestring Diff directory filepath HUnit pretty-show
-         QuickCheck tasty tasty-golden tasty-hunit text
+         aeson base bytestring containers Diff directory filepath HUnit
+         pretty-show random tasty tasty-golden tasty-hunit text
        ];
        homepage = "https://github.com/jgm/skylighting";
        description = "syntax highlighting library";
@@ -166828,7 +167475,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "stackage-curator_0_14_4_1" = callPackage
+  "stackage-curator_0_14_5" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
      , base, base16-bytestring, blaze-html, byteable, bytestring, Cabal
      , classy-prelude-conduit, conduit, conduit-extra, containers
@@ -166844,8 +167491,8 @@ self: {
      }:
      mkDerivation {
        pname = "stackage-curator";
-       version = "0.14.4.1";
-       sha256 = "37d3b9ac875d46d209efcaa9c6e0d1ab1edb421f1153292238582ee1aff66add";
+       version = "0.14.5";
+       sha256 = "11021c2eaf80f7090375c1947e75d441bf4e6131253fc6a7953b6e6ab6948c85";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -167028,8 +167675,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "staf";
-       version = "0.1.0.0";
-       sha256 = "ce066d4b64771489176e72f081b8ec5ba62237ff1f12abe5f515884b0ce8a925";
+       version = "1.0.0";
+       sha256 = "7e7eaa611d5558984253eb1e291443cbca91c4c1593349b406fccd5418dc6230";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/lovasko/staf";
        description = "Numerical statistics for Foldable containers";
@@ -171750,6 +172397,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tablize" = callPackage
+    ({ mkDerivation, attoparsec, base, comma, optparse-applicative
+     , tabl, text
+     }:
+     mkDerivation {
+       pname = "tablize";
+       version = "1.0.0";
+       sha256 = "8af235a39b9047f220e18c2987ee54c08f45e255fcfc13f8bac9ff2a744ba797";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         attoparsec base comma optparse-applicative tabl text
+       ];
+       homepage = "https://github.com/lovasko/tablize";
+       description = "Pretty-printing of CSV files";
+       license = "unknown";
+     }) {};
+
   "tabloid" = callPackage
     ({ mkDerivation, base, bytestring, containers, gtk, hint, parallel
      , process, regex-base, regex-posix
@@ -172778,8 +173443,8 @@ self: {
        pname = "tasty-hspec";
        version = "1.1.3";
        sha256 = "3c597d948cad9c61355a56811533abbad130eb6e4068fd930ab5514c759bfe31";
-       revision = "2";
-       editedCabalFile = "16e03febf0d4bc7921878291345c6658518656d8c8420618e5d72d10143d93f4";
+       revision = "3";
+       editedCabalFile = "1bfa738f1421d9ea83a36c76f41fd0c97e8f1621dad501a4340ddef3a0d420ea";
        libraryHaskellDepends = [
          base hspec hspec-core QuickCheck random tagged tasty
          tasty-quickcheck tasty-smallcheck
@@ -172789,6 +173454,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-hspec_1_1_3_1" = callPackage
+    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random
+     , tagged, tasty, tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "tasty-hspec";
+       version = "1.1.3.1";
+       sha256 = "8ac658b530202d84e34891a6274df1e8e08495a2e5d9d75a8e53a88d2ad85444";
+       libraryHaskellDepends = [
+         base hspec hspec-core QuickCheck random tagged tasty
+         tasty-quickcheck tasty-smallcheck
+       ];
+       homepage = "https://github.com/mitchellwrosen/tasty-hspec";
+       description = "Hspec support for the Tasty test framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-html" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, containers, filepath
      , generic-deriving, mtl, stm, tagged, tasty, text, transformers
@@ -173316,8 +173999,8 @@ self: {
      }:
      mkDerivation {
        pname = "telegram-api";
-       version = "0.5.2.0";
-       sha256 = "17df43de078fb793454c13b8a1226525f8e1c189ef2162f147817f60229a8c32";
+       version = "0.6.0.0";
+       sha256 = "8e930edd4291c66e73ca8fcd30b642b66141a17b1c534aac092642c93311f7f2";
        libraryHaskellDepends = [
          aeson base bytestring http-api-data http-client http-media
          http-types mime-types mtl servant servant-client string-conversions
@@ -174647,6 +175330,27 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "text-builder" = callPackage
+    ({ mkDerivation, base, base-prelude, bytestring
+     , quickcheck-instances, rerebase, semigroups, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text
+     }:
+     mkDerivation {
+       pname = "text-builder";
+       version = "0.4";
+       sha256 = "0931b5988b5f86fbfe9055bb4d21fa1fceaaa8b1619aa951b53921ba2b8ce0b7";
+       libraryHaskellDepends = [
+         base base-prelude bytestring semigroups text
+       ];
+       testHaskellDepends = [
+         quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
+         tasty-smallcheck
+       ];
+       homepage = "https://github.com/nikita-volkov/text-builder";
+       description = "An efficient strict text builder";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "text-conversions" = callPackage
     ({ mkDerivation, base, base16-bytestring, base64-bytestring
      , bytestring, errors, hspec, hspec-discover, text
@@ -176288,6 +176992,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "threepenny-gui-contextmenu" = callPackage
+    ({ mkDerivation, base, threepenny-gui }:
+     mkDerivation {
+       pname = "threepenny-gui-contextmenu";
+       version = "0.1.0.0";
+       sha256 = "090fa5588d278aba7c46ba98ff6055512e2f04ac8dd1ee4faaebc79905d44252";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base threepenny-gui ];
+       executableHaskellDepends = [ base threepenny-gui ];
+       homepage = "https://github.com/barischj/threepenny-gui-contextmenu#readme";
+       description = "Write simple nested context menus for threepenny-gui";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "thrift" = callPackage
     ({ mkDerivation, attoparsec, base, binary, bytestring, containers
      , ghc-prim, hashable, HTTP, network, network-uri, QuickCheck, split
@@ -185367,8 +186086,8 @@ self: {
      }:
      mkDerivation {
        pname = "viewprof";
-       version = "0.0.0";
-       sha256 = "6e518c06c289d01e82a8c7a360e0467ffba419781d4f394c7b8c608bc9303445";
+       version = "0.0.0.1";
+       sha256 = "2e899ac1bab582314e18bb89f95c2623c11bb15dae5c2cce48652251f8bcf7be";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -187267,8 +187986,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-routes";
-       version = "0.9.9";
-       sha256 = "dea8b6b8163fe04bf0ffb9f5a81058eef2017591275735aba7ae448edf689cc9";
+       version = "0.9.10";
+       sha256 = "e872338221f64c5c1ac3e4421b2b31e3b32116b1eac0fba3f6adc73d3e255672";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive containers
          cookie data-default-class filepath http-types mime-types
@@ -187668,6 +188387,38 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "warp_3_2_10" = callPackage
+    ({ mkDerivation, array, async, auto-update, base, blaze-builder
+     , bytestring, bytestring-builder, case-insensitive, containers
+     , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date
+     , http-types, http2, HUnit, iproute, lifted-base, network, process
+     , QuickCheck, silently, simple-sendfile, stm, streaming-commons
+     , text, time, transformers, unix, unix-compat, vault, wai, word8
+     }:
+     mkDerivation {
+       pname = "warp";
+       version = "3.2.10";
+       sha256 = "d81fe27a416ed64555077246e500118dc7921455ae5bbdf117459c4e8e0b8b48";
+       libraryHaskellDepends = [
+         array async auto-update base blaze-builder bytestring
+         bytestring-builder case-insensitive containers ghc-prim hashable
+         http-date http-types http2 iproute network simple-sendfile stm
+         streaming-commons text unix unix-compat vault wai word8
+       ];
+       testHaskellDepends = [
+         array async auto-update base blaze-builder bytestring
+         bytestring-builder case-insensitive containers directory doctest
+         ghc-prim hashable hspec HTTP http-date http-types http2 HUnit
+         iproute lifted-base network process QuickCheck silently
+         simple-sendfile stm streaming-commons text time transformers unix
+         unix-compat vault wai word8
+       ];
+       homepage = "http://github.com/yesodweb/wai";
+       description = "A fast, light-weight web server for WAI applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "warp-dynamic" = callPackage
     ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }:
      mkDerivation {
@@ -187725,6 +188476,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "warp-tls_3_2_3" = callPackage
+    ({ mkDerivation, base, bytestring, cryptonite, data-default-class
+     , network, streaming-commons, tls, wai, warp
+     }:
+     mkDerivation {
+       pname = "warp-tls";
+       version = "3.2.3";
+       sha256 = "f5c4c871fee62021a7b3b22d1f2af3543843a0c54632da6f7be9ef58e65fa292";
+       libraryHaskellDepends = [
+         base bytestring cryptonite data-default-class network
+         streaming-commons tls wai warp
+       ];
+       homepage = "http://github.com/yesodweb/wai";
+       description = "HTTP over TLS support for Warp via the TLS package";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "warp-tls-uid" = callPackage
     ({ mkDerivation, base, bytestring, certificate, conduit
      , crypto-random, network, network-conduit, pem, tls, tls-extra
@@ -188197,6 +188966,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "web-routes-th_0_22_6_1" = callPackage
+    ({ mkDerivation, base, hspec, HUnit, parsec, QuickCheck, split
+     , template-haskell, text, web-routes
+     }:
+     mkDerivation {
+       pname = "web-routes-th";
+       version = "0.22.6.1";
+       sha256 = "249b47bbe00922a69533254dd07fa105e2e90d63676f273215fc9100cdaa21d2";
+       libraryHaskellDepends = [
+         base parsec split template-haskell text web-routes
+       ];
+       testHaskellDepends = [ base hspec HUnit QuickCheck web-routes ];
+       homepage = "https://github.com/happstack/web-routes-th";
+       description = "Support for deriving PathInfo using Template Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "web-routes-transformers" = callPackage
     ({ mkDerivation, base, transformers, web-routes }:
      mkDerivation {
@@ -188251,8 +189038,8 @@ self: {
      }:
      mkDerivation {
        pname = "web3";
-       version = "0.5.2.1";
-       sha256 = "816e5e766e16b3c6aee00eb70a6e967582a782ddca557533afca68a01a8bd2b9";
+       version = "0.5.3.0";
+       sha256 = "258d2344367d7ceb3c1a43acd99b05bb23afbc5c5476be4d341e3ca2f56ae91d";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring cryptonite
          http-client http-client-tls memory template-haskell text
@@ -189051,11 +189838,9 @@ self: {
     ({ mkDerivation, base, bytestring, ghc-prim, hspec, QuickCheck }:
      mkDerivation {
        pname = "wide-word";
-       version = "0.1.0.0";
-       sha256 = "1a2a5926cbc65afa7bd7dee2ea776779c48d581e980dbc47dfb024391e0836c7";
-       revision = "1";
-       editedCabalFile = "9dad4dd0b247fd7649e70c4cd0a112b9ce1e231981f624653c7ab15fc5f26e5a";
-       libraryHaskellDepends = [ base bytestring ghc-prim ];
+       version = "0.1.0.1";
+       sha256 = "d822ae64cf7edae19d7893d6b57e1d3fe6acf28a5c077e00b47bb865058df4cb";
+       libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [ base bytestring ghc-prim hspec QuickCheck ];
        homepage = "https://github.com/erikd/wide-word";
        description = "Data types for large but fixed width signed and unsigned integers";
@@ -189457,8 +190242,8 @@ self: {
      }:
      mkDerivation {
        pname = "wl-pprint-annotated";
-       version = "0.0.1.3";
-       sha256 = "f59627ca7e26bafee3954a0ce807243e93f38b229e7ecbb335d0e1fc32decae1";
+       version = "0.0.1.4";
+       sha256 = "0919c897b894771dd86877c41d6832bc11e4d3800efbebbcf59c10ce7ba848b0";
        libraryHaskellDepends = [ base containers deepseq text ];
        testHaskellDepends = [
          base containers deepseq HUnit test-framework test-framework-hunit
@@ -189488,17 +190273,15 @@ self: {
      }) {};
 
   "wl-pprint-console" = callPackage
-    ({ mkDerivation, base, console-style, mtl, text
+    ({ mkDerivation, base, bytestring, colorful-monoids, text
      , wl-pprint-annotated
      }:
      mkDerivation {
        pname = "wl-pprint-console";
-       version = "0.0.1.2";
-       sha256 = "dbef55503890a3d60c318084f2e857feba4529d458a17629f4ad00f13084ab3a";
-       revision = "2";
-       editedCabalFile = "560613daa268b1755476619a69dc7d343a52513b6bf2789ba25523afe9708917";
+       version = "0.1.0.1";
+       sha256 = "a7c7f6aa14f78bf6a8aae1a629433872f8bfb377b1392f08047520cdcb3b70fc";
        libraryHaskellDepends = [
-         base console-style mtl text wl-pprint-annotated
+         base bytestring colorful-monoids text wl-pprint-annotated
        ];
        homepage = "https://github.com/minad/wl-pprint-console#readme";
        description = "Wadler/Leijen pretty printer supporting colorful console output";
@@ -189553,6 +190336,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wl-pprint-text_1_1_1_0" = callPackage
+    ({ mkDerivation, base, base-compat, text }:
+     mkDerivation {
+       pname = "wl-pprint-text";
+       version = "1.1.1.0";
+       sha256 = "2960c8201c05d912a1df748a3ceeadc7525905ff1c371d7b4972f4011eca0acd";
+       libraryHaskellDepends = [ base base-compat text ];
+       description = "A Wadler/Leijen Pretty Printer for Text values";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wlc-hs" = callPackage
     ({ mkDerivation, base, c2hs, containers, data-default, lens, pretty
      , process, transformers, wlc, xkbcommon
@@ -190788,8 +191583,8 @@ self: {
      }:
      mkDerivation {
        pname = "xcffib";
-       version = "0.5.0";
-       sha256 = "e12cfb879cc022f80b3d05ab0dcbf080005b2d27eb0a07ea56d4481c3afb0879";
+       version = "0.5.1";
+       sha256 = "1d3d7b7a84067bf140b709fcb427b6e60cb22c6bf1456193a242d651de88b78d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -191243,7 +192038,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "xlsx_0_4_1" = callPackage
+  "xlsx_0_4_2" = callPackage
     ({ mkDerivation, base, base64-bytestring, binary-search, bytestring
      , conduit, containers, data-default, Diff, errors, extra, filepath
      , groom, lens, mtl, mtl-compat, network-uri, old-locale
@@ -191253,8 +192048,8 @@ self: {
      }:
      mkDerivation {
        pname = "xlsx";
-       version = "0.4.1";
-       sha256 = "014d7ecc815f452e86b199ef0715548d7221f1f0a5cfb59ec92ffa86918ef5c6";
+       version = "0.4.2";
+       sha256 = "cc4fa6267c36824637f36f3e10c6a8ef301402a1ccd81be1ebb036ef6b0cc3c8";
        libraryHaskellDepends = [
          base base64-bytestring binary-search bytestring conduit containers
          data-default errors extra filepath lens mtl mtl-compat network-uri
@@ -192792,6 +193587,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libyaml;};
 
+  "yaml_0_8_21_2" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
+     , bytestring, conduit, containers, directory, enclosed-exceptions
+     , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific
+     , semigroups, template-haskell, temporary, text, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "yaml";
+       version = "0.8.21.2";
+       sha256 = "441cf712cd20ac6b0ded900562ca33770c8752702963ab267bff72b0657fef29";
+       configureFlags = [ "-fsystem-libyaml" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring conduit containers directory
+         enclosed-exceptions filepath resourcet scientific semigroups
+         template-haskell text transformers unordered-containers vector
+       ];
+       libraryPkgconfigDepends = [ libyaml ];
+       executableHaskellDepends = [ aeson base bytestring ];
+       testHaskellDepends = [
+         aeson aeson-qq base base-compat bytestring conduit directory hspec
+         HUnit mockery resourcet temporary text transformers
+         unordered-containers vector
+       ];
+       homepage = "http://github.com/snoyberg/yaml/";
+       description = "Support for parsing and rendering YAML documents";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) libyaml;};
+
   "yaml-config" = callPackage
     ({ mkDerivation, base, deepseq, hashable, QuickCheck, tasty
      , tasty-quickcheck, text, unordered-containers, yaml

From 2eb8163fae5c4255ad8e507c8d58b9ab454eecac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Th=C3=B6rne?= <notrupertthorne@gmail.com>
Date: Sun, 29 Jan 2017 23:05:04 +0100
Subject: [PATCH 075/899] bashdb: init at 4.4-0.92 (#22275)

---
 pkgs/development/tools/misc/bashdb/default.nix | 17 +++++++++++++++++
 pkgs/top-level/all-packages.nix                |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/tools/misc/bashdb/default.nix

diff --git a/pkgs/development/tools/misc/bashdb/default.nix b/pkgs/development/tools/misc/bashdb/default.nix
new file mode 100644
index 00000000000..4c0ca97ad50
--- /dev/null
+++ b/pkgs/development/tools/misc/bashdb/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "bashdb-4.4-0.92";
+
+  src = fetchurl {
+    url =  "mirror://sourceforge/bashdb/${name}.tar.bz2";
+    sha256 = "6a8c2655e04339b954731a0cb0d9910e2878e45b2fc08fe469b93e4f2dbaaf92";
+  };
+
+  meta = { 
+    description = "Bash script debugger";
+    homepage = http://bashdb.sourceforge.net/;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae116f8bc85..1b587b4fd43 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6728,6 +6728,8 @@ with pkgs;
     ruby = ruby_2_2;
   };
 
+  bashdb = callPackage ../development/tools/misc/bashdb { };
+
   gdb = callPackage ../development/tools/misc/gdb {
     guile = null;
     hurd = gnu.hurdCross;

From b02681a3d2ae15f271a18c71d30baac58cc3de60 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Wed, 21 Dec 2016 18:33:22 -0800
Subject: [PATCH 076/899] purple-hangouts-hg: 2016-10-01 -> 2016-12-22

---
 .../pidgin-plugins/purple-hangouts/default.nix            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix
index 7134b3179d0..c4ec4b2614c 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "purple-hangouts-hg-${version}";
-  version = "2016-10-01";
+  version = "2016-12-22";
 
   src = fetchhg {
     url = "https://bitbucket.org/EionRobb/purple-hangouts/";
-    rev = "00e28b7";
-    sha256 = "08jllhhww3cqlw6dg9w1hli3havdfzb47grcdl184537gl2bl49d";
+    rev = "754e3bb971cfe913b90c7fd028fe47a42f9e83cb";
+    sha256 = "0b826hj5jgfdckzh9wyycxxhpyxhrhxm3n0mhaf3f57gqarriics";
   };
 
   buildInputs = [ pidgin glib json_glib protobuf protobufc ];
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     install -Dm755 -t $out/lib/pidgin/ libhangouts.so
     for size in 16 22 24 48; do
-      install -TDm644 hangouts$size.png $out/pixmaps/pidgin/protocols/$size/hangouts.png
+      install -TDm644 hangouts$size.png $out/share/pixmaps/pidgin/protocols/$size/hangouts.png
     done
   '';
 

From d1b8b0dd52e728e2c68a1fbc36307d21cd3c902b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Mon, 30 Jan 2017 06:42:17 +0800
Subject: [PATCH 077/899] bundler: 1.13.7 -> 1.14.3 (#22260)

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

diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix
index 1b4fa285142..17ea4d3bc6f 100644
--- a/pkgs/development/ruby-modules/bundler/default.nix
+++ b/pkgs/development/ruby-modules/bundler/default.nix
@@ -4,8 +4,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "bundler";
-  version = "1.13.7";
-  sha256 = "1avvvdzw0k5k2m5n79b96nkmdfd0sjamc676fz7asz4prz2wiw59";
+  version = "1.14.3";
+  sha256 = "1znvh83phzvp97l3kcgk9vbwsnq45qc8nrb4dnqv17mrhgcwfqcx";
   dontPatchShebangs = true;
 
   postFixup = ''

From 27d21e94470b084b7c11cb870794aeba58492283 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 29 Jan 2017 17:20:07 +0100
Subject: [PATCH 078/899] npth: 1.2 -> 1.3

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

diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix
index 0c28a921995..8ebf62cfdf0 100644
--- a/pkgs/development/libraries/npth/default.nix
+++ b/pkgs/development/libraries/npth/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "npth-1.2";
+  name = "npth-1.3";
 
   src = fetchurl {
     url = "ftp://ftp.gnupg.org/gcrypt/npth/${name}.tar.bz2";
-    sha256 = "12n0nvhw4fzwp0k7gjv3rc6pdml0qiinbbfiz4ilg6pl5kdxvnvd";
+    sha256 = "0am86vblapwz84254qpmhz0chk70g6qzh3wdxcs0gvba8d01ka5w";
   };
 
   meta = with stdenv.lib; {

From 4b2731d4f483bbb2165a21d8e3a616104c3ec39c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 29 Jan 2017 17:19:47 +0100
Subject: [PATCH 079/899] lmdb: 0.9.18 -> 0.9.19

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

diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix
index 80019d52f4f..f1171a6a618 100644
--- a/pkgs/development/libraries/lmdb/default.nix
+++ b/pkgs/development/libraries/lmdb/default.nix
@@ -1,13 +1,15 @@
-{ stdenv, fetchzip }:
+{ stdenv, fetchFromGitHub }:
 
 let optional = stdenv.lib.optional;
 in stdenv.mkDerivation rec {
   name = "lmdb-${version}";
-  version = "0.9.18";
+  version = "0.9.19";
 
-  src = fetchzip {
-    url = "https://github.com/LMDB/lmdb/archive/LMDB_${version}.tar.gz";
-    sha256 = "01j384kxg36kym060pybr5p6mjw0xv33bqbb8arncdkdq57xk8wg";
+  src = fetchFromGitHub {
+    owner = "LMDB";
+    repo = "lmdb";
+    rev = "LMDB_${version}";
+    sha256 = "04qx803jdmhkcam748fn0az3cyzvj91lw28kcvwfyq0al7pmjkfs";
   };
 
   postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb";

From 4236364258351305f0a09d4f1f9e63c599d94733 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 29 Jan 2017 17:19:22 +0100
Subject: [PATCH 080/899] libgpgerror: 1.24 -> 1.26

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

diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index d81a59a5c62..afa064881a6 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libgpg-error-${version}";
-  version = "1.24";
+  version = "1.26";
 
   src = fetchurl {
     url = "mirror://gnupg/libgpg-error/${name}.tar.bz2";
-    sha256 = "0h75sf1ngr750c3fjfn4583q7wz40qm63jhg8vjfdrbx936f2s4j";
+    sha256 = "0sgfia0syq78k1c9h10rkhc1nfv5v097icrprlx2x4qn074wnjsc";
   };
 
   postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure";

From b6d889dcd937eb7dc5ae992e46c35e3a30a46354 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 29 Jan 2017 17:19:07 +0100
Subject: [PATCH 081/899] libgcrypt: 1.7.5 -> 1.7.6

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

diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index f0525789896..fc2c859a5f8 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -4,11 +4,11 @@ assert enableCapabilities -> stdenv.isLinux;
 
 stdenv.mkDerivation rec {
   name = "libgcrypt-${version}";
-  version = "1.7.5";
+  version = "1.7.6";
 
   src = fetchurl {
     url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
-    sha256 = "0078pbzm6nlgvnwlylshsg707ifcmfpnpbvhlhqbpwpfic9a9zni";
+    sha256 = "1g05prhgqw4ryd0w433q8nhds0h93kf47hfjagi2r7dghkpaysk2";
   };
 
   outputs = [ "out" "dev" "info" ];

From 403432f6abea1730628337c35622430110f59468 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 29 Jan 2017 17:18:53 +0100
Subject: [PATCH 082/899] gpgme: 1.7.0 -> 1.8.0

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

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 8acc773a46c..307fde4e5c2 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -9,11 +9,11 @@ let
   gpgProgram = if useGnupg1 then "gpg" else "gpg2";
 in
 stdenv.mkDerivation rec {
-  name = "gpgme-1.7.0";
+  name = "gpgme-1.8.0";
 
   src = fetchurl {
     url = "mirror://gnupg/gpgme/${name}.tar.bz2";
-    sha256 = "0j6capvv6lcr6p763lr2ygzkzkj5lqm7fnbfc1xaygib1znmzxbi";
+    sha256 = "0csx3qnycwm0n90ql6gs65if5xi4gqyzzy21fxs2xqicghjrfq2r";
   };
 
   outputs = [ "out" "dev" "info" ];
@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig gnupg ];
 
   configureFlags = [
-    "--with-gpg=${gpgStorePath}/bin/${gpgProgram}"
     "--enable-fixed-path=${gpgStorePath}/bin"
   ];
 

From c770a94097d82dc1a107d8de0e10ea3e3728c0b0 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 29 Jan 2017 17:18:30 +0100
Subject: [PATCH 083/899] gnu-efi: 3.0.4 -> 3.0.5

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

diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix
index aa644a3a4a8..6425749d041 100644
--- a/pkgs/development/libraries/gnu-efi/default.nix
+++ b/pkgs/development/libraries/gnu-efi/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnu-efi-${version}";
-  version = "3.0.4";
+  version = "3.0.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/gnu-efi/${name}.tar.bz2";
-    sha256 = "1bzq5czw5dxlvpgs9ij2iz7q6krwhja87vc982r6vffcqcl0982i";
+    sha256 = "08hb2gpzcj5p743wcagm0j2m4gh100xv12llpbjc13zi2icwv3xx";
   };
 
   patches = optional stdenv.isAarch64 ./aarch64-fix-discarded-qualifier.patch;

From 1c5237e25c6bad14a13c33e53d9b0eaed8cb7d60 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 29 Jan 2017 17:18:09 +0100
Subject: [PATCH 084/899] gmime: 2.6.20 -> 2.6.23

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

diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/default.nix
index 8796a5f6740..e908c9b5b13 100644
--- a/pkgs/development/libraries/gmime/default.nix
+++ b/pkgs/development/libraries/gmime/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, zlib, libgpgerror, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
-  name = "gmime-2.6.20";
+  name = "gmime-2.6.23";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gmime/2.6/${name}.tar.xz";
-    sha256 = "0rfzbgsh8ira5p76kdghygl5i3fvmmx4wbw5rp7f8ajc4vxp18g0";
+    sha256 = "0slzlzcr3h8jikpz5a5amqd0csqh2m40gdk910ws2hnaf5m6hjbi";
   };
 
   outputs = [ "out" "dev" ];

From ff7c6fe60dd5c0eff2101302906e7a51600f52ec Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 27 Jan 2017 20:37:22 +0100
Subject: [PATCH 085/899] youtubeDL: 2017.01.24 -> 2017.01.28

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 68a422b97e2..061f64ce982 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -15,11 +15,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2017.01.24";
+  version = "2017.01.28";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "6691206f68b8ecf8e9f81a85c63b4c00676f66f549d37e9ea36113eda6d1e4d8";
+    sha256 = "16dyci631i6dgy1ia9vg69wk5zn8f1zd7bjwhw6adacrcx2nb89w";
   };
 
   buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;

From eadb9ce15fc30ce0cfa16a6f9661cee1e7fb7fdf Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 29 Jan 2017 17:17:53 +0100
Subject: [PATCH 086/899] notmuch: 0.23.4 -> 0.23.5

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

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index c1a32341ffe..a8502b33cc5 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -10,7 +10,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.23.4";
+  version = "0.23.5";
   name = "notmuch-${version}";
 
   passthru = {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://notmuchmail.org/releases/${name}.tar.gz";
-    sha256 = "0fs5crf8v3jghc8jnm61cv7wxhclcg88hi5894d8fma9kkixcv8h";
+    sha256 = "0ry2k9sdwd1vw8cf6svch8wk98523s07mwxvsf7b8kghqnrr89n6";
   };
 
   buildInputs = [

From 0adf664210890000801ff07571172c8a0c927cec Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 29 Jan 2017 17:17:22 +0100
Subject: [PATCH 087/899] neomutt: 20161126 -> 20170128

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

diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index 57f633d2c99..18ea017cb8c 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -2,19 +2,20 @@
 , cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl, lmdb }:
 
 stdenv.mkDerivation rec {
-  version = "20161126";
+  version = "20170128";
   name = "neomutt-${version}";
 
   src = fetchFromGitHub {
     owner = "neomutt";
     repo = "neomutt";
     rev = "neomutt-${version}";
-    sha256 = "10ycfya11pvwv0rdyyak56r6f8ia8yf0h8qyi904bbpvm8lqvqfd";
+    sha256 = "082ksn4fsj48nkz61ia0hcxz3396p6a4p9q8738w15qkycq23c20";
   };
 
+  nativeBuildInputs = [ which autoconf automake ];
   buildInputs =
-    [ autoconf automake cyrus_sasl gdbm gpgme kerberos libidn ncurses
-      notmuch which openssl perl lmdb ];
+    [ cyrus_sasl gdbm gpgme kerberos libidn ncurses
+      notmuch openssl perl lmdb ];
 
   configureFlags = [
     "--enable-debug"
@@ -28,6 +29,7 @@ stdenv.mkDerivation rec {
     "--enable-keywords"
     "--enable-smtp"
     "--enable-nntp"
+    "--enable-compressed"
     "--with-homespool=mailbox"
     "--with-gss"
     "--with-mailpath="

From 083cadee45320e740e66cb95a9b5ccf174b2a054 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 29 Jan 2017 17:20:22 +0100
Subject: [PATCH 088/899] offlineimap: 7.0.12 -> 7.0.13

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

diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index bed9bba16b0..790212ec689 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages, }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "7.0.12";
+  version = "7.0.13";
   name = "offlineimap-${version}";
   namePrefix = "";
 
@@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec {
     owner = "OfflineIMAP";
     repo = "offlineimap";
     rev = "v${version}";
-    sha256 = "1i83p40lxjqnvh88x623iydrwnsxib1k91qbl9myc4hi5i4fnr6x";
+    sha256 = "0108xmp9df6cb1nzw3ym59mir3phgfdgp5d43n44ymsk2cc39xcc";
   };
 
   doCheck = false;

From f68b7be36497f643778fc42ddd8139ef1d0e1227 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 29 Jan 2017 17:27:12 +0100
Subject: [PATCH 089/899] brackets: 1.7 -> 1.8

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

diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix
index e9f36b19195..bba66366e6b 100644
--- a/pkgs/applications/editors/brackets/default.nix
+++ b/pkgs/applications/editors/brackets/default.nix
@@ -11,11 +11,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "brackets-${version}";
-  version = "1.7";
+  version = "1.8";
 
   src = fetchurl {
     url = "https://github.com/adobe/brackets/releases/download/release-${version}/Brackets.Release.${version}.64-bit.deb";
-    sha256 = "0nsiy3gvp8rd71a0misf6v1kz067kxnszr5mpch9fj4jqmg6nj8m";
+    sha256 = "0b2k0vv1qwmsg1wckp71yrb86zp8zisskmzzvx9ir19bma9jzr42";
     name = "${name}.deb";
   };
 

From c2257506ae30de77f4937775974ae009e6bfa725 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 30 Jan 2017 04:11:55 +0100
Subject: [PATCH 090/899] weechat: 1.6 -> 1.7

---
 pkgs/applications/networking/irc/weechat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 911555fa6a6..877eb91624c 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -21,12 +21,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "1.6";
+  version = "1.7";
   name = "weechat-${version}";
 
   src = fetchurl {
     url = "http://weechat.org/files/src/weechat-${version}.tar.bz2";
-    sha256 = "0d1wcpsxx13clcf1ygcn5hsa1pjkck4xznbjbxphbdxd5whsbv3k";
+    sha256 = "1l34rgr83nf2h71mwzhv5c0x03msrwv3kzx3cwzczx72xrih12n7";
   };
 
   outputs = [ "out" "doc" ];

From 42d3f67439965f7facf80932b91e43376de78d13 Mon Sep 17 00:00:00 2001
From: "Desmond O. Chang" <dochang@gmail.com>
Date: Mon, 30 Jan 2017 13:14:24 +0800
Subject: [PATCH 091/899] yank 0.7.1 -> 0.8.0

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

diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/tools/misc/yank/default.nix
index 6cae1947340..1ceab4f18cf 100644
--- a/pkgs/tools/misc/yank/default.nix
+++ b/pkgs/tools/misc/yank/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     owner = "mptre";
     repo = "yank";
     rev = "v${meta.version}";
-    sha256 = "1m8pnarm8n5x6ylbzxv8j9amylrllw166arrj4cx9f2jp2zbzcic";
+    sha256 = "0d1vvmz6wg1m2byd22bxikywnm2970kyfsm46fhagxardsxbp6hj";
     inherit name;
   };
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     '';
     downloadPage = "https://github.com/mptre/yank/releases";
     license = licenses.mit;
-    version = "0.7.1";
+    version = "0.8.0";
     maintainers = [ maintainers.dochang ];
     platforms = platforms.unix;
   };

From e2f7d68d73d3a02ffcb0ffe0d58f49184eda2aa1 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 30 Jan 2017 05:40:50 +0000
Subject: [PATCH 092/899] telegram-purple: 2016-03-17 -> 1.3.0

---
 .../pidgin-plugins/telegram-purple/default.nix             | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix
index 4b68d603f21..68083a7b9d2 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchgit, pkgconfig, pidgin, libwebp, libgcrypt, gettext } :
 
 let
-  version = "2016-03-17";
+  version = "1.3.0";
 in
 stdenv.mkDerivation rec {
   name = "telegram-purple-${version}";
 
   src = fetchgit {
     url = "https://github.com/majn/telegram-purple";
-    rev = "ee2a6fb740fe9580336e4af9a153b845bc715927";
-    sha256 = "0pxaj95b6nzy73dckpr3v4nljyijkx71vmnp9dcj48d22pvy0nyf";
+    rev = "0340e4f14b2480782db4e5b9242103810227c522";
+    sha256 = "1xb7hrgisbpx00dsrm5yz934bdd7nfzicd7k855iynk3hjzqj7k5";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     sed -i "s|/etc/telegram-purple/server.tglpub|$out/lib/pidgin/server.tglpub|g" telegram-purple.c
+    echo "#define GIT_COMMIT \"${builtins.substring 0 10 src.rev}\"" > commit.h
   '';
 
   installPhase = ''

From 63f609b1a4e5bed5442bf7054fd1ac5ea29a7185 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhavsagar@gmail.com>
Date: Mon, 30 Jan 2017 14:38:42 +0700
Subject: [PATCH 093/899] ihaskell: remove service configuration. (#22268)

See #22047. This change should be reverted after IHaskell has been
updated to support GHC 8.
---
 nixos/modules/misc/ids.nix      |  4 ++--
 nixos/modules/module-list.nix   |  2 +-
 pkgs/top-level/all-packages.nix | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 2005f2518ba..0ed44f9d3d1 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -206,7 +206,7 @@
       ripple-data-api = 186;
       mediatomb = 187;
       rdnssd = 188;
-      ihaskell = 189;
+      # ihaskell = 189; # unused
       i2p = 190;
       lambdabot = 191;
       asterisk = 192;
@@ -469,7 +469,7 @@
       #ripple-data-api = 186; #unused
       mediatomb = 187;
       #rdnssd = 188; # unused
-      ihaskell = 189;
+      # ihaskell = 189; # unused
       i2p = 190;
       lambdabot = 191;
       asterisk = 192;
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index ca61916173b..23acc11db23 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -261,7 +261,7 @@
   ./services/misc/gitolite.nix
   ./services/misc/gogs.nix
   ./services/misc/gpsd.nix
-  ./services/misc/ihaskell.nix
+  #./services/misc/ihaskell.nix
   ./services/misc/leaps.nix
   ./services/misc/mantisbt.nix
   ./services/misc/mathics.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b587b4fd43..a037f06caf2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2256,15 +2256,15 @@ with pkgs;
   };
 
 
-  ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix {
-    inherit (haskellPackages) ihaskell ghcWithPackages;
+  # ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix {
+  #   inherit (haskellPackages) ihaskell ghcWithPackages;
 
-    ipython = python3.buildEnv.override {
-      extraLibs = with python3Packages; [ ipython ipykernel jupyter_client notebook ];
-    };
+  #   ipython = python3.buildEnv.override {
+  #     extraLibs = with python3Packages; [ ipython ipykernel jupyter_client notebook ];
+  #   };
 
-    packages = config.ihaskell.packages or (self: []);
-  };
+  #   packages = config.ihaskell.packages or (self: []);
+  # };
 
   imapproxy = callPackage ../tools/networking/imapproxy { };
 

From fd32b16f9ea847c4b263fb45bf02cf3221108186 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 30 Jan 2017 10:09:14 +0100
Subject: [PATCH 094/899] knot-dns: another attempt to fix build on Darwin

The effort is getting long, without any direct access to a Darwin machine.
---
 pkgs/servers/dns/knot-dns/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 07ba9cef82f..2eb8cd208ea 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -15,11 +15,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    gnutls jansson liburcu lmdb libidn
+    gnutls jansson liburcu libidn
     nettle libedit
     # without sphinx &al. for developer documentation
   ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ libcap_ng systemd ];
+    # Use embedded lmdb there for now, as detection is broken on Darwin somehow.
+    ++ stdenv.lib.optionals stdenv.isLinux [ libcap_ng systemd lmdb ];
 
   enableParallelBuilding = true;
 

From 40d3a67754e32bd8f099a1886d30dab267a5150b Mon Sep 17 00:00:00 2001
From: Fatih Altinok <fatih@picussecurity.com>
Date: Mon, 30 Jan 2017 12:13:46 +0300
Subject: [PATCH 095/899] flow: 0.37.1 -> 0.37.4

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

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index d6164ef2e4e..4e15ed8572e 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -3,14 +3,14 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  version = "0.37.1";
+  version = "0.37.4";
   name = "flow-${version}";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     rev = "v${version}";
-    sha256 = "1n3pc3nfh7bcaard7y2fy7hjq4k6777wp9xv50r3zg4454mgbmsy";
+    sha256 = "0v3hi2wn4ysybmd768wdmijlbnq41i6yzzzj5d7cmd4blzd9c0nq";
   };
 
   installPhase = ''

From 4e0bb261d0f9cde1075cffb98dc14f63ee44ea91 Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Mon, 30 Jan 2017 11:28:52 +0100
Subject: [PATCH 096/899] Make more visible which fetch approach is best

Prepend "bad/better/best" to each paragraph, to make more visible which approach is best
---
 doc/coding-conventions.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml
index 4348dc8bf72..f89437af445 100644
--- a/doc/coding-conventions.xml
+++ b/doc/coding-conventions.xml
@@ -623,7 +623,7 @@ evaluate correctly.</para>
     from bad to good:
     <itemizedlist>
       <listitem>
-        <para>Uses <literal>git://</literal> which won't be proxied.
+        <para>Bad: Uses <literal>git://</literal> which won't be proxied.
 <programlisting>
 src = fetchgit {
   url = "git://github.com/NixOS/nix.git";
@@ -634,7 +634,7 @@ src = fetchgit {
         </para>
       </listitem>
       <listitem>
-        <para>This is ok, but an archive fetch will still be faster.
+        <para>Better: This is ok, but an archive fetch will still be faster.
 <programlisting>
 src = fetchgit {
   url = "https://github.com/NixOS/nix.git";
@@ -645,7 +645,7 @@ src = fetchgit {
         </para>
       </listitem>
       <listitem>
-        <para>Fetches a snapshot archive and you get the rev you want.
+        <para>Best: Fetches a snapshot archive and you get the rev you want.
 <programlisting>
 src = fetchFromGitHub {
   owner = "NixOS";

From 0ecde73b9119de0e8274a3019d6a4c5a4ea7cfcd Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Mon, 30 Jan 2017 00:49:25 +0100
Subject: [PATCH 097/899] siji: init at 2016-05-14

---
 pkgs/data/fonts/siji/default.nix | 26 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/data/fonts/siji/default.nix

diff --git a/pkgs/data/fonts/siji/default.nix b/pkgs/data/fonts/siji/default.nix
new file mode 100644
index 00000000000..c5ad1d1e1b6
--- /dev/null
+++ b/pkgs/data/fonts/siji/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "siji-${date}";
+  date = "2016-05-13";
+
+  src = fetchFromGitHub {
+    owner = "stark";
+    repo = "siji";
+    rev = "95369afac3e661cb6d3329ade5219992c88688c1";
+    sha256 = "1408g4nxwdd682vjqpmgv0cp0bfnzzzwls62cjs9zrds16xa9dpf";
+  };
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/pcf
+    cp -v */*.pcf $out/share/fonts/pcf
+  '';
+
+  meta = {
+    homepage = "https://github.com/stark/siji";
+    description = "An iconic bitmap font based on Stlarch with additional glyphs";
+    liscense = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.asymmetric ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 86b45daecb2..c7e4765f2e5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12248,6 +12248,8 @@ with pkgs;
 
   hasklig = callPackage ../data/fonts/hasklig {};
 
+  siji = callPackage ../data/fonts/siji { };
+
   sound-theme-freedesktop = callPackage ../data/misc/sound-theme-freedesktop { };
 
   source-code-pro = callPackage ../data/fonts/source-code-pro {};

From c20cc6d0b37b8330eb1bcdc0031b600f2665eb93 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 30 Jan 2017 11:18:56 +0100
Subject: [PATCH 098/899] Excise use of importJSON

Putting information in external JSON files is IMHO not an improvement
over the idiomatic style of Nix expressions. The use of JSON doesn't
add anything over Nix expressions (in fact it removes expressive
power). And scattering package info over lots of little files makes
packages less readable over having the info in one file.
---
 lib/trivial.nix                               | 20 +------------------
 pkgs/applications/graphics/ao/default.nix     |  8 +++++++-
 pkgs/applications/graphics/ao/src.json        |  5 -----
 .../virtualization/virtualbox/default.nix     |  7 +++++--
 .../virtualbox/guest-additions/default.nix    |  2 +-
 .../virtualbox/upstream-info.json             |  8 --------
 pkgs/development/libraries/torch/default.nix  |  9 ++++++++-
 pkgs/development/libraries/torch/src.json     |  6 ------
 pkgs/os-specific/linux/tp_smapi/default.nix   | 13 +++++++-----
 pkgs/os-specific/linux/tp_smapi/update.json   |  5 -----
 10 files changed, 30 insertions(+), 53 deletions(-)
 delete mode 100644 pkgs/applications/graphics/ao/src.json
 delete mode 100644 pkgs/applications/virtualization/virtualbox/upstream-info.json
 delete mode 100644 pkgs/development/libraries/torch/src.json
 delete mode 100644 pkgs/os-specific/linux/tp_smapi/update.json

diff --git a/lib/trivial.nix b/lib/trivial.nix
index 7860b949939..abe5a16c67d 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -102,25 +102,7 @@ rec {
   min = x: y: if x < y then x else y;
   max = x: y: if x > y then x else y;
 
-  /* Reads a JSON file. It is useful to import pure data into other nix
-     expressions.
-
-     Example:
-
-       mkDerivation {
-         src = fetchgit (importJSON ./repo.json)
-         #...
-       }
-
-       where repo.json contains:
-
-       {
-         "url": "git://some-domain/some/repo",
-         "rev": "265de7283488964f44f0257a8b4a055ad8af984d",
-         "sha256": "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h"
-       }
-
-  */
+  /* Reads a JSON file. */
   importJSON = path:
     builtins.fromJSON (builtins.readFile path);
 
diff --git a/pkgs/applications/graphics/ao/default.nix b/pkgs/applications/graphics/ao/default.nix
index 2a2d280d6b2..2bba73fae1a 100644
--- a/pkgs/applications/graphics/ao/default.nix
+++ b/pkgs/applications/graphics/ao/default.nix
@@ -10,7 +10,13 @@ stdenv.mkDerivation rec {
     libpthreadstubs libXau libXdmcp libXrandr libXext libXinerama libXxf86vm
     libXcursor libXfixes
     ];
-  src = fetchgit (stdenv.lib.importJSON ./src.json);
+
+  src = fetchgit {
+    url = https://github.com/mkeeter/ao;
+    rev = "69fadb81543cc9031e4a7ec2036c7f2ab505a620";
+    sha256 = "1717k72vr0i5j7bvxmd6q16fpvkljnqfa1hr3i4yq8cjdsj69my7";
+  };
+
   cmakeFlags = "-G Ninja";
   buildPhase = "ninja";
   installPhase = ''
diff --git a/pkgs/applications/graphics/ao/src.json b/pkgs/applications/graphics/ao/src.json
deleted file mode 100644
index 0fa10dc3b0f..00000000000
--- a/pkgs/applications/graphics/ao/src.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "url": "https://github.com/mkeeter/ao",
-  "rev": "69fadb81543cc9031e4a7ec2036c7f2ab505a620",
-  "sha256": "1717k72vr0i5j7bvxmd6q16fpvkljnqfa1hr3i4yq8cjdsj69my7"
-}
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 14a87151e97..d0c98911387 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -18,11 +18,14 @@ let
   python = python2;
   buildType = "release";
 
-  inherit (importJSON ./upstream-info.json) version extpackRev extpack main;
+  extpack = "3982657fd4853bcbc79b9162e618545a479b65aca08e9ced43a904aeeba3ffa5";
+  extpackRev = 112026;
+  main = "98073b1b2adee4e6553df73cb5bb6ea8ed7c3a41a475757716fd9400393bea40";
+  version = "5.1.10";
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
   extensionPack = requireFile rec {
-    name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRev}.vbox-extpack";
+    name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${toString extpackRev}.vbox-extpack";
     sha256 = extpack;
     message = ''
       In order to use the extension pack, you need to comply with the VirtualBox Personal Use
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 5a97d2a8efd..fe362616bc5 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = (lib.importJSON ../upstream-info.json).guest;
+    sha256 = "29fa0af66a3dd273b0c383c4adee31a52061d52f57d176b67f444698300b8c41";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/*/build";
diff --git a/pkgs/applications/virtualization/virtualbox/upstream-info.json b/pkgs/applications/virtualization/virtualbox/upstream-info.json
deleted file mode 100644
index 1b85d2b8847..00000000000
--- a/pkgs/applications/virtualization/virtualbox/upstream-info.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "__NOTE": "Generated using update.py from the same directory.",
-  "extpack": "3982657fd4853bcbc79b9162e618545a479b65aca08e9ced43a904aeeba3ffa5",
-  "extpackRev": "112026",
-  "guest": "29fa0af66a3dd273b0c383c4adee31a52061d52f57d176b67f444698300b8c41",
-  "main": "98073b1b2adee4e6553df73cb5bb6ea8ed7c3a41a475757716fd9400393bea40",
-  "version": "5.1.10"
-}
diff --git a/pkgs/development/libraries/torch/default.nix b/pkgs/development/libraries/torch/default.nix
index 1b1a100350c..d4c61890afb 100644
--- a/pkgs/development/libraries/torch/default.nix
+++ b/pkgs/development/libraries/torch/default.nix
@@ -10,7 +10,14 @@ stdenv.mkDerivation rec{
     libjpeg zeromq3 ncurses openssl libpng readline pkgconfig
     zlib libX11 which
   ];
-  src = fetchgit (stdenv.lib.importJSON ./src.json);
+
+  src = fetchgit {
+    url = "https://github.com/torch/distro";
+    rev = "8b6a834f8c8755f6f5f84ef9d8da9cfc79c5ce1f";
+    sha256 = "120hnz82d7izinsmv5smyqww71dhpix23pm43s522dfcglpql8xy";
+    fetchSubmodules = true;
+  };
+
   buildPhase = ''
     cd ..
     export PREFIX=$out
diff --git a/pkgs/development/libraries/torch/src.json b/pkgs/development/libraries/torch/src.json
deleted file mode 100644
index 37c7a20ce54..00000000000
--- a/pkgs/development/libraries/torch/src.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-        "url": "https://github.com/torch/distro",
-        "rev": "8b6a834f8c8755f6f5f84ef9d8da9cfc79c5ce1f",
-        "sha256": "120hnz82d7izinsmv5smyqww71dhpix23pm43s522dfcglpql8xy",
-        "fetchSubmodules": true
-}
diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix
index 272b1368dec..cb5c539a94e 100644
--- a/pkgs/os-specific/linux/tp_smapi/default.nix
+++ b/pkgs/os-specific/linux/tp_smapi/default.nix
@@ -1,12 +1,15 @@
 { stdenv, fetchurl, kernel, writeScript, coreutils, gnugrep, jq, curl
 }:
 
-let
-  data = stdenv.lib.importJSON ./update.json;
-in stdenv.mkDerivation rec {
-  name = "tp_smapi-${data.version}-${kernel.version}";
+stdenv.mkDerivation rec {
+  name = "tp_smapi-${version}-${kernel.version}";
 
-  src = fetchurl  { inherit (data) url sha256; };
+  version = "0.42";
+
+  src = fetchurl {
+    url = "https://github.com/evgeni/tp_smapi/archive/tp-smapi/${version}.tar.gz";
+    sha256 = "cd28bf6ee21b2c27b88d947cb0bfcb19648c7daa5d350115403dbcad05849381";
+  };
 
   hardeningDisable = [ "pic" ];
 
diff --git a/pkgs/os-specific/linux/tp_smapi/update.json b/pkgs/os-specific/linux/tp_smapi/update.json
deleted file mode 100644
index 15e9801e7f2..00000000000
--- a/pkgs/os-specific/linux/tp_smapi/update.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "version": "0.42",
-  "url": "https://github.com/evgeni/tp_smapi/archive/tp-smapi/0.42.tar.gz",
-  "sha256": "cd28bf6ee21b2c27b88d947cb0bfcb19648c7daa5d350115403dbcad05849381"
-}

From 12dd086c392d9c3eb98885ec729401d659d6e3db Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 30 Jan 2017 11:25:59 +0100
Subject: [PATCH 099/899] Revert "gup: 0.5.5 -> 0.6.0 and derivation update"

This reverts commit a59c3038cd26863ab0eb90aad813440dfec1a59e due to
use of importJSON.
---
 .../tools/build-managers/gup/build.nix        | 30 +++++--------------
 .../tools/build-managers/gup/build.nix.gup    |  6 ----
 .../tools/build-managers/gup/default.nix      | 26 ++++++++--------
 .../tools/build-managers/gup/src.json         | 17 -----------
 4 files changed, 20 insertions(+), 59 deletions(-)
 delete mode 100755 pkgs/development/tools/build-managers/gup/build.nix.gup
 delete mode 100644 pkgs/development/tools/build-managers/gup/src.json

diff --git a/pkgs/development/tools/build-managers/gup/build.nix b/pkgs/development/tools/build-managers/gup/build.nix
index b2a60c309b3..a9af037bb81 100644
--- a/pkgs/development/tools/build-managers/gup/build.nix
+++ b/pkgs/development/tools/build-managers/gup/build.nix
@@ -1,30 +1,14 @@
-# NOTE: the `nixpkgs` version of this file is copied from the upstream repository
-# for this package. Please make any changes to https://github.com/timbertson/gup/
+# NOTE: this file is copied from the upstream repository for this package.
+# Please submit any changes you make here to https://github.com/timbertson/gup/
 
-{ stdenv, lib, pythonPackages }:
-{ src, version, meta ? {}, passthru ? {}, forceTests ? false }:
-let
-  testInputs = [
-    pythonPackages.mocktest or null
-    pythonPackages.whichcraft
-    pythonPackages.nose
-    pythonPackages.nose_progressive
-  ];
-  pychecker = pythonPackages.pychecker or null;
-  usePychecker = forceTests || pychecker != null;
-  enableTests = forceTests || (lib.all (dep: dep != null) testInputs);
-in
+{ stdenv, lib, python, which, pychecker ? null }:
+{ src, version, meta ? {} }:
 stdenv.mkDerivation {
-  inherit src meta passthru;
+  inherit src meta;
   name = "gup-${version}";
-  buildInputs = [ pythonPackages.python ]
-    ++ (lib.optionals enableTests testInputs)
-    ++ (lib.optional usePychecker pychecker)
-  ;
-  SKIP_PYCHECKER = !usePychecker;
+  buildInputs = lib.remove null [ python which pychecker ];
+  SKIP_PYCHECKER = pychecker == null;
   buildPhase = "make python";
-  inherit pychecker;
-  testPhase = if enableTests then "make test" else "true";
   installPhase = ''
     mkdir $out
     cp -r python/bin $out/bin
diff --git a/pkgs/development/tools/build-managers/gup/build.nix.gup b/pkgs/development/tools/build-managers/gup/build.nix.gup
deleted file mode 100755
index 915d4287566..00000000000
--- a/pkgs/development/tools/build-managers/gup/build.nix.gup
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-set -eu
-if [ -n "${GUP_TARGET:-}" ]; then
-	gup --always
-fi
-curl -LSs -o "$1" https://raw.githubusercontent.com/timbertson/gup/master/nix/gup-python.nix
diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix
index e73beb03164..8e85c63cb6e 100644
--- a/pkgs/development/tools/build-managers/gup/default.nix
+++ b/pkgs/development/tools/build-managers/gup/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, fetchFromGitHub, lib, pythonPackages, nix-update-source, curl }:
+{ stdenv, fetchFromGitHub, lib, python, which }:
+let
+  version = "0.5.5";
+  src = fetchFromGitHub {
+    sha256 = "12yv0j333z6jkaaal8my3jx3k4ml9hq8ldis5zfvr8179d4xah7q";
+    rev = "version-${version}";
+    repo = "gup";
+    owner = "timbertson";
+  };
+in
 import ./build.nix
-  { inherit stdenv lib pythonPackages; }
-  { inherit (nix-update-source.fetch ./src.json) src version;
+  { inherit stdenv lib python which; }
+  { inherit src version;
     meta = {
-      homepage = https://github.com/timbertson/gup/;
+      inherit (src.meta) homepage;
       description = "A better make, inspired by djb's redo";
       license = stdenv.lib.licenses.lgpl2Plus;
       maintainers = [ stdenv.lib.maintainers.timbertson ];
       platforms = stdenv.lib.platforms.all;
     };
-    passthru = {
-      updateScript = ''
-        set -e
-        echo
-        cd ${toString ./.}
-        ${nix-update-source}/bin/nix-update-source --prompt version src.json
-        ./build.nix.gup build.nix
-      '';
-    };
   }
diff --git a/pkgs/development/tools/build-managers/gup/src.json b/pkgs/development/tools/build-managers/gup/src.json
deleted file mode 100644
index 6b9719a3076..00000000000
--- a/pkgs/development/tools/build-managers/gup/src.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "fetch": {
-    "args": {
-      "owner": "timbertson",
-      "repo": "gup",
-      "rev": "version-0.6.0",
-      "sha256": "053xnx39jh9kn9l572z4k0q7bbxjpisf1fm9aq27ybj2ha1rh6wr"
-    },
-    "fn": "fetchFromGitHub",
-    "rev": "version-0.6.0",
-    "version": "0.6.0"
-  },
-  "owner": "timbertson",
-  "repo": "gup",
-  "rev": "version-{version}",
-  "type": "fetchFromGitHub"
-}
\ No newline at end of file

From 35349b6c2aeb62e33286697095820c15f96daebf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 30 Jan 2017 11:28:03 +0100
Subject: [PATCH 100/899] gup: 0.5.5 -> 0.6.0

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

diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix
index 8e85c63cb6e..79e391a8589 100644
--- a/pkgs/development/tools/build-managers/gup/default.nix
+++ b/pkgs/development/tools/build-managers/gup/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, lib, python, which }:
 let
-  version = "0.5.5";
+  version = "0.6.0";
   src = fetchFromGitHub {
-    sha256 = "12yv0j333z6jkaaal8my3jx3k4ml9hq8ldis5zfvr8179d4xah7q";
+    sha256 = "053xnx39jh9kn9l572z4k0q7bbxjpisf1fm9aq27ybj2ha1rh6wr";
     rev = "version-${version}";
     repo = "gup";
     owner = "timbertson";

From e7ec067b6b5e28747c13a5a69703b597b143e4ab Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 30 Jan 2017 11:29:41 +0100
Subject: [PATCH 101/899] Revert "nix-update-source: 0.2.1 -> 0.2.2"

This reverts commit b984d5d25f3c5f4d8c700f3c5e0b41bd48cfcb79.
---
 pkgs/tools/package-management/nix-update-source/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix-update-source/default.nix b/pkgs/tools/package-management/nix-update-source/default.nix
index 08b5dcb319c..06ac8203f82 100644
--- a/pkgs/tools/package-management/nix-update-source/default.nix
+++ b/pkgs/tools/package-management/nix-update-source/default.nix
@@ -1,12 +1,12 @@
 { lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts }:
 python3Packages.buildPythonApplication rec {
-  version = "0.2.2";
+  version = "0.2.1";
   name = "nix-update-source-${version}";
   src = fetchFromGitHub {
     owner = "timbertson";
     repo = "nix-update-source";
     rev = "version-${version}";
-    sha256 = "0liigkr37ib2xy269bcp53ivpir4mpg6lzwnfrsqc4kbkz3l16gg";
+    sha256 = "1w3aj0kjp8zhxkzqxnm5srrsqsvrmxhn4sqkr4kjffh61jg8jq8a";
   };
   propagatedBuildInputs = [ nix-prefetch-scripts ];
   passthru = {
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
         fetchFn = builtins.getAttr json.fetch.fn fetchers;
         src = fetchFn json.fetch.args;
       in
-      json // json.fetch // { inherit src; };
+      json // { inherit src; };
   };
   meta = {
     description = "Utility to autimate updating of nix derivation sources";

From 5fdc6db95718275f12a3efed326ff2e231524e1e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 30 Jan 2017 11:29:45 +0100
Subject: [PATCH 102/899] Revert "add nix-prefetch-source (#21734)"

This reverts commit ca38ef79e9d1530cd32890bf9e4760096f25f048 due its
use of importJSON and external source info files, which is
non-idiomatic.
---
 .../nix-update-source/default.nix             | 29 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 31 deletions(-)
 delete mode 100644 pkgs/tools/package-management/nix-update-source/default.nix

diff --git a/pkgs/tools/package-management/nix-update-source/default.nix b/pkgs/tools/package-management/nix-update-source/default.nix
deleted file mode 100644
index 06ac8203f82..00000000000
--- a/pkgs/tools/package-management/nix-update-source/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts }:
-python3Packages.buildPythonApplication rec {
-  version = "0.2.1";
-  name = "nix-update-source-${version}";
-  src = fetchFromGitHub {
-    owner = "timbertson";
-    repo = "nix-update-source";
-    rev = "version-${version}";
-    sha256 = "1w3aj0kjp8zhxkzqxnm5srrsqsvrmxhn4sqkr4kjffh61jg8jq8a";
-  };
-  propagatedBuildInputs = [ nix-prefetch-scripts ];
-  passthru = {
-    fetch = path:
-      let
-        fetchers = {
-          # whitelist of allowed fetchers
-          inherit (pkgs) fetchgit fetchurl fetchFromGitHub;
-        };
-        json = lib.importJSON path;
-        fetchFn = builtins.getAttr json.fetch.fn fetchers;
-        src = fetchFn json.fetch.args;
-      in
-      json // { inherit src; };
-  };
-  meta = {
-    description = "Utility to autimate updating of nix derivation sources";
-    maintainers = with lib.maintainers; [ timbertson ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e4c3c94272..ddc6d5062db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17567,8 +17567,6 @@ with pkgs;
     nix-prefetch-zip
     nix-prefetch-scripts;
 
-  nix-update-source = callPackage ../tools/package-management/nix-update-source {};
-
   nix-template-rpm = callPackage ../build-support/templaterpm { inherit (pythonPackages) python toposort; };
 
   nix-repl = callPackage ../tools/package-management/nix-repl { };

From 522ab7efefc4f6d656e8a6c895f5b1b4a389adf9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 29 Jan 2017 20:21:48 +0100
Subject: [PATCH 103/899] LTS Haskell 7.18

---
 .../configuration-hackage2nix.yaml            | 89 ++++++++++---------
 1 file changed, 45 insertions(+), 44 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index fd23a2a2069..f5967f5a281 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -37,7 +37,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 7.16
+  # LTS Haskell 7.18
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Vector ==2.3.2
@@ -50,7 +50,7 @@ default-package-overrides:
   - ad ==4.3.2.1
   - adjunctions ==4.3
   - adler32 ==0.1.1.0
-  - aeson ==0.11.2.1
+  - aeson ==0.11.3.0
   - aeson-better-errors ==0.9.1.0
   - aeson-casing ==0.1.0.5
   - aeson-compat ==0.3.6
@@ -170,7 +170,7 @@ default-package-overrides:
   - auto-update ==0.1.4
   - autoexporter ==0.2.3
   - aws ==0.14.1
-  - b9 ==0.5.30
+  - b9 ==0.5.31
   - bake ==0.4
   - bank-holidays-england ==0.1.0.5
   - base-compat ==0.9.1
@@ -194,7 +194,7 @@ default-package-overrides:
   - binary-bits ==0.5
   - binary-conduit ==1.2.4.1
   - binary-list ==1.1.1.2
-  - binary-orphans ==0.1.5.2
+  - binary-orphans ==0.1.6.0
   - binary-parser ==0.5.2
   - binary-search ==1.0.0.3
   - binary-tagged ==0.1.4.2
@@ -262,7 +262,7 @@ default-package-overrides:
   - Cabal ==1.24.2.0
   - cabal-dependency-licenses ==0.1.2.0
   - cabal-file-th ==0.2.4
-  - cabal-helper ==0.7.2.0
+  - cabal-helper ==0.7.3.0
   - cabal-rpm ==0.10.1
   - cabal-sort ==0.0.5.3
   - cabal-src ==0.3.0.2
@@ -319,7 +319,7 @@ default-package-overrides:
   - clay ==0.11
   - clckwrks ==0.23.19.2
   - clckwrks-cli ==0.2.17.1
-  - clckwrks-plugin-media ==0.6.16.1
+  - clckwrks-plugin-media ==0.6.16.2
   - clckwrks-plugin-page ==0.4.3.5
   - clckwrks-theme-bootstrap ==0.4.2.1
   - cli ==0.1.2
@@ -334,6 +334,7 @@ default-package-overrides:
   - cmark-lucid ==0.1.0.0
   - cmdargs ==0.10.14
   - code-builder ==0.1.3
+  - code-page ==0.1.1
   - codo-notation ==0.5.2
   - colour ==2.3.3
   - commutative ==0.0.1.4
@@ -358,7 +359,7 @@ default-package-overrides:
   - configuration-tools ==0.2.15
   - configurator ==0.3.0.0
   - configurator-export ==0.1.0.1
-  - connection ==0.2.6
+  - connection ==0.2.7
   - constraints ==0.8
   - consul-haskell ==0.3
   - containers-unicode-symbols ==0.3.1.1
@@ -472,7 +473,7 @@ default-package-overrides:
   - do-list ==1.0.1
   - dockerfile ==0.1.0.1
   - docopt ==0.7.0.5
-  - doctest ==0.11.0
+  - doctest ==0.11.1
   - doctest-discover ==0.1.0.7
   - doctest-prop ==0.2.0.1
   - docvim ==0.3.2.1
@@ -543,7 +544,7 @@ default-package-overrides:
   - farmhash ==0.1.0.5
   - fast-builder ==0.0.0.6
   - fast-digits ==0.2.1.0
-  - fast-logger ==2.4.7
+  - fast-logger ==2.4.8
   - fasta ==0.10.4.0
   - fay ==0.23.1.12
   - fay-base ==0.20.0.1
@@ -579,8 +580,8 @@ default-package-overrides:
   - fmlist ==0.9
   - fn ==0.3.0.1
   - focus ==0.1.5
-  - fold-debounce ==0.2.0.4
-  - fold-debounce-conduit ==0.1.0.4
+  - fold-debounce ==0.2.0.5
+  - fold-debounce-conduit ==0.1.0.5
   - foldl ==1.2.3
   - FontyFruity ==0.5.3.2
   - force-layout ==0.4.0.6
@@ -659,7 +660,7 @@ default-package-overrides:
   - gloss ==1.10.2.5
   - gloss-rendering ==1.10.3.5
   - GLURaw ==2.0.0.3
-  - GLUT ==2.7.0.10
+  - GLUT ==2.7.0.11
   - gogol ==0.1.0
   - gogol-adexchange-buyer ==0.1.0
   - gogol-adexchange-seller ==0.1.0
@@ -834,7 +835,7 @@ default-package-overrides:
   - heap ==1.0.3
   - heaps ==0.3.3
   - hebrew-time ==0.1.1
-  - hedis ==0.9.5
+  - hedis ==0.9.7
   - here ==1.2.9
   - heredoc ==0.2.0.0
   - hex ==0.1.2
@@ -880,11 +881,11 @@ default-package-overrides:
   - hPDB ==1.2.0.9
   - hPDB-examples ==1.2.0.7
   - HPDF ==1.4.10
-  - hpio ==0.8.0.5
+  - hpio ==0.8.0.6
   - hprotoc ==2.4.0
   - hquantlib ==0.0.3.3
   - hreader ==1.0.2
-  - hruby ==0.3.4.2
+  - hruby ==0.3.4.3
   - hs-bibutils ==5.5
   - hs-GeoIP ==0.3
   - hsass ==0.4.0
@@ -902,7 +903,7 @@ default-package-overrides:
   - hslua ==0.4.1
   - hsndfile ==0.8.0
   - hsndfile-vector ==0.5.2
-  - HsOpenSSL ==0.11.3.2
+  - HsOpenSSL ==0.11.4
   - HsOpenSSL-x509-system ==0.1.0.3
   - hsp ==0.10.0
   - hspec ==2.2.4
@@ -932,7 +933,7 @@ default-package-overrides:
   - html ==1.0.1.2
   - html-conduit ==1.2.1.1
   - htoml ==1.0.0.3
-  - HTTP ==4000.3.4
+  - HTTP ==4000.3.5
   - http-api-data ==0.2.4
   - http-client ==0.4.31.2
   - http-client-openssl ==0.2.0.4
@@ -989,7 +990,7 @@ default-package-overrides:
   - indents ==0.3.3
   - inflections ==0.2.0.1
   - ini ==0.3.5
-  - inline-c ==0.5.5.9
+  - inline-c ==0.5.6.1
   - inline-c-cpp ==0.1.0.0
   - inline-r ==0.9.0.1
   - insert-ordered-containers ==0.1.0.1
@@ -1089,7 +1090,7 @@ default-package-overrides:
   - libxml-sax ==0.7.5
   - LibZip ==1.0.1
   - lift-generics ==0.1.1
-  - lifted-async ==0.9.1
+  - lifted-async ==0.9.1.1
   - lifted-base ==0.2.3.8
   - line ==1.0.1.0
   - linear ==1.20.5
@@ -1099,7 +1100,7 @@ default-package-overrides:
   - list-fusion-probe ==0.1.0.6
   - list-prompt ==0.1.1.0
   - list-t ==1
-  - ListLike ==4.5
+  - ListLike ==4.5.1
   - load-env ==0.1.1
   - loch-th ==0.2.1
   - log-domain ==0.10.3.1
@@ -1185,7 +1186,7 @@ default-package-overrides:
   - MonadRandom ==0.4.2.3
   - monads-tf ==0.1.0.3
   - mongoDB ==2.1.1.1
-  - mono-traversable ==1.0.1
+  - mono-traversable ==1.0.1.1
   - mono-traversable-instances ==0.1.0.0
   - monoid-extras ==0.4.2
   - monoid-subclasses ==0.4.2.1
@@ -1259,7 +1260,7 @@ default-package-overrides:
   - OneTuple ==0.2.1
   - oo-prototypes ==0.1.0.0
   - opaleye ==0.5.2.2
-  - opaleye-trans ==0.3.3
+  - opaleye-trans ==0.3.4
   - open-browser ==0.2.1.0
   - OpenGL ==3.0.1.0
   - OpenGLRaw ==3.2.4.0
@@ -1285,7 +1286,7 @@ default-package-overrides:
   - pagination ==0.1.1
   - palette ==0.1.0.4
   - pandoc ==1.17.1
-  - pandoc-citeproc ==0.10.3
+  - pandoc-citeproc ==0.10.4
   - pandoc-types ==1.16.1.1
   - pango ==0.13.3.1
   - parallel ==3.2.1.0
@@ -1487,7 +1488,7 @@ default-package-overrides:
   - rest-types ==1.14.1.1
   - rest-wai ==0.2.0.1
   - result ==0.2.6.0
-  - rethinkdb ==2.2.0.7
+  - rethinkdb ==2.2.0.8
   - rethinkdb-client-driver ==0.0.23
   - retry ==0.7.4.2
   - rev-state ==0.1.2
@@ -1501,7 +1502,7 @@ default-package-overrides:
   - runmemo ==1.0.0.1
   - rvar ==0.2.0.3
   - s3-signer ==0.3.0.0
-  - safe ==0.3.10
+  - safe ==0.3.11
   - safe-exceptions ==0.1.4.0
   - safecopy ==0.9.2
   - SafeSemaphore ==0.10.1
@@ -1556,7 +1557,7 @@ default-package-overrides:
   - setlocale ==1.0.0.4
   - sets ==0.0.5.2
   - SHA ==1.6.4.2
-  - shake ==0.15.10
+  - shake ==0.15.11
   - shake-language-c ==0.10.0
   - shakespeare ==2.0.12.1
   - shell-conduit ==4.5.2
@@ -1635,7 +1636,7 @@ default-package-overrides:
   - stm-delay ==0.1.1.1
   - stm-stats ==0.2.0.0
   - STMonadTrans ==0.3.4
-  - stopwatch ==0.1.0.3
+  - stopwatch ==0.1.0.4
   - storable-complex ==0.2.2
   - storable-endian ==0.2.6
   - storable-record ==0.0.3.1
@@ -1643,9 +1644,9 @@ default-package-overrides:
   - store-core ==0.2.0.2
   - Strafunski-StrategyLib ==5.0.0.10
   - stratosphere ==0.1.6
-  - streaming ==0.1.4.3
-  - streaming-bytestring ==0.1.4.5
-  - streaming-commons ==0.1.16
+  - streaming ==0.1.4.5
+  - streaming-bytestring ==0.1.4.6
+  - streaming-commons ==0.1.17
   - streamproc ==1.6.2
   - streams ==3.3
   - strict ==0.3.2
@@ -1687,12 +1688,12 @@ default-package-overrides:
   - tagstream-conduit ==0.5.5.3
   - tar ==0.5.0.3
   - tardis ==0.4.1.0
-  - tasty ==0.11.0.4
+  - tasty ==0.11.1
   - tasty-ant-xml ==1.0.4
   - tasty-dejafu ==0.3.0.2
   - tasty-expected-failure ==0.11.0.4
   - tasty-golden ==2.3.1.1
-  - tasty-hspec ==1.1.3
+  - tasty-hspec ==1.1.3.1
   - tasty-html ==0.4.1.1
   - tasty-hunit ==0.9.2
   - tasty-kat ==0.0.3
@@ -1847,7 +1848,7 @@ default-package-overrides:
   - vado ==0.0.8
   - validate-input ==0.4.0.0
   - validation ==0.5.4
-  - validity ==0.3.0.4
+  - validity ==0.3.1.1
   - varying ==0.5.0.3
   - vault ==0.3.0.6
   - vcswrapper ==0.1.5
@@ -1872,7 +1873,7 @@ default-package-overrides:
   - wai-conduit ==3.0.0.3
   - wai-cors ==0.2.5
   - wai-eventsource ==3.0.0
-  - wai-extra ==3.0.19
+  - wai-extra ==3.0.19.1
   - wai-logger ==2.3.0
   - wai-middleware-caching ==0.1.0.2
   - wai-middleware-caching-lru ==0.1.0.0
@@ -1892,14 +1893,14 @@ default-package-overrides:
   - wai-transformers ==0.0.7
   - wai-websockets ==3.0.1.1
   - waitra ==0.0.4.0
-  - warp ==3.2.9
-  - warp-tls ==3.2.2
+  - warp ==3.2.10
+  - warp-tls ==3.2.3
   - web-plugins ==0.2.9
   - web-routes ==0.27.11
   - web-routes-boomerang ==0.28.4.2
   - web-routes-happstack ==0.23.10
   - web-routes-hsp ==0.24.6.1
-  - web-routes-th ==0.22.6
+  - web-routes-th ==0.22.6.1
   - web-routes-wai ==0.24.3
   - webdriver ==0.8.4
   - webdriver-angular ==0.1.11
@@ -1911,7 +1912,7 @@ default-package-overrides:
   - weigh ==0.0.3
   - werewolf ==1.5.1.1
   - werewolf-slack ==1.0.2.0
-  - wikicfp-scraper ==0.1.0.6
+  - wikicfp-scraper ==0.1.0.7
   - Win32 ==2.3.1.1
   - Win32-extras ==0.2.0.1
   - Win32-notify ==0.3.0.1
@@ -1922,15 +1923,15 @@ default-package-overrides:
   - wl-pprint ==1.2
   - wl-pprint-extras ==3.5.0.5
   - wl-pprint-terminfo ==3.7.1.4
-  - wl-pprint-text ==1.1.0.4
+  - wl-pprint-text ==1.1.1.0
   - word-trie ==0.3.0
   - word8 ==0.1.2
   - wordpass ==1.0.0.7
   - Workflow ==0.8.3
   - wrap ==0.0.0
   - wreq ==0.4.1.0
-  - writer-cps-mtl ==0.1.1.1
-  - writer-cps-transformers ==0.1.1.0
+  - writer-cps-mtl ==0.1.1.2
+  - writer-cps-transformers ==0.1.1.2
   - wuss ==1.1.3
   - X11 ==1.6.1.2
   - x509 ==1.6.5
@@ -1949,7 +1950,7 @@ default-package-overrides:
   - xml-conduit ==1.3.5
   - xml-conduit-parse ==0.3.1.0
   - xml-conduit-writer ==0.1.1.1
-  - xml-hamlet ==0.4.0.12
+  - xml-hamlet ==0.4.1
   - xml-lens ==0.1.6.3
   - xml-to-json-fast ==2.0.0
   - xml-types ==0.3.6
@@ -1959,7 +1960,7 @@ default-package-overrides:
   - xss-sanitize ==0.3.5.7
   - yackage ==0.8.1
   - yahoo-finance-api ==0.1.0.0
-  - yaml ==0.8.21.1
+  - yaml ==0.8.21.2
   - Yampa ==0.10.5
   - YampaSynth ==0.2
   - yarr ==1.4.0.2
@@ -1987,7 +1988,7 @@ default-package-overrides:
   - yesod-static-angular ==0.1.8
   - yesod-table ==2.0.3
   - yesod-test ==1.5.4.1
-  - yesod-websockets ==0.2.4.1
+  - yesod-websockets ==0.2.5
   - yi ==0.12.6
   - yi-fuzzy-open ==0.1.0.1
   - yi-language ==0.2.1

From a2018cedf501bf90922ae26b3e24ff644d116afd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 29 Jan 2017 20:34:51 +0100
Subject: [PATCH 104/899] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.0.4-8-g0d49e12 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/beea499740367c3dd85626910ca024f05513649e.
---
 .../haskell-modules/hackage-packages.nix      | 1252 +++--------------
 1 file changed, 204 insertions(+), 1048 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index a505b8b2ea5..45924e6a541 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -5758,22 +5758,6 @@ self: {
      }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "GLUT" = callPackage
-    ({ mkDerivation, array, base, containers, OpenGL, StateVar
-     , transformers
-     }:
-     mkDerivation {
-       pname = "GLUT";
-       version = "2.7.0.10";
-       sha256 = "4b11cbf9b7876c0ec14bf0673006bd23e7ffc7d396568987b326a1b706497569";
-       libraryHaskellDepends = [
-         array base containers OpenGL StateVar transformers
-       ];
-       homepage = "http://www.haskell.org/haskellwiki/Opengl";
-       description = "A binding for the OpenGL Utility Toolkit";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "GLUT_2_7_0_11" = callPackage
     ({ mkDerivation, array, base, containers, OpenGL, StateVar
      , transformers
      }:
@@ -5787,7 +5771,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A binding for the OpenGL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GLUtil" = callPackage
@@ -8164,29 +8147,6 @@ self: {
      }) {};
 
   "HTTP" = callPackage
-    ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
-     , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
-     , network, network-uri, parsec, pureMD5, split, test-framework
-     , test-framework-hunit, time, wai, warp
-     }:
-     mkDerivation {
-       pname = "HTTP";
-       version = "4000.3.4";
-       sha256 = "a4066d6fe45fa41d1c3e262e1100c740dc35cddec34c576723bdc35a8dcfc322";
-       libraryHaskellDepends = [
-         array base bytestring mtl network network-uri parsec time
-       ];
-       testHaskellDepends = [
-         base bytestring case-insensitive conduit conduit-extra deepseq
-         http-types httpd-shed HUnit mtl network network-uri pureMD5 split
-         test-framework test-framework-hunit wai warp
-       ];
-       homepage = "https://github.com/haskell/HTTP";
-       description = "A library for client-side HTTP";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "HTTP_4000_3_5" = callPackage
     ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
      , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
      , network, network-uri, parsec, pureMD5, split, test-framework
@@ -8209,7 +8169,6 @@ self: {
        homepage = "https://github.com/haskell/HTTP";
        description = "A library for client-side HTTP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HTTP-Simple" = callPackage
@@ -9475,25 +9434,6 @@ self: {
      }) {Judy = null;};
 
   "HsOpenSSL" = callPackage
-    ({ mkDerivation, base, bytestring, integer-gmp, network, openssl
-     , time
-     }:
-     mkDerivation {
-       pname = "HsOpenSSL";
-       version = "0.11.3.2";
-       sha256 = "4b5ba629b64a0288faa35eccde5ce0ebb8b3127d17e064eb6f100c5fbbebce3f";
-       libraryHaskellDepends = [
-         base bytestring integer-gmp network time
-       ];
-       librarySystemDepends = [ openssl ];
-       testHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/vshabanov/HsOpenSSL";
-       description = "Partial OpenSSL binding for Haskell";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) openssl;};
-
-  "HsOpenSSL_0_11_4" = callPackage
     ({ mkDerivation, base, bytestring, integer-gmp, network, openssl
      , time
      }:
@@ -10956,28 +10896,6 @@ self: {
      }) {};
 
   "ListLike" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, deepseq
-     , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string
-     , vector
-     }:
-     mkDerivation {
-       pname = "ListLike";
-       version = "4.5";
-       sha256 = "3b3a562cf432597c02aa440142e11dc4069fdc30c4397887e8cab6abbd88ef3b";
-       libraryHaskellDepends = [
-         array base bytestring containers deepseq dlist fmlist text
-         utf8-string vector
-       ];
-       testHaskellDepends = [
-         array base bytestring containers dlist fmlist HUnit QuickCheck
-         random text utf8-string vector
-       ];
-       homepage = "http://github.com/JohnLato/listlike";
-       description = "Generic support for list-like structures";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ListLike_4_5_1" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string
      , vector
@@ -10997,7 +10915,6 @@ self: {
        homepage = "http://github.com/JohnLato/listlike";
        description = "Generic support for list-like structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ListTree" = callPackage
@@ -12862,6 +12779,41 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "OnRmt" = callPackage
+    ({ mkDerivation, async, base, brick, bytestring, conduit
+     , conduit-extra, containers, control-monad-loop, data-default
+     , HUnit, itemfield, listsafe, microlens, mtl, old-locale, process
+     , repl-toolkit, ssh-known-hosts, string-conversions, test-framework
+     , test-framework-hunit, text, text-zipper, time, transformers
+     , vector, void, vty
+     }:
+     mkDerivation {
+       pname = "OnRmt";
+       version = "1.0.0.0";
+       sha256 = "4d9627999b89d50f8211a5cba8ea5821493bfdec8a9de76ee8f39bd4e8003218";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base brick bytestring conduit conduit-extra containers
+         control-monad-loop data-default itemfield listsafe microlens mtl
+         old-locale process repl-toolkit string-conversions text text-zipper
+         time transformers vector void vty
+       ];
+       executableHaskellDepends = [
+         async base brick bytestring conduit conduit-extra containers
+         control-monad-loop data-default itemfield listsafe microlens mtl
+         old-locale process repl-toolkit ssh-known-hosts string-conversions
+         text text-zipper time transformers vector void vty
+       ];
+       testHaskellDepends = [
+         async base brick bytestring conduit conduit-extra HUnit itemfield
+         old-locale string-conversions test-framework test-framework-hunit
+         text text-zipper time transformers vector vty
+       ];
+       description = "Text UI library for performing parallel remote SSH operations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "OneTuple" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -20232,10 +20184,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson";
-       version = "0.11.2.1";
-       sha256 = "cc3bc708b5ea5598ae4e37fd8a96d117576031be4b4e2943953e9e19af01b74c";
-       revision = "1";
-       editedCabalFile = "e97fac43eddd037bf21752ea10150a224b9c08d267f634ea54f799023a6c5e13";
+       version = "0.11.3.0";
+       sha256 = "f326fac57881c228d91f610a2c92f083a60e3830d9c7d35dfb0a16925c95ece9";
        libraryHaskellDepends = [
          attoparsec base bytestring containers deepseq dlist fail ghc-prim
          hashable mtl scientific syb tagged template-haskell text time
@@ -29928,39 +29878,6 @@ self: {
      }) {};
 
   "b9" = callPackage
-    ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes
-     , bytestring, conduit, conduit-extra, ConfigFile, directory
-     , filepath, free, hashable, hspec, hspec-expectations, mtl
-     , optparse-applicative, parallel, parsec, pretty, pretty-show
-     , process, QuickCheck, random, semigroups, syb, template, text
-     , time, transformers, unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "b9";
-       version = "0.5.30";
-       sha256 = "27e1437813bc55f173251c3e38f8de81fdc31ebb0f0ae59f10c954ce4cc4c071";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson async base bifunctors binary boxes bytestring conduit
-         conduit-extra ConfigFile directory filepath free hashable mtl
-         parallel parsec pretty pretty-show process QuickCheck random
-         semigroups syb template text time transformers unordered-containers
-         vector yaml
-       ];
-       executableHaskellDepends = [
-         base bytestring directory optparse-applicative
-       ];
-       testHaskellDepends = [
-         aeson base bytestring hspec hspec-expectations QuickCheck
-         semigroups text unordered-containers vector yaml
-       ];
-       homepage = "https://github.com/sheyll/b9-vm-image-builder";
-       description = "A tool and library for building virtual machine images";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "b9_0_5_31" = callPackage
     ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes
      , bytestring, conduit, conduit-extra, ConfigFile, directory
      , filepath, free, hashable, hspec, hspec-expectations, mtl
@@ -29991,7 +29908,6 @@ self: {
        homepage = "https://github.com/sheyll/b9-vm-image-builder";
        description = "A tool and library for building virtual machine images";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "babl" = callPackage
@@ -31958,33 +31874,6 @@ self: {
      }) {};
 
   "binary-orphans" = callPackage
-    ({ mkDerivation, aeson, base, binary, case-insensitive, hashable
-     , QuickCheck, quickcheck-instances, scientific, tagged, tasty
-     , tasty-quickcheck, text, text-binary, time, unordered-containers
-     , vector, vector-binary-instances
-     }:
-     mkDerivation {
-       pname = "binary-orphans";
-       version = "0.1.5.2";
-       sha256 = "7c644fb1d1657719c04c0f115a36efaeba7287c953de826b55c28fae87aca33d";
-       revision = "1";
-       editedCabalFile = "cb0932145cefc3ae3be46ef890b0db68864ddb96b0ed69371cbc878f385b6252";
-       libraryHaskellDepends = [
-         aeson base binary case-insensitive hashable scientific tagged text
-         text-binary time unordered-containers vector
-         vector-binary-instances
-       ];
-       testHaskellDepends = [
-         aeson base binary case-insensitive hashable QuickCheck
-         quickcheck-instances scientific tagged tasty tasty-quickcheck text
-         time unordered-containers vector
-       ];
-       homepage = "https://github.com/phadej/binary-orphans#readme";
-       description = "Orphan instances for binary";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "binary-orphans_0_1_6_0" = callPackage
     ({ mkDerivation, aeson, base, binary, case-insensitive, hashable
      , QuickCheck, quickcheck-instances, scientific, tagged, tasty
      , tasty-quickcheck, text, text-binary, time, unordered-containers
@@ -32007,7 +31896,6 @@ self: {
        homepage = "https://github.com/phadej/binary-orphans#readme";
        description = "Orphan instances for binary";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-parser" = callPackage
@@ -35873,12 +35761,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "btrfs_0_1_2_2" = callPackage
+  "btrfs_0_1_2_3" = callPackage
     ({ mkDerivation, base, bytestring, time, unix }:
      mkDerivation {
        pname = "btrfs";
-       version = "0.1.2.2";
-       sha256 = "0a362bd0aef9c11212c095a3da17279a5c1ac490eee49822a04138503212e7b5";
+       version = "0.1.2.3";
+       sha256 = "7efc0b5c65623dcf60910baf896aec7da7ac2df4231f03a3072c78fb5b2fb88d";
        libraryHaskellDepends = [ base bytestring time unix ];
        homepage = "https://github.com/redneb/hs-btrfs";
        description = "Bindings to the btrfs API";
@@ -37238,36 +37126,6 @@ self: {
      }) {};
 
   "cabal-helper" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, cabal-install, directory
-     , extra, filepath, ghc-prim, mtl, process, template-haskell
-     , temporary, transformers, unix, utf8-string
-     }:
-     mkDerivation {
-       pname = "cabal-helper";
-       version = "0.7.2.0";
-       sha256 = "90572b1e4aeb780464f7d5f2f88c4f59ebb4539fe303f0b86d42ef3b9078a362";
-       revision = "1";
-       editedCabalFile = "ebe355cd7cc1f6b1fc06054fb645010ab63c7de7dcba0f12e3c58a197bcc8173";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base Cabal directory filepath ghc-prim mtl process transformers
-       ];
-       executableHaskellDepends = [
-         base bytestring Cabal directory filepath ghc-prim mtl process
-         template-haskell temporary transformers utf8-string
-       ];
-       testHaskellDepends = [
-         base bytestring Cabal directory extra filepath ghc-prim mtl process
-         template-haskell temporary transformers unix utf8-string
-       ];
-       testToolDepends = [ cabal-install ];
-       doCheck = false;
-       description = "Simple interface to some of Cabal's configuration state used by ghc-mod";
-       license = stdenv.lib.licenses.agpl3;
-     }) {};
-
-  "cabal-helper_0_7_3_0" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cabal-install, containers
      , directory, extra, filepath, ghc-prim, mtl, process
      , template-haskell, temporary, transformers, unix, utf8-string
@@ -37299,7 +37157,6 @@ self: {
        doCheck = false;
        description = "Simple interface to some of Cabal's configuration state used by ghc-mod";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-info" = callPackage
@@ -42248,30 +42105,6 @@ self: {
      }) {};
 
   "clckwrks-plugin-media" = callPackage
-    ({ mkDerivation, acid-state, attoparsec, base, blaze-html, cereal
-     , clckwrks, containers, directory, filepath, gd, happstack-server
-     , hsp, hsx2hs, ixset, magic, mtl, reform, reform-happstack
-     , reform-hsp, safecopy, text, web-plugins, web-routes
-     , web-routes-th
-     }:
-     mkDerivation {
-       pname = "clckwrks-plugin-media";
-       version = "0.6.16.1";
-       sha256 = "acd1df19bf6b98d18202c925f7cf6800d378c190d36e5a88422dda3e19eaf079";
-       libraryHaskellDepends = [
-         acid-state attoparsec base blaze-html cereal clckwrks containers
-         directory filepath gd happstack-server hsp ixset magic mtl reform
-         reform-happstack reform-hsp safecopy text web-plugins web-routes
-         web-routes-th
-       ];
-       libraryToolDepends = [ hsx2hs ];
-       homepage = "http://clckwrks.com/";
-       description = "media plugin for clckwrks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "clckwrks-plugin-media_0_6_16_2" = callPackage
     ({ mkDerivation, acid-state, attoparsec, base, blaze-html, cereal
      , clckwrks, containers, directory, filepath, gd, happstack-server
      , hsp, hsx2hs, ixset, magic, mtl, reform, reform-happstack
@@ -45871,24 +45704,6 @@ self: {
      }) {};
 
   "connection" = callPackage
-    ({ mkDerivation, base, byteable, bytestring, containers
-     , data-default-class, network, socks, tls, x509, x509-store
-     , x509-system, x509-validation
-     }:
-     mkDerivation {
-       pname = "connection";
-       version = "0.2.6";
-       sha256 = "03c16c28094a92ccf8fd58c61a4555b60158615914676c5c65c998a69ece37b0";
-       libraryHaskellDepends = [
-         base byteable bytestring containers data-default-class network
-         socks tls x509 x509-store x509-system x509-validation
-       ];
-       homepage = "http://github.com/vincenthz/hs-connection";
-       description = "Simple and easy network connections API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "connection_0_2_7" = callPackage
     ({ mkDerivation, base, byteable, bytestring, containers
      , data-default-class, network, socks, tls, x509, x509-store
      , x509-system, x509-validation
@@ -45904,7 +45719,6 @@ self: {
        homepage = "http://github.com/vincenthz/hs-connection";
        description = "Simple and easy network connections API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "connection-pool" = callPackage
@@ -49024,7 +48838,6 @@ self: {
        homepage = "https://github.com/haskell-crypto/cryptonite-openssl";
        description = "Crypto stuff using OpenSSL cryptographic library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
   "cryptsy-api" = callPackage
@@ -57253,32 +57066,6 @@ self: {
      }) {};
 
   "doctest" = callPackage
-    ({ mkDerivation, base, base-compat, deepseq, directory, filepath
-     , ghc, ghc-paths, hspec, HUnit, process, QuickCheck, setenv
-     , silently, stringbuilder, syb, transformers, with-location
-     }:
-     mkDerivation {
-       pname = "doctest";
-       version = "0.11.0";
-       sha256 = "d225c28a44281f32eb189dc11a4f1c9d15528ac0f973cf636567d69143df6477";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base-compat deepseq directory filepath ghc ghc-paths process
-         syb transformers
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base base-compat deepseq directory filepath ghc ghc-paths hspec
-         HUnit process QuickCheck setenv silently stringbuilder syb
-         transformers with-location
-       ];
-       homepage = "https://github.com/sol/doctest#readme";
-       description = "Test interactive Haskell examples";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "doctest_0_11_1" = callPackage
     ({ mkDerivation, base, base-compat, code-page, deepseq, directory
      , filepath, ghc, ghc-paths, hspec, HUnit, process, QuickCheck
      , setenv, silently, stringbuilder, syb, transformers, with-location
@@ -57302,7 +57089,6 @@ self: {
        homepage = "https://github.com/sol/doctest#readme";
        description = "Test interactive Haskell examples";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "doctest-discover" = callPackage
@@ -63718,25 +63504,6 @@ self: {
      }) {};
 
   "fast-logger" = callPackage
-    ({ mkDerivation, array, auto-update, base, bytestring
-     , bytestring-builder, directory, easy-file, filepath, hspec, text
-     , unix, unix-time
-     }:
-     mkDerivation {
-       pname = "fast-logger";
-       version = "2.4.7";
-       sha256 = "201b07d898da91472aa86662399feb093a7379bc04315f8e84db52fbf3464a38";
-       libraryHaskellDepends = [
-         array auto-update base bytestring bytestring-builder directory
-         easy-file filepath text unix unix-time
-       ];
-       testHaskellDepends = [ base bytestring directory hspec ];
-       homepage = "https://github.com/kazu-yamamoto/logger";
-       description = "A fast logging system";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fast-logger_2_4_8" = callPackage
     ({ mkDerivation, array, auto-update, base, bytestring, directory
      , easy-file, filepath, hspec, text, unix, unix-time
      }:
@@ -63752,6 +63519,24 @@ self: {
        homepage = "https://github.com/kazu-yamamoto/logger";
        description = "A fast logging system";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "fast-logger_2_4_9" = callPackage
+    ({ mkDerivation, array, auto-update, base, bytestring, directory
+     , easy-file, filepath, hspec, text, unix, unix-time
+     }:
+     mkDerivation {
+       pname = "fast-logger";
+       version = "2.4.9";
+       sha256 = "0c75847259d79221fd710b546b19fca1d4270721ba8fd78ac98285878324704a";
+       libraryHaskellDepends = [
+         array auto-update base bytestring directory easy-file filepath text
+         unix unix-time
+       ];
+       testHaskellDepends = [ base bytestring directory hspec ];
+       homepage = "https://github.com/kazu-yamamoto/logger";
+       description = "A fast logging system";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -66746,23 +66531,6 @@ self: {
      }) {};
 
   "fold-debounce" = callPackage
-    ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay
-     , time
-     }:
-     mkDerivation {
-       pname = "fold-debounce";
-       version = "0.2.0.4";
-       sha256 = "429702d10061c9c518a119ece8d3bc890feb124a524a3b6a5cdd31a17bcca67a";
-       libraryHaskellDepends = [
-         base data-default-class stm stm-delay time
-       ];
-       testHaskellDepends = [ base hspec stm time ];
-       homepage = "https://github.com/debug-ito/fold-debounce";
-       description = "Fold multiple events that happen in a given period of time";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fold-debounce_0_2_0_5" = callPackage
     ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay
      , time
      }:
@@ -66777,30 +66545,9 @@ self: {
        homepage = "https://github.com/debug-ito/fold-debounce";
        description = "Fold multiple events that happen in a given period of time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fold-debounce-conduit" = callPackage
-    ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet
-     , stm, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "fold-debounce-conduit";
-       version = "0.1.0.4";
-       sha256 = "fb1e937a3e1a78982df53d62ad55c1cd2b79f5ac9c18c56df436435829efa7cc";
-       libraryHaskellDepends = [
-         base conduit fold-debounce resourcet stm transformers
-         transformers-base
-       ];
-       testHaskellDepends = [
-         base conduit hspec resourcet stm transformers
-       ];
-       homepage = "https://github.com/debug-ito/fold-debounce-conduit";
-       description = "Regulate input traffic from conduit Source with Control.FoldDebounce";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fold-debounce-conduit_0_1_0_5" = callPackage
     ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet
      , stm, transformers, transformers-base
      }:
@@ -66818,7 +66565,6 @@ self: {
        homepage = "https://github.com/debug-ito/fold-debounce-conduit";
        description = "Regulate input traffic from conduit Source with Control.FoldDebounce";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foldl" = callPackage
@@ -71341,8 +71087,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-prof";
-       version = "1.3.0.1";
-       sha256 = "8bb866a2389005d91f15a1546ef92e1055b854c9a14dda97d0d92fb0fa598b82";
+       version = "1.3.0.2";
+       sha256 = "99a13463bf12803c02071206b090c1e4a1364f6f0bbc4162155c478a2c740fa1";
        libraryHaskellDepends = [
          attoparsec base containers scientific text time
        ];
@@ -89010,29 +88756,6 @@ self: {
      }) {};
 
   "hedis" = callPackage
-    ({ mkDerivation, async, base, bytestring, bytestring-lexing
-     , deepseq, HUnit, mtl, network, resource-pool, scanner
-     , slave-thread, stm, test-framework, test-framework-hunit, text
-     , time, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "hedis";
-       version = "0.9.5";
-       sha256 = "fe9d461f8a24f134947c89832472463d65150c37b53cf53ea89fd199ef8d1b71";
-       libraryHaskellDepends = [
-         async base bytestring bytestring-lexing deepseq mtl network
-         resource-pool scanner stm text time unordered-containers vector
-       ];
-       testHaskellDepends = [
-         async base bytestring HUnit mtl slave-thread stm test-framework
-         test-framework-hunit text time
-       ];
-       homepage = "https://github.com/informatikr/hedis";
-       description = "Client library for the Redis datastore: supports full command set, pipelining";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hedis_0_9_7" = callPackage
     ({ mkDerivation, async, base, bytestring, bytestring-lexing
      , deepseq, HUnit, mtl, network, resource-pool, scanner
      , slave-thread, stm, test-framework, test-framework-hunit, text
@@ -89053,7 +88776,6 @@ self: {
        homepage = "https://github.com/informatikr/hedis";
        description = "Client library for the Redis datastore: supports full command set, pipelining";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hedis-config" = callPackage
@@ -94834,8 +94556,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.16.0";
-       sha256 = "2ec0d00aaaddfc18bc3c55b6455f7697524578dd9d0e3ea32849067293f167b9";
+       version = "0.17.0";
+       sha256 = "d2578aca1a302f5424c32a81eb15a41797e72d17c0c2eab7c236c513c4657464";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -95124,37 +94846,6 @@ self: {
      }) {};
 
   "hpio" = callPackage
-    ({ mkDerivation, async, base, base-compat, bytestring, containers
-     , directory, doctest, exceptions, filepath, hlint, hspec, mtl
-     , mtl-compat, optparse-applicative, QuickCheck, text, transformers
-     , transformers-compat, unix, unix-bytestring
-     }:
-     mkDerivation {
-       pname = "hpio";
-       version = "0.8.0.5";
-       sha256 = "7493096673b13301ebdcdbc8b5076b1af0422b6650418b9510d3536a72edcf0d";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base-compat bytestring containers directory exceptions
-         filepath mtl mtl-compat QuickCheck text transformers
-         transformers-compat unix unix-bytestring
-       ];
-       executableHaskellDepends = [
-         async base base-compat exceptions mtl mtl-compat
-         optparse-applicative transformers transformers-compat
-       ];
-       testHaskellDepends = [
-         async base base-compat bytestring containers directory doctest
-         exceptions filepath hlint hspec mtl mtl-compat QuickCheck text
-         transformers transformers-compat unix unix-bytestring
-       ];
-       homepage = "https://github.com/dhess/hpio";
-       description = "Monads for GPIO in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hpio_0_8_0_6" = callPackage
     ({ mkDerivation, async, base, base-compat, bytestring, containers
      , directory, doctest, exceptions, filepath, hlint, hspec, mtl
      , mtl-compat, optparse-applicative, QuickCheck, text, transformers
@@ -95183,7 +94874,6 @@ self: {
        homepage = "https://github.com/dhess/hpio";
        description = "Monads for GPIO in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hplayground" = callPackage
@@ -95601,27 +95291,6 @@ self: {
      }) {};
 
   "hruby" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, QuickCheck
-     , ruby, scientific, stm, text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "hruby";
-       version = "0.3.4.2";
-       sha256 = "4e7afc76770d5a9f887f574c8ce69d8c23a39b9df369d7ca263fd88c73b59a28";
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring scientific stm text
-         unordered-containers vector
-       ];
-       librarySystemDepends = [ ruby ];
-       testHaskellDepends = [
-         aeson attoparsec base QuickCheck text vector
-       ];
-       description = "Embed a Ruby intepreter in your Haskell program !";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-linux" ];
-     }) {inherit (pkgs) ruby;};
-
-  "hruby_0_3_4_3" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, QuickCheck
      , ruby, scientific, stm, text, unordered-containers, vector
      }:
@@ -95639,7 +95308,7 @@ self: {
        ];
        description = "Embed a Ruby intepreter in your Haskell program !";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "x86_64-linux" ];
      }) {inherit (pkgs) ruby;};
 
   "hs-GeoIP" = callPackage
@@ -98227,7 +97896,6 @@ self: {
        homepage = "https://github.com/myfreeweb/hspec-expectations-pretty-diff#readme";
        description = "Catchy combinators for HUnit";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-experimental" = callPackage
@@ -105379,30 +105047,6 @@ self: {
      }) {};
 
   "inline-c" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring
-     , containers, cryptohash, directory, filepath, hashable, hspec, mtl
-     , parsec, parsers, QuickCheck, raw-strings-qq, regex-posix
-     , template-haskell, transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "inline-c";
-       version = "0.5.5.9";
-       sha256 = "2e48cae75fe1e4fd9f7c0ab4e7a4cbb4dcb9d2e9075d40adc33ac9038297fe22";
-       libraryHaskellDepends = [
-         ansi-wl-pprint base binary bytestring containers cryptohash
-         directory filepath hashable mtl parsec parsers QuickCheck
-         template-haskell transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         ansi-wl-pprint base containers hashable hspec parsers QuickCheck
-         raw-strings-qq regex-posix template-haskell transformers
-         unordered-containers vector
-       ];
-       description = "Write Haskell source files including C code inline. No FFI required.";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "inline-c_0_5_6_1" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring
      , containers, cryptohash, directory, filepath, hashable, hspec, mtl
      , parsec, parsers, QuickCheck, raw-strings-qq, regex-posix
@@ -105424,7 +105068,6 @@ self: {
        ];
        description = "Write Haskell source files including C code inline. No FFI required.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inline-c-cpp" = callPackage
@@ -107396,8 +107039,8 @@ self: {
      }:
      mkDerivation {
        pname = "itemfield";
-       version = "1.2.4.0";
-       sha256 = "31739fdc0bd51d88b3120f449a218d19508cb93e471619f6b93e7d5a1ba3498f";
+       version = "1.2.4.2";
+       sha256 = "29b27d36d332e847c3a3744e19fcbbfcf4231ab3a81aa66839ee6916880bd8a2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -114528,18 +114171,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "lens-family-th_0_4_1_0" = callPackage
-    ({ mkDerivation, base, template-haskell }:
-     mkDerivation {
-       pname = "lens-family-th";
-       version = "0.4.1.0";
-       sha256 = "084yng26xyhw6c6hij3p70zvjpvm1dlw6klphw51car9gi6dqkvm";
-       libraryHaskellDepends = [ base template-haskell ];
-       homepage = "http://github.com/DanBurton/lens-family-th#readme";
-       description = "Generate lens-family style lenses";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
   "lens-family-th" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -115814,27 +115445,6 @@ self: {
      }) {};
 
   "lifted-async" = callPackage
-    ({ mkDerivation, async, base, constraints, HUnit, lifted-base
-     , monad-control, mtl, tasty, tasty-hunit, tasty-th
-     , transformers-base
-     }:
-     mkDerivation {
-       pname = "lifted-async";
-       version = "0.9.1";
-       sha256 = "0f483e83079226f404d13c445a94c01dbfb5250159328016f023c900e9f3930d";
-       libraryHaskellDepends = [
-         async base constraints lifted-base monad-control transformers-base
-       ];
-       testHaskellDepends = [
-         async base HUnit lifted-base monad-control mtl tasty tasty-hunit
-         tasty-th
-       ];
-       homepage = "https://github.com/maoe/lifted-async";
-       description = "Run lifted IO operations asynchronously and wait for their results";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lifted-async_0_9_1_1" = callPackage
     ({ mkDerivation, async, base, constraints, HUnit, lifted-base
      , monad-control, mtl, tasty, tasty-hunit, tasty-th
      , transformers-base
@@ -115853,7 +115463,6 @@ self: {
        homepage = "https://github.com/maoe/lifted-async";
        description = "Run lifted IO operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lifted-base" = callPackage
@@ -118163,25 +117772,30 @@ self: {
      }) {};
 
   "log-warper" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, base, bytestring
+    ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring
      , data-default, directory, dlist, errors, exceptions, extra
-     , filepath, formatting, hashable, hslogger, lens, monad-control
-     , mtl, safecopy, text, text-format, time, transformers
-     , transformers-base, unordered-containers, yaml
+     , filepath, formatting, hashable, hslogger, hspec, lens
+     , monad-control, mtl, QuickCheck, safecopy, text, text-format, time
+     , transformers, transformers-base, universum, unordered-containers
+     , yaml
      }:
      mkDerivation {
        pname = "log-warper";
-       version = "0.2.3";
-       sha256 = "217976f8e82b2efae445ad8316a654b250f8e4750a1e0b9a31b4e8d46b22aa84";
+       version = "0.2.5";
+       sha256 = "db8894f9cbc932ad04e0cd29449d18df0803e4ffe0a10bf5cfc0b94332b39585";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson ansi-terminal base bytestring data-default directory dlist
          errors exceptions extra filepath formatting hashable hslogger lens
          monad-control mtl safecopy text text-format time transformers
-         transformers-base unordered-containers yaml
+         transformers-base universum unordered-containers yaml
        ];
        executableHaskellDepends = [ base exceptions hslogger text ];
+       testHaskellDepends = [
+         async base data-default directory filepath hspec QuickCheck
+         universum unordered-containers
+       ];
        homepage = "https://github.com/serokell/log-warper";
        description = "Flexible, configurable, monadic and pretty logging";
        license = stdenv.lib.licenses.mit;
@@ -125583,30 +125197,6 @@ self: {
      }) {};
 
   "mono-traversable" = callPackage
-    ({ mkDerivation, base, bytestring, containers, foldl, hashable
-     , hspec, HUnit, QuickCheck, semigroups, split, text, transformers
-     , unordered-containers, vector, vector-algorithms
-     }:
-     mkDerivation {
-       pname = "mono-traversable";
-       version = "1.0.1";
-       sha256 = "a96d449eb00e062be003d314884fdb06b1e02e18e0d43e5008500ae7ef3de268";
-       revision = "1";
-       editedCabalFile = "023e5f7596dbfe73456063ed6aa336d2262da4717c267225c9a50c6e6045dc41";
-       libraryHaskellDepends = [
-         base bytestring containers hashable split text transformers
-         unordered-containers vector vector-algorithms
-       ];
-       testHaskellDepends = [
-         base bytestring containers foldl hspec HUnit QuickCheck semigroups
-         text transformers unordered-containers vector
-       ];
-       homepage = "https://github.com/snoyberg/mono-traversable";
-       description = "Type classes for mapping, folding, and traversing monomorphic containers";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mono-traversable_1_0_1_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, foldl, hashable
      , hspec, HUnit, QuickCheck, semigroups, split, text, transformers
      , unordered-containers, vector, vector-algorithms
@@ -125626,7 +125216,6 @@ self: {
        homepage = "https://github.com/snoyberg/mono-traversable";
        description = "Type classes for mapping, folding, and traversing monomorphic containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mono-traversable-instances" = callPackage
@@ -132843,28 +132432,6 @@ self: {
      }) {};
 
   "opaleye-trans" = callPackage
-    ({ mkDerivation, base, mtl, opaleye, postgresql-simple
-     , product-profunctors, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "opaleye-trans";
-       version = "0.3.3";
-       sha256 = "7bfa05fc152921a8ab7ec6cba18be66f2cffb5840648e9c7a88e98c77cbfd841";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base mtl opaleye postgresql-simple product-profunctors transformers
-         transformers-base
-       ];
-       executableHaskellDepends = [
-         base opaleye postgresql-simple product-profunctors
-       ];
-       homepage = "https://github.com/WraithM/opaleye-trans";
-       description = "A monad transformer for Opaleye";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "opaleye-trans_0_3_4" = callPackage
     ({ mkDerivation, base, mtl, opaleye, postgresql-simple
      , product-profunctors, transformers, transformers-base
      }:
@@ -132884,7 +132451,6 @@ self: {
        homepage = "https://github.com/WraithM/opaleye-trans";
        description = "A monad transformer for Opaleye";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "open-browser" = callPackage
@@ -134938,25 +134504,23 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "pandoc_1_19_1" = callPackage
+  "pandoc_1_19_2" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, base
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
      , cmark, containers, data-default, deepseq, Diff, directory
      , doctemplates, executable-path, extensible-exceptions, filemanip
-     , filepath, ghc-prim, haddock-library, highlighting-kate, hslua
-     , HTTP, http-client, http-client-tls, http-types, HUnit
-     , JuicyPixels, mtl, network, network-uri, old-time, pandoc-types
-     , parsec, process, QuickCheck, random, scientific, SHA, syb
-     , tagsoup, temporary, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, texmath, text, time, unix
-     , unordered-containers, vector, xml, yaml, zip-archive, zlib
+     , filepath, ghc-prim, haddock-library, hslua, HTTP, http-client
+     , http-client-tls, http-types, HUnit, JuicyPixels, mtl, network
+     , network-uri, old-time, pandoc-types, parsec, process, QuickCheck
+     , random, scientific, SHA, skylighting, syb, tagsoup, temporary
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , texmath, text, time, unix, unordered-containers, vector, xml
+     , yaml, zip-archive, zlib
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "1.19.1";
-       sha256 = "9d22db0a1536de0984f4a605f1a28649e68d540e6d892947d9644987ecc4172a";
-       revision = "3";
-       editedCabalFile = "fd4285e9e69d662c7dce04f9153d8b4c571cd0dbd8d7ea2708c2fc50a0ee2abc";
+       version = "1.19.2";
+       sha256 = "8a87110f60e6412a4cae68b27e1647d029b73bb7f1794a62a3477a0df1bbbbbc";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -134964,21 +134528,21 @@ self: {
          aeson array base base64-bytestring binary blaze-html blaze-markup
          bytestring cmark containers data-default deepseq directory
          doctemplates extensible-exceptions filemanip filepath ghc-prim
-         haddock-library highlighting-kate hslua HTTP http-client
-         http-client-tls http-types JuicyPixels mtl network network-uri
-         old-time pandoc-types parsec process random scientific SHA syb
-         tagsoup temporary texmath text time unordered-containers vector xml
-         yaml zip-archive zlib
+         haddock-library hslua HTTP http-client http-client-tls http-types
+         JuicyPixels mtl network network-uri old-time pandoc-types parsec
+         process random scientific SHA skylighting syb tagsoup temporary
+         texmath text time unordered-containers vector xml yaml zip-archive
+         zlib
        ];
        executableHaskellDepends = [
          aeson base bytestring containers directory extensible-exceptions
-         filepath highlighting-kate HTTP network network-uri pandoc-types
-         text unix yaml
+         filepath HTTP network network-uri pandoc-types skylighting text
+         unix yaml
        ];
        testHaskellDepends = [
          ansi-terminal base bytestring containers Diff directory
-         executable-path filepath highlighting-kate HUnit pandoc-types
-         process QuickCheck syb test-framework test-framework-hunit
+         executable-path filepath HUnit pandoc-types process QuickCheck
+         skylighting syb test-framework test-framework-hunit
          test-framework-quickcheck2 text zip-archive
        ];
        doCheck = false;
@@ -134990,41 +134554,6 @@ self: {
      }) {};
 
   "pandoc-citeproc" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
-     , containers, data-default, directory, filepath, hs-bibutils, mtl
-     , old-locale, pandoc, pandoc-types, parsec, process, rfc5051
-     , setenv, split, syb, tagsoup, temporary, text, time
-     , unordered-containers, vector, xml-conduit, yaml
-     }:
-     mkDerivation {
-       pname = "pandoc-citeproc";
-       version = "0.10.3";
-       sha256 = "2f6233ff91a9fb08edfb0ac2b4ec40729d87590a7c557d0452674dd3c7df4d58";
-       revision = "1";
-       editedCabalFile = "aacaeb9d3fbf64d0bf21ff2f7cd6becc58160c9bcf2923431fe78d19eaf1aeb3";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers data-default directory filepath
-         hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
-         setenv split syb tagsoup text time unordered-containers vector
-         xml-conduit yaml
-       ];
-       executableHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring filepath pandoc
-         pandoc-types syb text yaml
-       ];
-       testHaskellDepends = [
-         aeson base bytestring directory filepath pandoc pandoc-types
-         process temporary text yaml
-       ];
-       doCheck = false;
-       homepage = "https://github.com/jgm/pandoc-citeproc";
-       description = "Supports using pandoc with citeproc";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pandoc-citeproc_0_10_4" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , containers, data-default, directory, filepath, hs-bibutils, mtl
      , old-locale, pandoc, pandoc-types, parsec, process, rfc5051
@@ -135055,7 +134584,6 @@ self: {
        homepage = "https://github.com/jgm/pandoc-citeproc";
        description = "Supports using pandoc with citeproc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-citeproc-preamble" = callPackage
@@ -136748,6 +136276,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "path_0_5_12" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions
+     , filepath, hashable, hspec, HUnit, mtl, QuickCheck
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "path";
+       version = "0.5.12";
+       sha256 = "52f0dae7e3d72d26fa62ff55de65b6697744dd0c5b96f48625cb00df1cf1055d";
+       libraryHaskellDepends = [
+         aeson base deepseq exceptions filepath hashable template-haskell
+       ];
+       testHaskellDepends = [
+         aeson base bytestring filepath hspec HUnit mtl QuickCheck
+       ];
+       description = "Support for well-typed paths";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "path-extra" = callPackage
     ({ mkDerivation, base, exceptions, path }:
      mkDerivation {
@@ -148138,20 +147686,25 @@ self: {
      }) {};
 
   "rasa" = callPackage
-    ({ mkDerivation, async, base, containers, data-default, lens, mtl
-     , text, text-lens, transformers, yi-rope
+    ({ mkDerivation, async, base, bifunctors, containers, data-default
+     , free, hspec, lens, mtl, pipes, pipes-concurrency, pipes-parse
+     , QuickCheck, quickcheck-instances, text, text-lens, transformers
+     , yi-rope
      }:
      mkDerivation {
        pname = "rasa";
-       version = "0.1.7";
-       sha256 = "e5d1ecdbcd350a2686ebcf45f2a7aa1922aa6909fe6bb79040a81963c8ddbbe3";
+       version = "0.1.9";
+       sha256 = "8dd969c39222963cf97033e13a141fbc9b1f075b8c7af6428ef72bef9439cf3c";
        libraryHaskellDepends = [
-         async base containers data-default lens mtl text text-lens
-         transformers yi-rope
+         async base bifunctors containers data-default free lens mtl pipes
+         pipes-concurrency pipes-parse text text-lens transformers yi-rope
+       ];
+       testHaskellDepends = [
+         base hspec lens QuickCheck quickcheck-instances text yi-rope
        ];
        homepage = "https://github.com/ChrisPenner/rasa#readme";
        description = "A modular text editor";
-       license = stdenv.lib.licenses.mit;
+       license = stdenv.lib.licenses.gpl3;
      }) {};
 
   "rasa-example-config" = callPackage
@@ -148161,8 +147714,8 @@ self: {
      }:
      mkDerivation {
        pname = "rasa-example-config";
-       version = "0.1.2";
-       sha256 = "e6d4eac030ba165eb446dacb7eef1fcd19673cd45d4656b5f9ff0f5c924f8db7";
+       version = "0.1.3";
+       sha256 = "471525573811177d6d5aaaeff5353ce154f1f44ccf1f29a865439d94b5ceca93";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -148172,7 +147725,7 @@ self: {
        ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Example user config for Rasa";
-       license = stdenv.lib.licenses.mit;
+       license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -148197,14 +147750,14 @@ self: {
      }:
      mkDerivation {
        pname = "rasa-ext-cmd";
-       version = "0.1.1";
-       sha256 = "8ba6c787802bf3f1a665d973052bfcfc1ee6ce4c883a867a900c41e0f5eab378";
+       version = "0.1.2";
+       sha256 = "f328cc06d7fca6ac2bb301aaa18b057b0404319dc0072963f27a90750644b3e9";
        libraryHaskellDepends = [
          base containers data-default lens rasa text
        ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext for running commands";
-       license = stdenv.lib.licenses.mit;
+       license = stdenv.lib.licenses.gpl3;
      }) {};
 
   "rasa-ext-cursors" = callPackage
@@ -148213,15 +147766,15 @@ self: {
      }:
      mkDerivation {
        pname = "rasa-ext-cursors";
-       version = "0.1.4";
-       sha256 = "549776d01b0e363780b3301bc6320bcad74ddcd47278b2cdfda07ab9291e022b";
+       version = "0.1.5";
+       sha256 = "81c949b85bf60cb814cedf0fd58d1082cc161ee820caacd86d8754e8dd9f2d93";
        libraryHaskellDepends = [
          base data-default lens mtl rasa rasa-ext-style text text-lens
          yi-rope
        ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext adding cursor(s)";
-       license = stdenv.lib.licenses.mit;
+       license = stdenv.lib.licenses.gpl3;
      }) {};
 
   "rasa-ext-files" = callPackage
@@ -148230,15 +147783,15 @@ self: {
      }:
      mkDerivation {
        pname = "rasa-ext-files";
-       version = "0.1.2";
-       sha256 = "a70077f9237d274b24a2d83bf87aaa12565cb33bcb9e94fce22e0377067e0016";
+       version = "0.1.3";
+       sha256 = "094f8127c8266a0f988661ada65d0ff08979025cb1939edff8199cdcfd0da06f";
        libraryHaskellDepends = [
          base data-default lens rasa rasa-ext-cmd rasa-ext-status-bar
          rasa-ext-views text yi-rope
        ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext for filesystem actions";
-       license = stdenv.lib.licenses.mit;
+       license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -148246,12 +147799,12 @@ self: {
     ({ mkDerivation, base, lens, mtl, rasa }:
      mkDerivation {
        pname = "rasa-ext-logger";
-       version = "0.1.2";
-       sha256 = "3f60b4a22f053f6fe33fbe6849146fc73c16695951008c3ed086b2c79a32f854";
+       version = "0.1.3";
+       sha256 = "8648adfd280b15ddfed693bb771745de6311bcfe3fb3066fa3ce89694a12eb5d";
        libraryHaskellDepends = [ base lens mtl rasa ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext for logging state/actions";
-       license = stdenv.lib.licenses.mit;
+       license = stdenv.lib.licenses.gpl3;
      }) {};
 
   "rasa-ext-slate" = callPackage
@@ -148261,15 +147814,15 @@ self: {
      }:
      mkDerivation {
        pname = "rasa-ext-slate";
-       version = "0.1.4";
-       sha256 = "4c6bbfd12b4aa8bb69076925bf6d4143ea692e8b458ad6e22128d6dc9c351aaf";
+       version = "0.1.6";
+       sha256 = "0e11bf0c2e01faf5279dc8b4e2c19f4318d74bc29eb3652966b590b906c2cca8";
        libraryHaskellDepends = [
          base lens mtl rasa rasa-ext-logger rasa-ext-status-bar
          rasa-ext-style rasa-ext-views recursion-schemes text vty yi-rope
        ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa extension for rendering to terminal with vty";
-       license = stdenv.lib.licenses.mit;
+       license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -148277,24 +147830,24 @@ self: {
     ({ mkDerivation, base, data-default, lens, rasa, yi-rope }:
      mkDerivation {
        pname = "rasa-ext-status-bar";
-       version = "0.1.2";
-       sha256 = "07c98db2eeb0f511b6d8104e706541817fc69405392c0576eac42cf48e8455f3";
+       version = "0.1.3";
+       sha256 = "28d156d4b91650b68d9c20ebe3ce0132be9ce15c71e5ce4a1f6656daf1902e3f";
        libraryHaskellDepends = [ base data-default lens rasa yi-rope ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext for populating status-bar";
-       license = stdenv.lib.licenses.mit;
+       license = stdenv.lib.licenses.gpl3;
      }) {};
 
   "rasa-ext-style" = callPackage
     ({ mkDerivation, base, data-default, lens, rasa }:
      mkDerivation {
        pname = "rasa-ext-style";
-       version = "0.1.3";
-       sha256 = "4cf78443b2a2d4b41400d15d614c2767a9f0a94042df09fcb2209accc3c77327";
+       version = "0.1.4";
+       sha256 = "04e883526042bb7cda017b5d3404b08223fea5fd841c9913095337ab378717a5";
        libraryHaskellDepends = [ base data-default lens rasa ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext managing rendering styles";
-       license = stdenv.lib.licenses.mit;
+       license = stdenv.lib.licenses.gpl3;
      }) {};
 
   "rasa-ext-views" = callPackage
@@ -148303,33 +147856,34 @@ self: {
      }:
      mkDerivation {
        pname = "rasa-ext-views";
-       version = "0.1.1";
-       sha256 = "d7b234282b2d9f0127550645932b3df065f75ad4365662a8aa80b82472ff4580";
+       version = "0.1.3";
+       sha256 = "28413cc5643edb08b4095deaf973525a77496ce6d17df22915fa17daf2495691";
        libraryHaskellDepends = [
          base bifunctors data-default lens mtl rasa recursion-schemes
        ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext managing rendering views";
-       license = stdenv.lib.licenses.mit;
+       license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rasa-ext-vim" = callPackage
-    ({ mkDerivation, base, data-default, lens, mtl, rasa
+    ({ mkDerivation, base, data-default, hspec, lens, mtl, rasa
      , rasa-ext-cursors, rasa-ext-files, rasa-ext-status-bar
      , rasa-ext-views, text, text-lens, yi-rope
      }:
      mkDerivation {
        pname = "rasa-ext-vim";
-       version = "0.1.3";
-       sha256 = "9282689ed13d9dbd67c46a4c2071e5a57f7ac3723bff0477dd40d54fea7ad3cf";
+       version = "0.1.5";
+       sha256 = "bb90b7cf5c3e1a7cf212690e8ae1b58cb58a7ead5defa6e21bd6d0fd5136b9e6";
        libraryHaskellDepends = [
          base data-default lens mtl rasa rasa-ext-cursors rasa-ext-files
          rasa-ext-status-bar rasa-ext-views text text-lens yi-rope
        ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext for vim bindings";
-       license = stdenv.lib.licenses.mit;
+       license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -151167,6 +150721,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "relapse" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
+     , bytestring, containers, include-file, tasty, tasty-hspec, text
+     , vector
+     }:
+     mkDerivation {
+       pname = "relapse";
+       version = "0.1.0.1";
+       sha256 = "4e6e2bb0c4c420f184c9cc928659e3bbbbce0215f2681e7641a9a6f2eb31e631";
+       libraryHaskellDepends = [ attoparsec base bytestring ];
+       testHaskellDepends = [
+         aeson base base16-bytestring bytestring containers include-file
+         tasty tasty-hspec text vector
+       ];
+       homepage = "https://github.com/iostat/relapse#readme";
+       description = "Sensible RLP encoding";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "relation" = callPackage
     ({ mkDerivation, array, base, containers, groom }:
      mkDerivation {
@@ -152732,28 +152305,6 @@ self: {
      }) {};
 
   "rethinkdb" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
-     , containers, data-default, doctest, mtl, network, scientific, text
-     , time, unordered-containers, utf8-string, vector
-     }:
-     mkDerivation {
-       pname = "rethinkdb";
-       version = "2.2.0.7";
-       sha256 = "ed74dd74333e5cd5fd99dfd84af8c6331fca04d1d04e241b533e2c2936078873";
-       revision = "1";
-       editedCabalFile = "87cbc3bf8f5d02043e4b7a93a85cc7cb5c0994bd17cee8e65210715e1272b705";
-       libraryHaskellDepends = [
-         aeson base base64-bytestring binary bytestring containers
-         data-default mtl network scientific text time unordered-containers
-         utf8-string vector
-       ];
-       testHaskellDepends = [ base doctest ];
-       homepage = "http://github.com/atnnn/haskell-rethinkdb";
-       description = "A driver for RethinkDB 2.2";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "rethinkdb_2_2_0_8" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
      , containers, data-default, doctest, mtl, network, scientific, text
      , time, unordered-containers, utf8-string, vector
@@ -152771,7 +152322,6 @@ self: {
        homepage = "http://github.com/atnnn/haskell-rethinkdb";
        description = "A driver for RethinkDB 2.2";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rethinkdb-client-driver" = callPackage
@@ -154795,18 +154345,6 @@ self: {
      }) {};
 
   "safe" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "safe";
-       version = "0.3.10";
-       sha256 = "da724ad9cf4b424c4881a50439c3b13777f477e3301c068ce7d54e9031e14b9a";
-       libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/ndmitchell/safe#readme";
-       description = "Library of safe (exception free) functions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "safe_0_3_11" = callPackage
     ({ mkDerivation, base, deepseq, QuickCheck }:
      mkDerivation {
        pname = "safe";
@@ -154817,7 +154355,6 @@ self: {
        homepage = "https://github.com/ndmitchell/safe#readme";
        description = "Library of safe (exception free) functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-access" = callPackage
@@ -158761,20 +158298,18 @@ self: {
      }) {};
 
   "servant-elm" = callPackage
-    ({ mkDerivation, aeson, base, data-default, Diff, directory
-     , elm-export, hspec, HUnit, interpolate, lens, mockery, process
+    ({ mkDerivation, aeson, base, Diff, elm-export, hspec, HUnit, lens
      , servant, servant-foreign, text, wl-pprint-text
      }:
      mkDerivation {
        pname = "servant-elm";
-       version = "0.3.0.0";
-       sha256 = "fc502005a21cb91845c069366f60ddfa77deeb95cb6571bcd2df172e5285439b";
+       version = "0.3.0.1";
+       sha256 = "03206698142a40574d1fee4e023cafb91755301e8aaf6d12bb53ca6b78813bb2";
        libraryHaskellDepends = [
          base elm-export lens servant servant-foreign text wl-pprint-text
        ];
        testHaskellDepends = [
-         aeson base data-default Diff directory elm-export hspec HUnit
-         interpolate mockery process servant text
+         aeson base Diff elm-export hspec HUnit servant text
        ];
        homepage = "http://github.com/mattjbray/servant-elm#readme";
        description = "Automatically derive Elm functions to query servant webservices";
@@ -160171,40 +159706,6 @@ self: {
      }) {};
 
   "shake" = callPackage
-    ({ mkDerivation, base, binary, bytestring, deepseq, directory
-     , extra, filepath, hashable, js-flot, js-jquery, primitive, process
-     , QuickCheck, random, time, transformers, unix
-     , unordered-containers, utf8-string
-     }:
-     mkDerivation {
-       pname = "shake";
-       version = "0.15.10";
-       sha256 = "36331a3cf3e29578c3134e4ee6481dd932e7d40704f5c38703a0eb231ba433d0";
-       revision = "1";
-       editedCabalFile = "bb24876b00ef8cd3f8500ef729a01278e6e4ba9c7e12391cb76c2217ddc55563";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base binary bytestring deepseq directory extra filepath hashable
-         js-flot js-jquery process random time transformers unix
-         unordered-containers utf8-string
-       ];
-       executableHaskellDepends = [
-         base binary bytestring deepseq directory extra filepath hashable
-         js-flot js-jquery primitive process random time transformers unix
-         unordered-containers utf8-string
-       ];
-       testHaskellDepends = [
-         base binary bytestring deepseq directory extra filepath hashable
-         js-flot js-jquery process QuickCheck random time transformers unix
-         unordered-containers utf8-string
-       ];
-       homepage = "http://shakebuild.com";
-       description = "Build system library, like Make, but more accurate dependencies";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "shake_0_15_11" = callPackage
     ({ mkDerivation, base, binary, bytestring, deepseq, directory
      , extra, filepath, hashable, js-flot, js-jquery, primitive, process
      , QuickCheck, random, time, transformers, unix
@@ -160234,7 +159735,6 @@ self: {
        homepage = "http://shakebuild.com";
        description = "Build system library, like Make, but more accurate dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shake-cabal-build" = callPackage
@@ -166929,6 +166429,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ssh-known-hosts" = callPackage
+    ({ mkDerivation, base, HUnit, iproute, QuickCheck, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text, unix
+     }:
+     mkDerivation {
+       pname = "ssh-known-hosts";
+       version = "0.2.0.0";
+       sha256 = "0a93cbeae395701ff1cd609c29aaa2b59d507304b91612a28193156faac210fe";
+       libraryHaskellDepends = [ base iproute text ];
+       testHaskellDepends = [
+         base HUnit iproute QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2 text unix
+       ];
+       homepage = "http://hub.darcs.net/kquick/ssh-known-hosts";
+       description = "Read and interpret the SSH known-hosts file";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sshd-lint" = callPackage
     ({ mkDerivation, base, containers, hspec, keyword-args
      , nagios-check, parsec
@@ -168760,19 +168278,6 @@ self: {
      }) {};
 
   "stopwatch" = callPackage
-    ({ mkDerivation, base, clock, hspec, transformers }:
-     mkDerivation {
-       pname = "stopwatch";
-       version = "0.1.0.3";
-       sha256 = "0ddeaefab7989bd5fc5c5e45c769806630da7be0e699f36e4ada6e6d91c5026e";
-       libraryHaskellDepends = [ base clock transformers ];
-       testHaskellDepends = [ base clock hspec ];
-       homepage = "https://github.com/debug-ito/stopwatch";
-       description = "A simple stopwatch utility";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "stopwatch_0_1_0_4" = callPackage
     ({ mkDerivation, base, clock, hspec, transformers }:
      mkDerivation {
        pname = "stopwatch";
@@ -168783,7 +168288,6 @@ self: {
        homepage = "https://github.com/debug-ito/stopwatch";
        description = "A simple stopwatch utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "storable" = callPackage
@@ -169262,23 +168766,6 @@ self: {
      }) {};
 
   "streaming" = callPackage
-    ({ mkDerivation, base, exceptions, ghc-prim, mmorph, monad-control
-     , mtl, resourcet, time, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "streaming";
-       version = "0.1.4.3";
-       sha256 = "c9ea0aa19a91717f0f988d0c2503e68a523b1d104facec841d0182425ec920c9";
-       libraryHaskellDepends = [
-         base exceptions ghc-prim mmorph monad-control mtl resourcet time
-         transformers transformers-base
-       ];
-       homepage = "https://github.com/michaelt/streaming";
-       description = "an elementary streaming prelude and general stream type";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "streaming_0_1_4_5" = callPackage
     ({ mkDerivation, base, containers, exceptions, ghc-prim, mmorph
      , monad-control, mtl, resourcet, time, transformers
      , transformers-base
@@ -169294,32 +168781,9 @@ self: {
        homepage = "https://github.com/michaelt/streaming";
        description = "an elementary streaming prelude and general stream type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-bytestring" = 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;
-     }) {};
-
-  "streaming-bytestring_0_1_4_6" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl
      , resourcet, smallcheck, streaming, tasty, tasty-smallcheck
      , transformers, transformers-base
@@ -169339,32 +168803,9 @@ self: {
        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
-     , stm, text, transformers, unix, zlib
-     }:
-     mkDerivation {
-       pname = "streaming-commons";
-       version = "0.1.16";
-       sha256 = "17fdf509823e72996265de9260eaf58e33350e746dea058a36392c843ea8106e";
-       libraryHaskellDepends = [
-         array async base blaze-builder bytestring directory network process
-         random stm text transformers unix zlib
-       ];
-       testHaskellDepends = [
-         array async base blaze-builder bytestring deepseq hspec network
-         QuickCheck text unix zlib
-       ];
-       homepage = "https://github.com/fpco/streaming-commons";
-       description = "Common lower-level functions needed by various streaming data libraries";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "streaming-commons_0_1_17" = callPackage
     ({ mkDerivation, array, async, base, blaze-builder, bytestring
      , deepseq, directory, hspec, network, process, QuickCheck, random
      , stm, text, transformers, unix, zlib
@@ -169384,7 +168825,6 @@ self: {
        homepage = "https://github.com/fpco/streaming-commons";
        description = "Common lower-level functions needed by various streaming data libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-eversion" = callPackage
@@ -173256,24 +172696,6 @@ self: {
      }) {};
 
   "tasty" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, clock, containers
-     , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged
-     , unbounded-delays
-     }:
-     mkDerivation {
-       pname = "tasty";
-       version = "0.11.0.4";
-       sha256 = "e0e248d50aaa098b2633d51a1c71f3da569ba5d6c0e77e0e39b6c9b7de97fd16";
-       libraryHaskellDepends = [
-         ansi-terminal async base clock containers deepseq mtl
-         optparse-applicative regex-tdfa stm tagged unbounded-delays
-       ];
-       homepage = "http://documentup.com/feuerbach/tasty";
-       description = "Modern and extensible testing framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty_0_11_1" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, clock, containers
      , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged
      , unbounded-delays
@@ -173289,7 +172711,6 @@ self: {
        homepage = "http://documentup.com/feuerbach/tasty";
        description = "Modern and extensible testing framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-ant-xml" = callPackage
@@ -173436,25 +172857,6 @@ self: {
      }) {};
 
   "tasty-hspec" = callPackage
-    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random
-     , tagged, tasty, tasty-quickcheck, tasty-smallcheck
-     }:
-     mkDerivation {
-       pname = "tasty-hspec";
-       version = "1.1.3";
-       sha256 = "3c597d948cad9c61355a56811533abbad130eb6e4068fd930ab5514c759bfe31";
-       revision = "3";
-       editedCabalFile = "1bfa738f1421d9ea83a36c76f41fd0c97e8f1621dad501a4340ddef3a0d420ea";
-       libraryHaskellDepends = [
-         base hspec hspec-core QuickCheck random tagged tasty
-         tasty-quickcheck tasty-smallcheck
-       ];
-       homepage = "https://github.com/mitchellwrosen/tasty-hspec";
-       description = "Hspec support for the Tasty test framework";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tasty-hspec_1_1_3_1" = callPackage
     ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random
      , tagged, tasty, tasty-quickcheck, tasty-smallcheck
      }:
@@ -173469,7 +172871,6 @@ self: {
        homepage = "https://github.com/mitchellwrosen/tasty-hspec";
        description = "Hspec support for the Tasty test framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-html" = callPackage
@@ -175543,13 +174944,13 @@ self: {
     ({ mkDerivation, base, extra, hspec, lens, text }:
      mkDerivation {
        pname = "text-lens";
-       version = "0.1.0.0";
-       sha256 = "e013ed9ba9385395e1eddc01c0da049f865ff020403e4af9671782b1b307cd2d";
+       version = "0.1.1";
+       sha256 = "d12962a6f4bea85e4661d57d7240ca4a3cce83c623999caa2296632fde1870d8";
        libraryHaskellDepends = [ base extra lens text ];
        testHaskellDepends = [ base hspec lens ];
        homepage = "https://github.com/ChrisPenner/rasa";
        description = "Lenses for operating over text";
-       license = stdenv.lib.licenses.mit;
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "text-lips" = callPackage
@@ -184974,20 +184375,6 @@ self: {
      }) {};
 
   "validity" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       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";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "validity_0_3_1_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "validity";
@@ -184997,7 +184384,6 @@ self: {
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity typeclass";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validity-bytestring" = callPackage
@@ -187082,35 +186468,6 @@ self: {
      }) {};
 
   "wai-extra" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
-     , blaze-builder, bytestring, case-insensitive, containers, cookie
-     , data-default-class, deepseq, directory, fast-logger, hspec
-     , http-types, HUnit, iproute, lifted-base, network, old-locale
-     , resourcet, streaming-commons, stringsearch, text, time
-     , transformers, unix, unix-compat, vault, void, wai, wai-logger
-     , word8, zlib
-     }:
-     mkDerivation {
-       pname = "wai-extra";
-       version = "3.0.19";
-       sha256 = "8002890c4aa4fc564a142982bc37f29c35caa76231697eb51c519a698482e3bf";
-       libraryHaskellDepends = [
-         aeson ansi-terminal base base64-bytestring blaze-builder bytestring
-         case-insensitive containers cookie data-default-class deepseq
-         directory fast-logger http-types iproute lifted-base network
-         old-locale resourcet streaming-commons stringsearch text time
-         transformers unix unix-compat vault void wai wai-logger word8 zlib
-       ];
-       testHaskellDepends = [
-         base blaze-builder bytestring case-insensitive cookie fast-logger
-         hspec http-types HUnit resourcet text time transformers wai zlib
-       ];
-       homepage = "http://github.com/yesodweb/wai";
-       description = "Provides some basic WAI handlers and middleware";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wai-extra_3_0_19_1" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
      , blaze-builder, bytestring, case-insensitive, containers, cookie
      , data-default-class, deepseq, directory, fast-logger, hspec
@@ -187137,7 +186494,6 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "Provides some basic WAI handlers and middleware";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-frontend-monadcgi" = callPackage
@@ -188357,37 +187713,6 @@ self: {
      }) {};
 
   "warp" = callPackage
-    ({ mkDerivation, array, async, auto-update, base, blaze-builder
-     , bytestring, bytestring-builder, case-insensitive, containers
-     , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date
-     , http-types, http2, HUnit, iproute, lifted-base, network, process
-     , QuickCheck, silently, simple-sendfile, stm, streaming-commons
-     , text, time, transformers, unix, unix-compat, vault, wai, word8
-     }:
-     mkDerivation {
-       pname = "warp";
-       version = "3.2.9";
-       sha256 = "e2789a51b302dde7ab4145b5a0be745e1bdaae108761f9664718fbccbd55ebca";
-       libraryHaskellDepends = [
-         array async auto-update base blaze-builder bytestring
-         bytestring-builder case-insensitive containers ghc-prim hashable
-         http-date http-types http2 iproute network simple-sendfile stm
-         streaming-commons text unix unix-compat vault wai word8
-       ];
-       testHaskellDepends = [
-         array async auto-update base blaze-builder bytestring
-         bytestring-builder case-insensitive containers directory doctest
-         ghc-prim hashable hspec HTTP http-date http-types http2 HUnit
-         iproute lifted-base network process QuickCheck silently
-         simple-sendfile stm streaming-commons text time transformers unix
-         unix-compat vault wai word8
-       ];
-       homepage = "http://github.com/yesodweb/wai";
-       description = "A fast, light-weight web server for WAI applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "warp_3_2_10" = callPackage
     ({ mkDerivation, array, async, auto-update, base, blaze-builder
      , bytestring, bytestring-builder, case-insensitive, containers
      , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date
@@ -188416,7 +187741,6 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "A fast, light-weight web server for WAI applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warp-dynamic" = callPackage
@@ -188460,23 +187784,6 @@ self: {
      }) {};
 
   "warp-tls" = callPackage
-    ({ mkDerivation, base, bytestring, cryptonite, data-default-class
-     , network, streaming-commons, tls, wai, warp
-     }:
-     mkDerivation {
-       pname = "warp-tls";
-       version = "3.2.2";
-       sha256 = "9fc2a031ed5fd17c63479743869ed03fdf80f707a9ecfe4ff02939f4f7df091b";
-       libraryHaskellDepends = [
-         base bytestring cryptonite data-default-class network
-         streaming-commons tls wai warp
-       ];
-       homepage = "http://github.com/yesodweb/wai";
-       description = "HTTP over TLS support for Warp via the TLS package";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "warp-tls_3_2_3" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, data-default-class
      , network, streaming-commons, tls, wai, warp
      }:
@@ -188491,7 +187798,6 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "HTTP over TLS support for Warp via the TLS package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warp-tls-uid" = callPackage
@@ -188950,23 +188256,6 @@ self: {
      }) {};
 
   "web-routes-th" = callPackage
-    ({ mkDerivation, base, hspec, HUnit, parsec, QuickCheck, split
-     , template-haskell, text, web-routes
-     }:
-     mkDerivation {
-       pname = "web-routes-th";
-       version = "0.22.6";
-       sha256 = "e67472973238f1a6ed31c909e1021311da00a47f9d1c4dd0279bd1fca43eb9fb";
-       libraryHaskellDepends = [
-         base parsec split template-haskell text web-routes
-       ];
-       testHaskellDepends = [ base hspec HUnit QuickCheck web-routes ];
-       homepage = "https://github.com/happstack/web-routes-th";
-       description = "Support for deriving PathInfo using Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "web-routes-th_0_22_6_1" = callPackage
     ({ mkDerivation, base, hspec, HUnit, parsec, QuickCheck, split
      , template-haskell, text, web-routes
      }:
@@ -188981,7 +188270,6 @@ self: {
        homepage = "https://github.com/happstack/web-routes-th";
        description = "Support for deriving PathInfo using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-routes-transformers" = callPackage
@@ -189861,23 +189149,6 @@ self: {
      }) {};
 
   "wikicfp-scraper" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec
-     , scalpel, text, time
-     }:
-     mkDerivation {
-       pname = "wikicfp-scraper";
-       version = "0.1.0.6";
-       sha256 = "8da3d67ee089342a9057e08b350896f278d404466e771757412ddcf1117270eb";
-       libraryHaskellDepends = [
-         attoparsec base bytestring scalpel text time
-       ];
-       testHaskellDepends = [ base bytestring filepath hspec time ];
-       homepage = "https://github.com/debug-ito/wikicfp-scraper";
-       description = "Scrape WikiCFP web site";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wikicfp-scraper_0_1_0_7" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec
      , scalpel, text, time
      }:
@@ -189892,7 +189163,6 @@ self: {
        homepage = "https://github.com/debug-ito/wikicfp-scraper";
        description = "Scrape WikiCFP web site";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wikipedia4epub" = callPackage
@@ -190326,17 +189596,6 @@ self: {
      }) {};
 
   "wl-pprint-text" = callPackage
-    ({ mkDerivation, base, text }:
-     mkDerivation {
-       pname = "wl-pprint-text";
-       version = "1.1.0.4";
-       sha256 = "ff2d53814b7c66624a2ef3d8f79034273de5b7addb29c1ebad277057e3fff1f5";
-       libraryHaskellDepends = [ base text ];
-       description = "A Wadler/Leijen Pretty Printer for Text values";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wl-pprint-text_1_1_1_0" = callPackage
     ({ mkDerivation, base, base-compat, text }:
      mkDerivation {
        pname = "wl-pprint-text";
@@ -190345,7 +189604,6 @@ self: {
        libraryHaskellDepends = [ base base-compat text ];
        description = "A Wadler/Leijen Pretty Printer for Text values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wlc-hs" = callPackage
@@ -190964,21 +190222,6 @@ self: {
      }) {};
 
   "writer-cps-mtl" = callPackage
-    ({ mkDerivation, base, mtl, transformers, writer-cps-transformers
-     }:
-     mkDerivation {
-       pname = "writer-cps-mtl";
-       version = "0.1.1.1";
-       sha256 = "db7f45ebceb3ecb166422c53d0a80a1c9bece8a958a3a9e4d15d75ada02bbf97";
-       libraryHaskellDepends = [
-         base mtl transformers writer-cps-transformers
-       ];
-       homepage = "https://github.com/minad/writer-cps-mtl#readme";
-       description = "MonadWriter orphan instances for writer-cps-transformers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "writer-cps-mtl_0_1_1_2" = callPackage
     ({ mkDerivation, base, mtl, transformers, writer-cps-transformers
      }:
      mkDerivation {
@@ -190991,22 +190234,9 @@ self: {
        homepage = "https://github.com/minad/writer-cps-mtl#readme";
        description = "MonadWriter orphan instances for writer-cps-transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "writer-cps-transformers" = callPackage
-    ({ mkDerivation, base, transformers }:
-     mkDerivation {
-       pname = "writer-cps-transformers";
-       version = "0.1.1.0";
-       sha256 = "0a8663fe10576b659955fc3f9f816c776cc3a2cd9620e907d0e9ca1a8e88c62e";
-       libraryHaskellDepends = [ base transformers ];
-       homepage = "https://github.com/minad/writer-cps-transformers#readme";
-       description = "WriteT and RWST monad transformers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "writer-cps-transformers_0_1_1_2" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "writer-cps-transformers";
@@ -191016,7 +190246,6 @@ self: {
        homepage = "https://github.com/minad/writer-cps-transformers#readme";
        description = "WriteT and RWST monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wsdl" = callPackage
@@ -192331,27 +191560,6 @@ self: {
      }) {};
 
   "xml-hamlet" = callPackage
-    ({ mkDerivation, base, containers, hspec, HUnit, parsec
-     , shakespeare, template-haskell, text, xml-conduit
-     }:
-     mkDerivation {
-       pname = "xml-hamlet";
-       version = "0.4.0.12";
-       sha256 = "0ff43b778e9e497b468dd123ab81fa8cfc84dcd0a6c8ab06b8fc27cf3e0669d2";
-       libraryHaskellDepends = [
-         base containers parsec shakespeare template-haskell text
-         xml-conduit
-       ];
-       testHaskellDepends = [
-         base containers hspec HUnit parsec shakespeare template-haskell
-         text xml-conduit
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Hamlet-style quasiquoter for XML content";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "xml-hamlet_0_4_1" = callPackage
     ({ mkDerivation, base, containers, hspec, HUnit, parsec
      , shakespeare, template-haskell, text, xml-conduit
      }:
@@ -192370,7 +191578,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Hamlet-style quasiquoter for XML content";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-helpers" = callPackage
@@ -193557,37 +192764,6 @@ self: {
      }) {};
 
   "yaml" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
-     , bytestring, conduit, containers, directory, enclosed-exceptions
-     , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific
-     , semigroups, template-haskell, temporary, text, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "yaml";
-       version = "0.8.21.1";
-       sha256 = "f9f8e801a215c65cf5eff6e3aa384060e60232521630495d13573bf0677a0db2";
-       configureFlags = [ "-fsystem-libyaml" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring conduit containers directory
-         enclosed-exceptions filepath resourcet scientific semigroups
-         template-haskell text transformers unordered-containers vector
-       ];
-       libraryPkgconfigDepends = [ libyaml ];
-       executableHaskellDepends = [ aeson base bytestring ];
-       testHaskellDepends = [
-         aeson aeson-qq base base-compat bytestring conduit directory hspec
-         HUnit mockery resourcet temporary text transformers
-         unordered-containers vector
-       ];
-       homepage = "http://github.com/snoyberg/yaml/";
-       description = "Support for parsing and rendering YAML documents";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) libyaml;};
-
-  "yaml_0_8_21_2" = callPackage
     ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
      , bytestring, conduit, containers, directory, enclosed-exceptions
      , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific
@@ -193616,7 +192792,6 @@ self: {
        homepage = "http://github.com/snoyberg/yaml/";
        description = "Support for parsing and rendering YAML documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libyaml;};
 
   "yaml-config" = callPackage
@@ -195861,24 +195036,6 @@ self: {
      }) {};
 
   "yesod-websockets" = callPackage
-    ({ mkDerivation, async, base, conduit, enclosed-exceptions
-     , monad-control, transformers, wai, wai-websockets, websockets
-     , yesod-core
-     }:
-     mkDerivation {
-       pname = "yesod-websockets";
-       version = "0.2.4.1";
-       sha256 = "795b497217dece919d4034bc4dfa84632d900798d1be9a423ce57409378cbccf";
-       libraryHaskellDepends = [
-         async base conduit enclosed-exceptions monad-control transformers
-         wai wai-websockets websockets yesod-core
-       ];
-       homepage = "https://github.com/yesodweb/yesod";
-       description = "WebSockets support for Yesod";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-websockets_0_2_5" = callPackage
     ({ mkDerivation, async, base, conduit, enclosed-exceptions
      , monad-control, transformers, wai, wai-websockets, websockets
      , yesod-core
@@ -195894,7 +195051,6 @@ self: {
        homepage = "https://github.com/yesodweb/yesod";
        description = "WebSockets support for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-websockets-extra" = callPackage

From 196b87f707df2da0a3826e02b9b1bed2555ffbe9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 30 Jan 2017 11:55:15 +0100
Subject: [PATCH 105/899] knot-dns: another attempt to fix build on Darwin

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

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 2eb8cd208ea..b2d40c51cb1 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, pkgconfig, gnutls, jansson, liburcu, lmdb, libcap_ng, libidn
-, systemd, nettle, libedit }:
+, systemd, nettle, libedit, zlib
+}:
 
 # Note: ATM only the libraries have been tested in nixpkgs.
 stdenv.mkDerivation rec {
@@ -20,7 +21,8 @@ stdenv.mkDerivation rec {
     # without sphinx &al. for developer documentation
   ]
     # Use embedded lmdb there for now, as detection is broken on Darwin somehow.
-    ++ stdenv.lib.optionals stdenv.isLinux [ libcap_ng systemd lmdb ];
+    ++ stdenv.lib.optionals stdenv.isLinux [ libcap_ng systemd lmdb ]
+    ++ stdenv.lib.optional stdenv.isDarwin zlib; # perhaps due to gnutls
 
   enableParallelBuilding = true;
 

From 51dc13b148fdfe15a33e1d0ad2d2d4842d30fd2b Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 6 Sep 2016 22:23:34 -0700
Subject: [PATCH 106/899] ruby: cleanup unneeded files

---
 .../interpreters/ruby/bitperfect-rdoc.patch   | 13 ------
 .../interpreters/ruby/ruby22-rand-egd.patch   | 42 -------------------
 2 files changed, 55 deletions(-)
 delete mode 100644 pkgs/development/interpreters/ruby/bitperfect-rdoc.patch
 delete mode 100644 pkgs/development/interpreters/ruby/ruby22-rand-egd.patch

diff --git a/pkgs/development/interpreters/ruby/bitperfect-rdoc.patch b/pkgs/development/interpreters/ruby/bitperfect-rdoc.patch
deleted file mode 100644
index d5fb9e4554f..00000000000
--- a/pkgs/development/interpreters/ruby/bitperfect-rdoc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -r -u orig/lib/rdoc/generator/template/darkfish/filepage.rhtml new/lib/rdoc/generator/template/darkfish/filepage.rhtml
---- orig/lib/rdoc/generator/template/darkfish/filepage.rhtml
-+++ new/lib/rdoc/generator/template/darkfish/filepage.rhtml
-@@ -88,9 +88,6 @@
- <body class="file file-popup">
-   <div id="metadata">
-     <dl>
--      <dt class="modified-date">Last Modified</dt>
--      <dd class="modified-date"><%= file.last_modified %></dd>
--
-       <% if file.requires %>
-       <dt class="requires">Requires</dt>
-       <dd class="requires">
diff --git a/pkgs/development/interpreters/ruby/ruby22-rand-egd.patch b/pkgs/development/interpreters/ruby/ruby22-rand-egd.patch
deleted file mode 100644
index ebf2bf56fcf..00000000000
--- a/pkgs/development/interpreters/ruby/ruby22-rand-egd.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
-index e272cba..3a1fa71 100644
---- a/ext/openssl/extconf.rb
-+++ b/ext/openssl/extconf.rb
-@@ -87,6 +87,7 @@
- have_func("PEM_def_callback")
- have_func("PKCS5_PBKDF2_HMAC")
- have_func("PKCS5_PBKDF2_HMAC_SHA1")
-+have_func("RAND_egd")
- have_func("X509V3_set_nconf")
- have_func("X509V3_EXT_nconf_nid")
- have_func("X509_CRL_add0_revoked")
-diff --git a/ext/openssl/ossl_rand.c b/ext/openssl/ossl_rand.c
-index 29cbf8c..27466fe 100644
---- a/ext/openssl/ossl_rand.c
-+++ b/ext/openssl/ossl_rand.c
-@@ -148,6 +148,7 @@ ossl_rand_pseudo_bytes(VALUE self, VALUE len)
-     return str;
- }
- 
-+#ifdef HAVE_RAND_EGD
- /*
-  *  call-seq:
-  *     egd(filename) -> true
-@@ -186,6 +187,7 @@ ossl_rand_egd_bytes(VALUE self, VALUE filename, VALUE len)
-     }
-     return Qtrue;
- }
-+#endif /* HAVE_RAND_EGD */
- 
- /*
-  *  call-seq:
-@@ -219,8 +221,10 @@ Init_ossl_rand(void)
-     rb_define_module_function(mRandom, "write_random_file", ossl_rand_write_file, 1);
-     rb_define_module_function(mRandom, "random_bytes", ossl_rand_bytes, 1);
-     rb_define_module_function(mRandom, "pseudo_bytes", ossl_rand_pseudo_bytes, 1);
-+#ifdef HAVE_RAND_EGD
-     rb_define_module_function(mRandom, "egd", ossl_rand_egd, 1);
-     rb_define_module_function(mRandom, "egd_bytes", ossl_rand_egd_bytes, 2);
-+#endif /* HAVE_RAND_EGD */
-     rb_define_module_function(mRandom, "status?", ossl_rand_status, 0);
- }

From 19180957f5415ef60aebd31a56c03446ae0cdcf7 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 6 Sep 2016 22:12:27 -0700
Subject: [PATCH 107/899] ruby_1_9: remove package

Remove ruby 1.9 since it is EOLed upstream
---
 .../development/interpreters/ruby/default.nix |  8 ------
 .../interpreters/ruby/patchsets.nix           | 26 -------------------
 .../ruby/ruby19-parallel-install.patch        | 15 -----------
 pkgs/top-level/all-packages.nix               |  2 --
 4 files changed, 51 deletions(-)
 delete mode 100644 pkgs/development/interpreters/ruby/ruby19-parallel-install.patch

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index d5f3a6d3990..98be02da3b2 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -180,14 +180,6 @@ let
     ) args; in self;
 
 in {
-  ruby_1_9_3 = generic {
-    version = rubyVersion "1" "9" "3" "p551";
-    sha256 = {
-      src = "1s2ibg3s2iflzdv7rfxi1qqkvdbn2dq8gxdn0nxrb77ls5ffanxv";
-      git = "1r9xzzxmci2ajb34qb4y1w424mz878zdgzxkfp9w60agldxnb36s";
-    };
-  };
-
   ruby_2_0_0 = generic {
     version = rubyVersion "2" "0" "0" "p647";
     sha256 = {
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index a3aeaf6a8ba..f1b82210aec 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -1,32 +1,6 @@
 { patchSet, useRailsExpress, ops, patchLevel }:
 
 rec {
-  "1.9.3" = [
-    ./ssl_v3.patch
-    ./rand-egd.patch
-    ./ruby19-parallel-install.patch
-    ./bitperfect-rdoc.patch
-  ] ++ ops useRailsExpress [
-    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/01-fix-make-clean.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/02-zero-broken-tests.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/03-railsbench-gc.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/04-display-more-detailed-stack-trace.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/05-fork-support-for-gc-logging.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/06-track-live-dataset-size.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/07-webrick_204_304_keep_alive_fix.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/08-export-a-few-more-symbols-for-ruby-prof.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/09-thread-variables.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/10-faster-loading.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/11-falcon-st-opt.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/12-falcon-sparse-array.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/13-falcon-array-queue.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/14-railsbench-gc-fixes.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/15-show-full-backtrace-on-stack-overflow.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/16-configurable-fiber-stack-sizes.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/17-backport-psych-20.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/18-fix-missing-c-return-event.patch"
-    "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/19-fix-process-daemon-call.patch"
-  ];
   "2.0.0" = [
     ./ssl_v3.patch
     ./rand-egd.patch
diff --git a/pkgs/development/interpreters/ruby/ruby19-parallel-install.patch b/pkgs/development/interpreters/ruby/ruby19-parallel-install.patch
deleted file mode 100644
index bb806350873..00000000000
--- a/pkgs/development/interpreters/ruby/ruby19-parallel-install.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: ruby-1.9.3-p392/lib/mkmf.rb
-===================================================================
---- ruby-1.9.3-p392.orig/lib/mkmf.rb
-+++ ruby-1.9.3-p392/lib/mkmf.rb
-@@ -2039,8 +2039,8 @@ static: $(STATIC_LIB)#{$extout ? " insta
-       end
-       for f in files
-         dest = "#{dir}/#{File.basename(f)}"
--        mfile.print("install-rb#{sfx}: #{dest} #{dir}\n")
--        mfile.print("#{dest}: #{f}\n")
-+        mfile.print("install-rb#{sfx}: #{dest}\n")
-+        mfile.print("#{dest}: #{f} #{timestamp_file(dir)}\n")
-         mfile.print("\t$(Q) $(#{$extout ? 'COPY' : 'INSTALL_DATA'}) #{f} $(@D#{sep})\n")
-         if defined?($installed_list) and !$extout
-           mfile.print("\t@echo #{dest}>>$(INSTALLED_LIST)\n")
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ddc6d5062db..af1a6220ecf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5888,7 +5888,6 @@ with pkgs;
   bundlerEnv = callPackage ../development/ruby-modules/bundler-env { };
 
   inherit (callPackage ../development/interpreters/ruby {})
-    ruby_1_9_3
     ruby_2_0_0
     ruby_2_1_10
     ruby_2_2_5
@@ -5897,7 +5896,6 @@ with pkgs;
 
   # Ruby aliases
   ruby = ruby_2_3;
-  ruby_1_9 = ruby_1_9_3;
   ruby_2_0 = ruby_2_0_0;
   ruby_2_1 = ruby_2_1_10;
   ruby_2_2 = ruby_2_2_5;

From 66b6c2ce015eda95d9fe89052880fce52a7632c6 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Wed, 7 Sep 2016 01:24:37 -0700
Subject: [PATCH 108/899] sdformat: mark as broken

sdformat depends on an old version of ruby and needs to be fixed. Until
there is a proper upstream release, mark as broken.

sdformat is only used by the gazebo package.
---
 pkgs/development/libraries/sdformat/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/sdformat/default.nix b/pkgs/development/libraries/sdformat/default.nix
index 692de29afd7..f81eb9b259e 100644
--- a/pkgs/development/libraries/sdformat/default.nix
+++ b/pkgs/development/libraries/sdformat/default.nix
@@ -1,13 +1,10 @@
-{ stdenv, fetchurl, cmake, boost, ruby_1_9, ignition, tinyxml
+{ stdenv, fetchurl, cmake, boost, ruby, ignition, tinyxml
   , name ? "sdformat-${version}"
   , version ? "4.0.0" # versions known to work with this expression include 3.7.0
   , srchash-sha256 ? "b0f94bb40b0d83e35ff250a7916fdfd6df5cdc1e60c47bc53dd2da5e2378163e"
   , ...
   }:
 
-let 
-  ruby = ruby_1_9;
-in
 stdenv.mkDerivation rec {
   src = fetchurl { 
       url = "http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${name}.tar.bz2";
@@ -26,6 +23,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
+    broken = true;
     platforms = stdenv.lib.platforms.unix;
   };
 }

From 97c3ee9525ca3ef60a8a4f89b9415ba88b517df5 Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Mon, 30 Jan 2017 12:38:02 +0100
Subject: [PATCH 109/899] tinc: 1.0.29 -> 1.0.31

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

diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix
index 813290494e2..c025fba4921 100644
--- a/pkgs/tools/networking/tinc/default.nix
+++ b/pkgs/tools/networking/tinc/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, lzo, openssl, zlib}:
 
 stdenv.mkDerivation rec {
-  version = "1.0.29";
+  version = "1.0.31";
   name = "tinc-${version}";
 
   src = fetchurl {
     url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz";
-    sha256 = "0y1alzxgds067m83qdkg12hsy6disa2ad3y2i0h1pgpvdxy02mq3";
+    sha256 = "d3cbc82e6e07975a2ccc0b369d07e30fc3324e71e240dca8781ce9a4f629519b";
   };
 
   buildInputs = [ lzo openssl zlib ];
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     "--sysconfdir=/etc"
   ];
 
-  meta = { 
+  meta = {
     description = "VPN daemon with full mesh routing";
     longDescription = ''
       tinc is a Virtual Private Network (VPN) daemon that uses tunnelling and

From eaa9e01c1d453bb42fc6f91336d01f94cbabb465 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 30 Jan 2017 13:03:48 +0100
Subject: [PATCH 110/899] Revert "binutils: Add lib output"

This reverts commit 17a344a5daebf7796e5b25f45658359b6c0dfda2.
---
 .../tools/misc/binutils/default.nix           |  8 +-------
 .../tools/misc/binutils/no-plugins.patch      | 19 -------------------
 2 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/binutils/no-plugins.patch

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 0214cafb1a7..4c32255e875 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -32,15 +32,9 @@ stdenv.mkDerivation rec {
     # This is needed, for instance, so that running "ldd" on a binary that is
     # PaX-marked to disable mprotect doesn't fail with permission denied.
     ./pt-pax-flags.patch
-
-    # Bfd looks in BINDIR/../lib for some plugins that don't
-    # exist. This is pointless (since users can't install plugins
-    # there) and causes a cycle between the lib and bin outputs, so
-    # get rid of it.
-    ./no-plugins.patch
   ];
 
-  outputs = [ "out" "lib" "info" ] ++ (optional (cross == null) "dev");
+  outputs = [ "out" "info" ] ++ (optional (cross == null) "dev");
 
   nativeBuildInputs = [ bison ];
   buildInputs = [ zlib ];
diff --git a/pkgs/development/tools/misc/binutils/no-plugins.patch b/pkgs/development/tools/misc/binutils/no-plugins.patch
deleted file mode 100644
index 9624b7976b7..00000000000
--- a/pkgs/development/tools/misc/binutils/no-plugins.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ru binutils-2.27-orig/bfd/plugin.c binutils-2.27/bfd/plugin.c
---- binutils-2.27-orig/bfd/plugin.c	2016-10-14 17:46:30.791315555 +0200
-+++ binutils-2.27/bfd/plugin.c	2016-10-14 17:46:38.583298765 +0200
-@@ -333,6 +333,7 @@
-   if (plugin_program_name == NULL)
-     return found;
- 
-+#if 0
-   plugin_dir = concat (BINDIR, "/../lib/bfd-plugins", NULL);
-   p = make_relative_prefix (plugin_program_name,
- 			    BINDIR,
-@@ -364,6 +365,7 @@
-   free (p);
-   if (d)
-     closedir (d);
-+#endif
- 
-   return found;
- }

From 51a753a2a3f5e1f6acedfbb8d31f6c6707bee6be Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Mon, 30 Jan 2017 13:25:07 +0100
Subject: [PATCH 111/899] os-prober: 1.65 -> 1.71

---
 pkgs/tools/misc/os-prober/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix
index 8d2f15734c5..fb62043739c 100644
--- a/pkgs/tools/misc/os-prober/default.nix
+++ b/pkgs/tools/misc/os-prober/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, makeWrapper, 
+{ stdenv, fetchurl, makeWrapper,
 systemd, # udevadm
-busybox, 
+busybox,
 coreutils, # os-prober desn't seem to work with pure busybox
 devicemapper, # lvs
 # optional dependencies
@@ -11,11 +11,11 @@ ntfs3g ? null
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.65";
+  version = "1.71";
   name = "os-prober-${version}";
   src = fetchurl {
     url = "mirror://debian/pool/main/o/os-prober/os-prober_${version}.tar.xz";
-    sha256 = "c4a7661a52edae722f7e6bacb3f107cf7086cbe768275fadf5398d04360bfc84";
+    sha256 = "5d6141e02b58e82194422b97d683d61c7ff78175d89c2f055f5d2e7a363bdd20";
   };
 
   buildInputs = [ makeWrapper ];

From db896154d1fae2476be750bdcee5f4f889518479 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 30 Jan 2017 14:08:54 +0100
Subject: [PATCH 112/899] binutils: minimize rebuilds after parent revert

Only revert the addition of the output and only on Darwin.
---
 .../tools/misc/binutils/default.nix           | 11 ++++++++++-
 .../tools/misc/binutils/no-plugins.patch      | 19 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/misc/binutils/no-plugins.patch

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 4c32255e875..e61acd598cf 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -32,9 +32,18 @@ stdenv.mkDerivation rec {
     # This is needed, for instance, so that running "ldd" on a binary that is
     # PaX-marked to disable mprotect doesn't fail with permission denied.
     ./pt-pax-flags.patch
+
+    # Bfd looks in BINDIR/../lib for some plugins that don't
+    # exist. This is pointless (since users can't install plugins
+    # there) and causes a cycle between the lib and bin outputs, so
+    # get rid of it.
+    ./no-plugins.patch
   ];
 
-  outputs = [ "out" "info" ] ++ (optional (cross == null) "dev");
+  outputs = [ "out" ]
+    ++ optional (!stdenv.isDarwin) "lib" # problems in Darwin stdenv
+    ++ [ "info" ]
+    ++ optional (cross == null) "dev";
 
   nativeBuildInputs = [ bison ];
   buildInputs = [ zlib ];
diff --git a/pkgs/development/tools/misc/binutils/no-plugins.patch b/pkgs/development/tools/misc/binutils/no-plugins.patch
new file mode 100644
index 00000000000..9624b7976b7
--- /dev/null
+++ b/pkgs/development/tools/misc/binutils/no-plugins.patch
@@ -0,0 +1,19 @@
+diff -ru binutils-2.27-orig/bfd/plugin.c binutils-2.27/bfd/plugin.c
+--- binutils-2.27-orig/bfd/plugin.c	2016-10-14 17:46:30.791315555 +0200
++++ binutils-2.27/bfd/plugin.c	2016-10-14 17:46:38.583298765 +0200
+@@ -333,6 +333,7 @@
+   if (plugin_program_name == NULL)
+     return found;
+ 
++#if 0
+   plugin_dir = concat (BINDIR, "/../lib/bfd-plugins", NULL);
+   p = make_relative_prefix (plugin_program_name,
+ 			    BINDIR,
+@@ -364,6 +365,7 @@
+   free (p);
+   if (d)
+     closedir (d);
++#endif
+ 
+   return found;
+ }

From cc07ec890d0e7b31d7154f1bce6d3ba19aae5a1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 30 Jan 2017 15:23:34 +0100
Subject: [PATCH 113/899] protobuf-3.x: fixup build with default gcc version

/cc @globin a3a0e8fe6.
http://hydra.nixos.org/build/47266085
---
 pkgs/development/libraries/protobuf/generic-v3.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix
index 315608bf2b4..39cf0a1741d 100644
--- a/pkgs/development/libraries/protobuf/generic-v3.nix
+++ b/pkgs/development/libraries/protobuf/generic-v3.nix
@@ -34,7 +34,9 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  NIX_CFLAGS_COMPILE = "-Wno-error=misleading-indentation";
+  NIX_CFLAGS_COMPILE = with stdenv.lib;
+    # gcc before 6 doesn't know this option
+    optionalString (hasPrefix "gcc-6" stdenv.cc.cc) "-Wno-error=misleading-indentation";
 
   meta = {
     description = "Google's data interchange format";

From 7f7faab0097d8b77b00a88c4749ff9b086efde33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 30 Jan 2017 16:09:45 +0100
Subject: [PATCH 114/899] knot-dns: yet another attempt to fix build on Darwin

---
 pkgs/servers/dns/knot-dns/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index b2d40c51cb1..834d9a09b5b 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnutls, jansson, liburcu, lmdb, libcap_ng, libidn
-, systemd, nettle, libedit, zlib
+, systemd, nettle, libedit, zlib, libiconv
 }:
 
 # Note: ATM only the libraries have been tested in nixpkgs.
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gnutls jansson liburcu libidn
     nettle libedit
+    libiconv
     # without sphinx &al. for developer documentation
   ]
     # Use embedded lmdb there for now, as detection is broken on Darwin somehow.

From 89150d3377c8851e7a17e8fd5ed693301c0bce47 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 30 Jan 2017 16:30:06 +0100
Subject: [PATCH 115/899] theme-vertex: 20161009 -> 20170128

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

diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix
index fe48bb14d40..5db712f818e 100644
--- a/pkgs/misc/themes/vertex/default.nix
+++ b/pkgs/misc/themes/vertex/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "theme-vertex";
-  version = "20161009";
+  version = "20170128";
 
   src = fetchFromGitHub {
     owner = "horst3180";
     repo = "vertex-theme";
-    rev = "c861918a7fccf6d0768d45d790a19a13bb23485e";
-    sha256 = "13abgl18m04sj44gqipxbagpan4jqral65w59rgnhb6ldxgnhg33";
+    rev = version;
+    sha256 = "0c9mhrs95ahz37djrv176vn41ywvj26ilwmnr1h9171giv6hid98";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From c603d2c0d5a9246601b8113a90f3fa9679138c86 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 30 Jan 2017 16:33:42 +0100
Subject: [PATCH 116/899] svtplay-dl: 1.9 -> 1.9.1

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

diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index 8eaad3b5201..eb7c89a382b 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -5,13 +5,13 @@ let
   inherit (pythonPackages) python nose pycrypto requests2 mock;
 in stdenv.mkDerivation rec {
   name = "svtplay-dl-${version}";
-  version = "1.9";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "spaam";
     repo = "svtplay-dl";
     rev = version;
-    sha256 = "0kqly2jzpn1l26is65nhaq0xdvsjylh7wm12fw9r1wz1558pqswf";
+    sha256 = "1xnafj87rp12b7mikvyi3b77vrrhnkjav9gn20fj9yi5p070vkf1";
   };
 
   pythonPaths = [ pycrypto requests2 ];

From b8fec2384e9cfe168710e319914ee5be28307270 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 30 Jan 2017 15:50:59 +0000
Subject: [PATCH 117/899] boto: upgrade 2.42.0 to 2.45.0

(cherry picked from commit 5fff5a902594b34471b613eb2babcec923e1e1f1)
---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c9d8475baf8..3d75849a720 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2994,11 +2994,11 @@ in {
 
   boto = buildPythonPackage rec {
     name = "boto-${version}";
-    version = "2.42.0";
+    version = "2.45.0";
 
     src = pkgs.fetchurl {
       url = "https://github.com/boto/boto/archive/${version}.tar.gz";
-      sha256 = "04ywn8xszk57s87jnkv4j1hswc6ra7z811y9lawfvhvnfshrpx5d";
+      sha256 = "18z5nacnbdpw3pmzc56didhy4sfik8riap204px24350g9xlgz7i";
     };
 
     checkPhase = ''

From d6a7182493aeba5f0a60ccde60929520ad055cd3 Mon Sep 17 00:00:00 2001
From: Alistair Bill <alistair.bill@gmail.com>
Date: Mon, 30 Jan 2017 16:12:42 +0000
Subject: [PATCH 118/899] neofetch: 3.0 -> 3.0.1

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

diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix
index 92a2f589b30..2ecaae6a33f 100644
--- a/pkgs/tools/misc/neofetch/default.nix
+++ b/pkgs/tools/misc/neofetch/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "neofetch-${version}";
-  version = "3.0";
+  version = "3.0.1";
   src = fetchFromGitHub {
     owner = "dylanaraps";
     repo = "neofetch";
     rev = version;
-    sha256 = "0z8sqbspf6j7yqy7wbd8ba3pfn836b0y8kmgkcyvswgjkcyh8m68";
+    sha256 = "0ccdgyn9m7vbrmjlsxdwv7cagsdg8hy8x4n1mx334pkqvl820jjn";
   };
 
   patchPhase = ''

From 69348badb8658df11b48c54b2f3e028a883b311c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 30 Jan 2017 18:27:44 +0100
Subject: [PATCH 119/899] doc vim: nitpicks

---
 doc/languages-frameworks/vim.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/languages-frameworks/vim.md b/doc/languages-frameworks/vim.md
index d0bcf92a54f..5442d706cb0 100644
--- a/doc/languages-frameworks/vim.md
+++ b/doc/languages-frameworks/vim.md
@@ -1,15 +1,15 @@
 ---
 title: User's Guide for Vim in Nixpkgs
-author: Peter Simons
+author: Marc Weber
 date: 2016-06-25
 ---
 # User's Guide to Vim Plugins/Addons/Bundles/Scripts in Nixpkgs
 
 You'll get a vim(-your-suffix) in PATH also loading the plugins you want.
-Loading can be deferred, see example
+Loading can be deferred; see examples.
 
 VAM (=vim-addon-manager) and Pathogen plugin managers are supported.
-Vundle,NeoBundle could be your turn.
+Vundle, NeoBundle could be your turn.
 
 ## dependencies by Vim plugins
 

From 612333a7703e22df98dd6b3d9cd99bdeaac4f808 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 30 Jan 2017 20:07:44 +0100
Subject: [PATCH 120/899] knot-resolver: yet another attempt to fix build on
 Darwin

---
 pkgs/servers/dns/knot-resolver/default.nix | 5 ++---
 pkgs/top-level/all-packages.nix            | 5 ++++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 3c84d0942e7..1e7dbaf8e2f 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, utillinux, vimNox, which
+{ stdenv, fetchurl, pkgconfig, utillinux, hexdump, which
 , knot-dns, luajit, libuv, lmdb
 , cmocka, systemd, hiredis, libmemcached
 , gnutls, nettle
@@ -21,8 +21,7 @@ stdenv.mkDerivation rec {
 
   configurePhase = ":";
 
-  nativeBuildInputs = [ pkgconfig which makeWrapper ]
-    ++ [(if stdenv.isLinux then utillinux.bin/*hexdump*/ else vimNox/*xxd*/)];
+  nativeBuildInputs = [ pkgconfig which makeWrapper hexdump ];
 
   buildInputs = [ knot-dns luajit libuv gnutls ]
     # TODO: lmdb needs lmdb.pc; embedded for now
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af1a6220ecf..cb76372b097 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10321,7 +10321,10 @@ with pkgs;
   jetty = callPackage ../servers/http/jetty { };
 
   knot-dns = callPackage ../servers/dns/knot-dns { };
-  knot-resolver = callPackage ../servers/dns/knot-resolver { };
+  knot-resolver = callPackage ../servers/dns/knot-resolver {
+    # TODO: vimNox after it gets fixed on Darwin or something lighter
+    hexdump = if stdenv.isLinux then utillinux.bin else vim/*xxd*/;
+  };
 
   rdkafka = callPackage ../development/libraries/rdkafka { };
 

From d70c26df0981f9ce27defd26c68a769b6f9666db Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Mon, 30 Jan 2017 20:20:11 +0100
Subject: [PATCH 121/899] emby: 3.0.8500 -> 3.1.5

Notable changes:
* mono46 is now required by emby
* switch back to pre-built binaries due to problems building from source
* sqlite path is now configured in SQLitePCLRaw.provider.sqlite3.dll.config
---
 pkgs/servers/emby/default.nix | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index 3813baa6420..9fc0a303ad0 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -1,33 +1,36 @@
-{ stdenv, fetchurl, pkgs, makeWrapper, mono, ffmpeg, ... }:
+{ stdenv, fetchurl, pkgs, unzip, sqlite, makeWrapper, mono46, ffmpeg, ... }:
 
 stdenv.mkDerivation rec {
   name = "emby-${version}";
-  version = "3.0.8500";
+  version = "3.1.5";
 
   src = fetchurl {
-    url = "https://github.com/MediaBrowser/Emby/archive/${version}.tar.gz";
-    sha256 = "0vm2yvwyhswsp31g48qdzm17c4p7c25vyiy1029hgy8nd5qy4shc";
+    url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
+    sha256 = "0s0m456rxdrj58zbaby6mdgc1ndc3zx2c07n94hn3hdlgralgwaa";
   };
 
   buildInputs = with pkgs; [
+    unzip
     makeWrapper
   ];
   propagatedBuildInputs = with pkgs; [
-    mono
+    mono46
     sqlite
   ];
 
+  # Need to set sourceRoot as unpacker will complain about multiple directory output
+  sourceRoot = ".";
+
   buildPhase = ''
-    xbuild /p:Configuration="Release Mono" /p:Platform="Any CPU" /t:build MediaBrowser.Mono.sln
-    substituteInPlace MediaBrowser.Server.Mono/bin/Release\ Mono/System.Data.SQLite.dll.config --replace libsqlite3.so ${pkgs.sqlite.out}/lib/libsqlite3.so
-    substituteInPlace MediaBrowser.Server.Mono/bin/Release\ Mono/MediaBrowser.Server.Mono.exe.config --replace ProgramData-Server "/var/lib/emby/ProgramData-Server"
+    substituteInPlace SQLitePCLRaw.provider.sqlite3.dll.config --replace libsqlite3.so ${sqlite.out}/lib/libsqlite3.so
+    substituteInPlace MediaBrowser.Server.Mono.exe.config --replace ProgramData-Server "/var/lib/emby/ProgramData-Server"
   '';
 
   installPhase = ''
     mkdir -p $out/bin
-    cp -r MediaBrowser.Server.Mono/bin/Release\ Mono/* $out/bin/
+    cp -r * $out/bin
 
-    makeWrapper "${mono}/bin/mono" $out/bin/MediaBrowser.Server.Mono \
+    makeWrapper "${mono46}/bin/mono" $out/bin/MediaBrowser.Server.Mono \
       --add-flags "$out/bin/MediaBrowser.Server.Mono.exe -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe"
   '';
 

From e8df68673ccc05ca617369a667cc0c1738444512 Mon Sep 17 00:00:00 2001
From: Pradeep Chhetri <pradeep.chhetri89@gmail.com>
Date: Tue, 31 Jan 2017 00:56:27 +0530
Subject: [PATCH 122/899] nomad: 0.4.1 -> 0.5.3

---
 pkgs/applications/networking/cluster/nomad/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index fdb8e09d6a5..b5137c47845 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "nomad-${version}";
-  version = "0.4.1";
+  version = "0.5.3";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/nomad";
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "hashicorp";
     repo = "nomad";
     inherit rev;
-    sha256 = "093nljhibphhccjwxkylbvlc8dh8g2js36mlxxdh9nh21b3mghcs";
+    sha256 = "06s4irjz7k5qp895hvwv68xmr6mdq8bv91vhgh6rmx58my8jb68b";
   };
 
   meta = with stdenv.lib; {

From b08524bf01723a23f17d24487b6b528c603127fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 30 Jan 2017 20:31:03 +0100
Subject: [PATCH 123/899] nixos: nylon, use named instances

---
 nixos/modules/services/networking/nylon.nix | 74 ++++++++++++++-------
 1 file changed, 51 insertions(+), 23 deletions(-)

diff --git a/nixos/modules/services/networking/nylon.nix b/nixos/modules/services/networking/nylon.nix
index da6487dbd49..4864ecf3f92 100644
--- a/nixos/modules/services/networking/nylon.nix
+++ b/nixos/modules/services/networking/nylon.nix
@@ -8,7 +8,7 @@ let
 
   homeDir = "/var/lib/nylon";
 
-  configFile = pkgs.writeText "nylon.conf" ''
+  configFile = cfg: pkgs.writeText "nylon-${cfg.name}.conf" ''
     [General]
     No-Simultaneous-Conn=${toString cfg.nrConnections}
     Log=${if cfg.logging then "1" else "0"}
@@ -22,15 +22,9 @@ let
     Deny-IP=${concatStringsSep " " cfg.deniedIPRanges}
   '';
 
-in
+  nylonOpts = { name, config, ... }: {
 
-{
-
-  ###### interface
-
-  options = {
-
-    services.nylon = {
+    options = {
 
       enable = mkOption {
         type = types.bool;
@@ -40,6 +34,12 @@ in
         '';
       };
 
+      name = mkOption {
+        type = types.str;
+        default = "";
+        description = "The name of this nylon instance.";
+      };
+
       nrConnections = mkOption {
         type = types.int;
         default = 10;
@@ -107,13 +107,51 @@ in
         '';
       };
     };
+    config = { name = mkDefault name; };
+  };
+
+  mkNamedNylon = cfg: {
+    "nylon-${cfg.name}" = {
+      description = "Nylon, a lightweight SOCKS proxy server";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig =
+      {
+        User = "nylon";
+        Group = "nylon";
+        WorkingDirectory = homeDir;
+        ExecStart = "${pkgs.nylon}/bin/nylon -f -c ${configFile cfg}";
+      };
+    };
+  };
+
+  anyNylons = collect (p: p ? enable) cfg;
+  enabledNylons = filter (p: p.enable == true) anyNylons;
+  nylonUnits = map (nylon: mkNamedNylon nylon) enabledNylons;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.nylon = mkOption {
+      default = {};
+      description = "Collection of named nylon instances";
+      type = with types; loaOf (submodule nylonOpts);
+      internal = true;
+      options = [ nylonOpts ];
+    };
+
   };
 
   ###### implementation
 
-  config = mkIf cfg.enable {
+  config = mkIf (length(enabledNylons) > 0) {
 
-    users.extraUsers.nylon= {
+    users.extraUsers.nylon = {
       group = "nylon";
       description = "Nylon SOCKS Proxy";
       home = homeDir;
@@ -123,17 +161,7 @@ in
 
     users.extraGroups.nylon.gid = config.ids.gids.nylon;
 
-    systemd.services.nylon = {
-      description = "Nylon, a lightweight SOCKS proxy server";
-      after = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig =
-      {
-        User = "nylon";
-        Group = "nylon";
-        WorkingDirectory = homeDir;
-        ExecStart = "${pkgs.nylon}/bin/nylon -f -c ${configFile}";
-      };
-    };
+    systemd.services = fold (a: b: a // b) {} nylonUnits;
+
   };
 }

From c6c2137a9cd5e757ee6fdd00dce1f975dff62736 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 30 Jan 2017 21:15:56 +0100
Subject: [PATCH 124/899] pythonPackages.hypothesis: 3.5.2 -> 3.6.0

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

diff --git a/pkgs/development/python-modules/hypothesis.nix b/pkgs/development/python-modules/hypothesis.nix
new file mode 100644
index 00000000000..f313f6ab5c4
--- /dev/null
+++ b/pkgs/development/python-modules/hypothesis.nix
@@ -0,0 +1,38 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, python
+, isPy27, enum34
+, doCheck ? true, pytest, flake8, flaky
+}:
+buildPythonPackage rec {
+  # http://hypothesis.readthedocs.org/en/latest/packaging.html
+
+  # Hypothesis has optional dependencies on the following libraries
+  # pytz fake_factory django numpy pytest
+  # If you need these, you can just add them to your environment.
+
+  name = "hypothesis-${version}";
+  version = "3.6.0";
+
+  # Upstream prefers github tarballs
+  src = fetchFromGitHub {
+    owner = "HypothesisWorks";
+    repo = "hypothesis";
+    rev = "${version}";
+    sha256 = "0a3r4c8sr9jn7sv419vdzrzfc9sp7zf105f1lgyiwyzi3cgyvcvg";
+  };
+
+  buildInputs = stdenv.lib.optionals doCheck [ pytest flake8 flaky ];
+  propagatedBuildInputs = stdenv.lib.optionals isPy27 [ enum34 ];
+
+  inherit doCheck;
+
+  # https://github.com/DRMacIver/hypothesis/issues/300
+  checkPhase = ''
+    ${python.interpreter} -m pytest tests/cover
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A Python library for property based testing";
+    homepage = https://github.com/DRMacIver/hypothesis;
+    license = licenses.mpl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8d54eef393a..03d03d6f8dc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12548,41 +12548,7 @@ in {
     propagatedBuildInputs = with self; [ requests2 ];
   };
 
-  hypothesis = buildPythonPackage rec {
-    # http://hypothesis.readthedocs.org/en/latest/packaging.html
-
-    # Hypothesis has optional dependencies on the following libraries
-    # pytz fake_factory django numpy pytest
-    # If you need these, you can just add them to your environment.
-
-    name = "hypothesis-${version}";
-    version = "3.5.2";
-
-    # Upstream prefers github tarballs
-    src = pkgs.fetchFromGitHub {
-      owner = "HypothesisWorks";
-      repo = "hypothesis";
-      rev = "${version}";
-      sha256 = "030rf4gn4b0hylr90wazilwa3bc038fcqng0wibcx67mqaq035n4";
-    };
-
-    buildInputs = with self; [ flake8 pytest flaky ];
-    propagatedBuildInputs = with self; ([ uncompyle6 ] ++ optionals isPy27 [ enum34  ]);
-
-    # Fails randomly in tests/cover/test_conjecture_engine.py::test_interleaving_engines.
-    doCheck = false;
-
-    # https://github.com/DRMacIver/hypothesis/issues/300
-    checkPhase = ''
-      ${python.interpreter} -m pytest tests/cover
-    '';
-
-    meta = {
-      description = "A Python library for property based testing";
-      homepage = https://github.com/DRMacIver/hypothesis;
-      license = licenses.mpl20;
-    };
-  };
+  hypothesis = callPackage ../development/python-modules/hypothesis.nix { };
 
   colored = buildPythonPackage rec {
     name = "colored-${version}";

From e07f1f2066ba045690d9373a39049874430cec27 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 30 Jan 2017 21:38:37 +0100
Subject: [PATCH 125/899] gitlab: 8.16.1 -> 8.16.3

---
 pkgs/applications/version-management/gitlab/Gemfile      | 2 +-
 pkgs/applications/version-management/gitlab/Gemfile.lock | 2 +-
 pkgs/applications/version-management/gitlab/default.nix  | 4 ++--
 pkgs/applications/version-management/gitlab/gemset.nix   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile
index 0e80d9f233e..6d6564ea5f9 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile
+++ b/pkgs/applications/version-management/gitlab/Gemfile
@@ -322,7 +322,7 @@ group :test do
   gem 'email_spec', '~> 1.6.0'
   gem 'json-schema', '~> 2.6.2'
   gem 'webmock', '~> 1.21.0'
-  gem 'test_after_commit', '~> 0.4.2'
+  gem 'test_after_commit', '~> 1.1'
   gem 'sham_rack', '~> 1.3.6'
   gem 'timecop', '~> 0.8.0'
 end
diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock
index ca1e2ed25c3..80cdf9d3258 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/Gemfile.lock
@@ -762,7 +762,7 @@ GEM
     teaspoon-jasmine (2.2.0)
       teaspoon (>= 1.0.0)
     temple (0.7.7)
-    test_after_commit (0.4.2)
+    test_after_commit (1.1.0)
       activerecord (>= 3.2)
     thin (1.7.0)
       daemons (~> 1.0, >= 1.0.9)
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 2840b06ecf5..a2b08e43617 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -22,7 +22,7 @@ in
 
 stdenv.mkDerivation rec {
   name = "gitlab-${version}";
-  version = "8.16.1";
+  version = "8.16.3";
 
   buildInputs = [ env ruby bundler tzdata git nodejs procps ];
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     owner = "gitlabhq";
     repo = "gitlabhq";
     rev = "v${version}";
-    sha256 = "0c6cf8p1xx21xxmlpldhxs0i01myd4ddpjl7vfv932qmw9bw4in7";
+    sha256 = "0fdm92w97ggnpiqlpr5aia6x8j09v8id7n6pks134hq3pkdiz6mv";
   };
 
   patches = [
diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix
index 21ab6d324dd..1ebb7c5b1fa 100644
--- a/pkgs/applications/version-management/gitlab/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gemset.nix
@@ -2579,10 +2579,10 @@
   test_after_commit = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fzg8qan6f0n0ynr594bld2k0rwwxj99yzhiga2f3pkj9ina1abb";
+      sha256 = "0s8pz00xq28lsa1rfczm83yqwk8wcb5dqw2imlj8gldnsdapcyc2";
       type = "gem";
     };
-    version = "0.4.2";
+    version = "1.1.0";
   };
   thin = {
     source = {

From 1a45ddeb2d5a8802c34659d99ad9ae8e19c73641 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 30 Jan 2017 21:39:08 +0100
Subject: [PATCH 126/899] yotubeDL: 2017.01.28 -> 2017.01.29

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 061f64ce982..6ea9baf216b 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -15,11 +15,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2017.01.28";
+  version = "2017.01.29";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "16dyci631i6dgy1ia9vg69wk5zn8f1zd7bjwhw6adacrcx2nb89w";
+    sha256 = "0visxc4rb6kw4hjcgcv5llis08z0syhian1m5hr1fdbz4w73hx9l";
   };
 
   buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;

From f6e2772cd303e71125f47872a2998aba2d70aa4c Mon Sep 17 00:00:00 2001
From: Adrian Pistol <vifino@tty.sh>
Date: Mon, 30 Jan 2017 20:42:16 +0000
Subject: [PATCH 127/899] wmutils-opt: init at v1.0

---
 lib/maintainers.nix                    |  1 +
 pkgs/tools/X11/wmutils-opt/default.nix | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 3 files changed, 28 insertions(+)
 create mode 100644 pkgs/tools/X11/wmutils-opt/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index cd9ced5832f..298afcbc161 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -495,6 +495,7 @@
   vcunat = "Vladimír Čunát <vcunat@gmail.com>";
   vdemeester = "Vincent Demeester <vincent@sbr.pm>";
   veprbl = "Dmitry Kalinkin <veprbl@gmail.com>";
+  vifino = "Adrian Pistol <vifino@tty.sh>";
   viric = "Lluís Batlle i Rossell <viric@viric.name>";
   vizanto = "Danny Wilson <danny@prime.vc>";
   vklquevs = "vklquevs <vklquevs@gmail.com>";
diff --git a/pkgs/tools/X11/wmutils-opt/default.nix b/pkgs/tools/X11/wmutils-opt/default.nix
new file mode 100644
index 00000000000..c01aa8dc75f
--- /dev/null
+++ b/pkgs/tools/X11/wmutils-opt/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, libxcb }:
+
+stdenv.mkDerivation rec {
+  name = "wmutils-opt-${version}";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "wmutils";
+    repo = "opt";
+    rev = "v${version}";
+    sha256 = "0gd05qsir1lnzfrbnfh08qwsryz7arwj20f886nqh41m87yqaljz";
+  };
+
+  buildInputs = [ libxcb ];
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "Optional addons to wmutils";
+    homepage = https://github.com/wmutils/opt;
+    license = licenses.isc;
+    maintainers = with maintainers; [ vifino ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b587b4fd43..e20c9860e43 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17879,6 +17879,8 @@ with pkgs;
 
   wmutils-core = callPackage ../tools/X11/wmutils-core { };
 
+  wmutils-opt = callPackage ../tools/X11/wmutils-opt { };
+
   wraith = callPackage ../applications/networking/irc/wraith { };
 
   wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { };

From 7bd49cded42b2675833ff66ed8f6784c54c636cd Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 30 Jan 2017 22:43:54 +0100
Subject: [PATCH 128/899] khd: 1.1.4 -> 2.0.0

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

diff --git a/pkgs/os-specific/darwin/khd/default.nix b/pkgs/os-specific/darwin/khd/default.nix
index f08073a8901..0e5d466e16a 100644
--- a/pkgs/os-specific/darwin/khd/default.nix
+++ b/pkgs/os-specific/darwin/khd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "khd-${version}";
-  version = "1.1.4";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "koekeishiya";
     repo = "khd";
     rev = "v${version}";
-    sha256 = "1klia3fywl0c88zbp5wdn6kxhdwdry1jwmkj27vpv8vzvdfzwfmy";
+    sha256 = "02v2bq095h1ylx700kayakg7f9p43vrz6p9ry3g7lq37s6apgm8h";
   };
 
   buildInputs = [ Carbon Cocoa ];

From 54b27890f8713eda00a6494eb0b7311e0e5701b8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 28 Jan 2017 23:04:28 +0300
Subject: [PATCH 129/899] wayland: fix configure flags' type

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

diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index e644b5728ed..836a4527b50 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "d6b4135cba0188abcb7275513c72dede751d6194f6edc5b82183a3ba8b821ab1";
   };
 
-  configureFlags = "--with-scanner --disable-documentation";
+  configureFlags = [ "--with-scanner" "--disable-documentation" ];
 
   nativeBuildInputs = [ pkgconfig ];
 

From 37e2c5378f9057ebd2a429a5be21f69dddc0c871 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 29 Jan 2017 20:06:28 +0300
Subject: [PATCH 130/899] ejabberd: 16.09 -> 17.01

---
 pkgs/servers/xmpp/ejabberd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index 5f850a09ded..b898abc9778 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@@ -23,12 +23,12 @@ let
   ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ];
 
 in stdenv.mkDerivation rec {
-  version = "16.09";
+  version = "17.01";
   name = "ejabberd-${version}";
 
   src = fetchurl {
     url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz";
-    sha256 = "054gzf4df466a6pyh4w476hxald6637nayy44hvaf31iycxani3v";
+    sha256 = "02y9f1zxqvqrhapfay3avkys0llpyjsag6rpz5vfig01zqjqzyky";
   };
 
   nativeBuildInputs = [ fakegit ];
@@ -74,7 +74,7 @@ in stdenv.mkDerivation rec {
 
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash = "12dj1k5pfxc5rw4qjzqf3848190i559h3f9s1dwzpfpkdgjd38vf";
+    outputHash = "0flybfhq6qv1ihsjfg9p7191bffip7gpizg29wdbf1x6qgxhpz5r";
   };
 
   configureFlags =

From 0cfefc7c99e242a676023dc09c42427e045ee883 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 29 Jan 2017 20:07:35 +0300
Subject: [PATCH 131/899] grub4dos: 0.4.6a-2016-11-09 -> 0.4.6a-2016-12-24

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

diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix
index fabefb81031..d9e4ae3a638 100644
--- a/pkgs/tools/misc/grub4dos/default.nix
+++ b/pkgs/tools/misc/grub4dos/default.nix
@@ -6,13 +6,13 @@ let arch =
   else abort "Unknown architecture";
 in stdenv.mkDerivation rec {
   name = "grub4dos-${version}";
-  version = "0.4.6a-2016-11-09";
+  version = "0.4.6a-2016-12-24";
 
   src = fetchFromGitHub {
     owner = "chenall";
     repo = "grub4dos";
-    rev = "4cdcd3c1aa4907e7775aa8816ca9cf0175b78bcd";
-    sha256 = "17y5wsiqcb2qk1vr8n1wlhcsj668735hj8l759n8aiydw408bl55";
+    rev = "ca0371bb1e2365bfe4e44031a3b8b59e8c58ce0d";
+    sha256 = "0a9m7n5la3dmbfx6n5iqlfbm607r1mww0wkimn29mlsc30d8aamr";
   };
 
   nativeBuildInputs = [ nasm ];

From 8371d736cfd23a78d16fd50ecf70d8852235d267 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 29 Jan 2017 20:07:47 +0300
Subject: [PATCH 132/899] thermald: fix identation

---
 pkgs/tools/system/thermald/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix
index d5936b00806..ddd6740c983 100644
--- a/pkgs/tools/system/thermald/default.nix
+++ b/pkgs/tools/system/thermald/default.nix
@@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
   patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am'';
 
   preConfigure = ''
-                   export PKG_CONFIG_PATH="${dbus_libs.dev}/lib/pkgconfig:$PKG_CONFIG_PATH"
-                   ./autogen.sh #--prefix="$out"
-                 '';
+    export PKG_CONFIG_PATH="${dbus_libs.dev}/lib/pkgconfig:$PKG_CONFIG_PATH"
+    ./autogen.sh
+  '';
 
   configureFlags = [
     "--sysconfdir=$(out)/etc" "--localstatedir=/var"
@@ -26,8 +26,6 @@ stdenv.mkDerivation rec {
     "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
     ];
 
-  preInstall = "sysconfdir=$out/etc";
-
   meta = with stdenv.lib; {
     description = "Thermal Daemon";
     homepage = "https://01.org/linux-thermal-daemon";

From 82d9c2e3fb09bac2c3e577485b9ec1103112b98c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 29 Jan 2017 20:01:07 +0300
Subject: [PATCH 133/899] krita: 3.0.1.1 -> 3.1.1

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

diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index fded09545e1..af6d3e492c4 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   name = "krita-${version}";
-  version = "3.0.1.1";
+  version = "3.1.1";
 
   src = fetchurl {
     url = "http://download.kde.org/stable/krita/${version}/${name}.tar.gz";
-    sha256 = "0v58p9am2gsrgn5nhynvdg1a7v8d9kcsswb1962r8ijszm3fav5k";
+    sha256 = "13qff9kdd38x81rq6yfmkm3083l8s0yn9h3d5qg3qmhrkd5jrvv2";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules makeQtWrapper ];

From 20b8212a1489f5377114d69c480774f23791d1f6 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 29 Jan 2017 20:07:55 +0300
Subject: [PATCH 134/899] pythonPackages.chainmap: init at 1.0.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a44156b2b8d..010cdd3127e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1149,6 +1149,25 @@ in {
     };
   };
 
+  chainmap = buildPythonPackage rec {
+    name = "chainmap-1.0.2";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/c/chainmap/${name}.tar.gz";
+      sha256 = "09h5gq43w516fqswlca0nhmd2q3v8hxq15z4wqrznfwix6ya6pa0";
+    };
+
+    # Requires tox
+    doCheck = false;
+
+    meta = {
+      description = "Backport/clone of ChainMap";
+      homepage = "https://bitbucket.org/jeunice/chainmap";
+      license = licenses.psfl;
+      maintainers = with maintainers; [ abbradar ];
+    };
+  };
+
   arrow = buildPythonPackage rec {
     name = "arrow-${version}";
     version = "0.7.0";

From 84ee358735a0a5a360ede485c28ec4bf0ae60512 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 29 Jan 2017 20:08:02 +0300
Subject: [PATCH 135/899] pythonPackages.scandir: init at 1.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 010cdd3127e..60d9a1334dc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9651,6 +9651,23 @@ in {
     };
   };
 
+  scandir = self.buildPythonPackage rec {
+    name = "scandir-${version}";
+    version = "1.4";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/s/scandir/${name}.tar.gz";
+      sha256 = "0yjrgp0mxp3d8bjkq2m1ac2ys8n76wykksvgyjrnil9gr3fx7a5d";
+    };
+
+    meta = with stdenv.lib; {
+      description = "A better directory iterator and faster os.walk()";
+      homepage = "https://github.com/benhoyt/scandir";
+      license = licenses.gpl3;
+      maintainers = with maintainers; [ abbradar ];
+    };
+  };
+
   scfbuild = self.buildPythonPackage rec {
     name = "scfbuild-${version}";
     version = "1.0.3";

From d19b83e32b064f351bb72bd1e787ee045b53ec01 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 29 Jan 2017 20:02:09 +0300
Subject: [PATCH 136/899] octoprint: 1.2.17 -> 1.3.1

Bundled dependencies:
tornado: 4.0.1 -> 4.0.2
flask_login: 0.4.0 -> 0.2.2
---
 pkgs/applications/misc/octoprint/default.nix | 51 ++++++++++++++------
 1 file changed, 36 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index aecea732a23..9e287bf6fd5 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -2,15 +2,15 @@
 
 let
 
-  tornado_4_0_1 = pythonPackages.buildPythonPackage rec {
+  tornado_4_0_2 = pythonPackages.buildPythonPackage rec {
     name = "tornado-${version}";
-    version = "4.0.1";
+    version = "4.0.2";
 
     propagatedBuildInputs = with pythonPackages; [ backports_ssl_match_hostname_3_4_0_2 certifi ];
 
     src = fetchurl {
       url = "mirror://pypi/t/tornado/${name}.tar.gz";
-      sha256 = "00crp5vnasxg7qyjv89qgssb69vd7qr13jfghdryrcbnn9l8c1df";
+      sha256 = "1yhvn8i05lp3b1953majg48i8pqsyj45h34aiv59hrfvxcj5234h";
     };
   };
 
@@ -24,34 +24,53 @@ let
     };
 
     # This is needed for compatibility with OctoPrint
-    propagatedBuildInputs = [ tornado_4_0_1 ];
+    propagatedBuildInputs = [ tornado_4_0_2 ];
+  };
 
-    meta = with stdenv.lib; {
-      description = "SockJS python server implementation on top of Tornado framework";
-      homepage = "http://github.com/mrjoes/sockjs-tornado/";
-      license = licenses.mit;
-      platforms = platforms.all;
-      maintainers = with maintainers; [ abbradar ];
+  websocket_client = pythonPackages.buildPythonPackage rec {
+    name = "websocket_client-0.32.0";
+
+    src = fetchurl {
+      url = "mirror://pypi/w/websocket-client/${name}.tar.gz";
+      sha256 = "cb3ab95617ed2098d24723e3ad04ed06c4fde661400b96daa1859af965bfe040";
     };
+
+    propagatedBuildInputs = with pythonPackages; [ six backports_ssl_match_hostname_3_4_0_2 unittest2 argparse ];
+  };
+
+  flask_login = pythonPackages.buildPythonPackage rec {
+    name = "Flask-Login-${version}";
+    version = "0.2.2";
+
+    src = fetchurl {
+      url = "mirror://pypi/F/Flask-Login/${name}.tar.gz";
+      sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p";
+    };
+
+    propagatedBuildInputs = with pythonPackages; [ flask ];
+
+    # FIXME
+    doCheck = false;
   };
 
 in pythonPackages.buildPythonApplication rec {
   name = "OctoPrint-${version}";
-  version = "1.2.17";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "foosel";
     repo = "OctoPrint";
     rev = version;
-    sha256 = "1di2f5npwsfckx5p2fl23bl5zi75i0aksd9qy4sa3zmw672337fh";
+    sha256 = "1av755agyym1k5ig9av0q9ysf26ldfixz82x73v3g47a1m28pxq9";
   };
 
   # We need old Tornado
   propagatedBuildInputs = with pythonPackages; [
     awesome-slugify flask_assets rsa requests2 pkginfo watchdog
-    semantic-version flask_principal werkzeug flaskbabel tornado_4_0_1
+    semantic-version flask_principal werkzeug flaskbabel tornado_4_0_2
     psutil pyserial flask_login netaddr markdown sockjs-tornado
-    pylru pyyaml sarge feedparser netifaces
+    pylru pyyaml sarge feedparser netifaces click websocket_client
+    scandir chainmap future
   ];
 
   # Jailbreak dependencies.
@@ -67,10 +86,12 @@ in pythonPackages.buildPythonApplication rec {
       -e 's,Flask-Principal>=[^"]*,Flask-Principal,g' \
       -e 's,markdown>=[^"]*,markdown,g' \
       -e 's,Flask-Assets>=[^"]*,Flask-Assets,g' \
-      -e 's,Flask-Login>=[^"]*,Flask-Login,g' \
       -e 's,rsa>=[^"]*,rsa,g' \
       -e 's,PyYAML>=[^"]*,PyYAML,g' \
       -e 's,flask>=[^"]*,flask,g' \
+      -e 's,Click>=[^"]*,Click,g' \
+      -e 's,websocket-client>=[^"]*,websocket-client,g' \
+      -e 's,scandir>=[^"]*,scandir,g' \
       setup.py
   '';
 

From e89f6e3a7c1d4fd81791980c0c7abfe662fbf99c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 29 Jan 2017 20:03:38 +0300
Subject: [PATCH 137/899] octoprint-plugins.m33-fio: 1.11 -> 1.17

---
 .../misc/octoprint/m33-fio-one-library.patch  | 40 +++++++++----------
 pkgs/applications/misc/octoprint/plugins.nix  |  6 +--
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch b/pkgs/applications/misc/octoprint/m33-fio-one-library.patch
index cbfb6111ec5..87b00f3ab70 100644
--- a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch
+++ b/pkgs/applications/misc/octoprint/m33-fio-one-library.patch
@@ -1,4 +1,4 @@
-From c84b2130dab0d26be35294d023ed8f4be404c3c1 Mon Sep 17 00:00:00 2001
+From 0defcf6ec155899c414f66524b7df629f59327f0 Mon Sep 17 00:00:00 2001
 From: Nikolay Amiantov <ab@fmap.me>
 Date: Wed, 23 Nov 2016 00:40:48 +0300
 Subject: [PATCH] Build and use one version of preprocessor library
@@ -9,10 +9,10 @@ Subject: [PATCH] Build and use one version of preprocessor library
  2 files changed, 6 insertions(+), 123 deletions(-)
 
 diff --git a/octoprint_m33fio/__init__.py b/octoprint_m33fio/__init__.py
-index f9f84c4..b365024 100755
+index 4b43c59..d1259e4 100755
 --- a/octoprint_m33fio/__init__.py
 +++ b/octoprint_m33fio/__init__.py
-@@ -1061,71 +1061,8 @@ class M33FioPlugin(
+@@ -1062,71 +1062,8 @@ class M33FioPlugin(
  		# Check if using shared library or checking if it is usable
  		if self._settings.get_boolean(["UseSharedLibrary"]) or isUsable :
  	
@@ -23,19 +23,19 @@ index f9f84c4..b365024 100755
 -				if platform.uname()[4].startswith("armv6l") and self.getCpuHardware() == "BCM2708" :
 -	
 -					# Set shared library
--					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm1176jzf-s.so")
+-					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_arm1176jzf-s.so")
 -	
 -				# Otherwise check if running on a Raspberry Pi 2 or Raspberry Pi 3
 -				elif platform.uname()[4].startswith("armv7l") and self.getCpuHardware() == "BCM2709" :
 -	
 -					# Set shared library
--					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm_cortex-a7.so")
+-					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_arm_cortex-a7.so")
 -	
 -				# Otherwise check if running on an ARM7 device
 -				elif platform.uname()[4].startswith("armv7") :
 -	
 -					# Set shared library
--					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm7.so")
+-					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_arm7.so")
 -	
 -				# Otherwise check if using an i386 or x86-64 device
 -				elif platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64") :
@@ -44,13 +44,13 @@ index f9f84c4..b365024 100755
 -					if platform.architecture()[0].startswith("32") :
 -		
 -						# Set shared library
--						self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.so")
+-						self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_i386.so")
 -	
 -					# Otherwise check if Python is running as 64-bit
 -					elif platform.architecture()[0].startswith("64") :
 -		
 -						# Set shared library
--						self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.so")
+-						self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.so")
 -
 -			# Otherwise check if running on Windows and using an i386 or x86-64 device
 -			elif platform.uname()[0].startswith("Windows") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) :
@@ -59,39 +59,39 @@ index f9f84c4..b365024 100755
 -				if platform.architecture()[0].startswith("32") :
 -	
 -					# Set shared library
--					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.dll")
+-					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_i386.dll")
 -
 -				# Otherwise check if Python is running as 64-bit
 -				elif platform.architecture()[0].startswith("64") :
 -	
 -					# Set shared library
--					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.dll")
+-					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.dll")
 -
--			# Otherwise check if running on OS X and using an i386 or x86-64 device
+-			# Otherwise check if running on macOS and using an i386 or x86-64 device
 -			elif platform.uname()[0].startswith("Darwin") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) :
 -
 -				# Check if Python is running as 32-bit
 -				if platform.architecture()[0].startswith("32") :
 -	
 -					# Set shared library
--					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.dylib")
+-					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_i386.dylib")
 -
 -				# Otherwise check if Python is running as 64-bit
 -				elif platform.architecture()[0].startswith("64") :
 -	
 -					# Set shared library
--					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.dylib")
-+                        # Set shared library
-+                        self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so")
+-					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.dylib")
++			# Set shared library
++			self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so")
  
  			# Check if shared library was set
  			if self.sharedLibrary :
 diff --git a/shared library source/Makefile b/shared library source/Makefile
-index 887899b..4c74f5c 100755
+index 792b4f4..4c74f5c 100755
 --- a/shared library source/Makefile	
 +++ b/shared library source/Makefile	
 @@ -1,68 +1,14 @@
--# Target platform options: LINUX32, LINUX64, WINDOWS32, WINDOWS64, PI, PI2, ARM7, OSX32, OSX64
+-# Target platform options: LINUX32, LINUX64, WINDOWS32, WINDOWS64, PI, PI2, ARM7, MACOS32, MACOS64
 -LIBRARY_NAME = preprocessor
 -TARGET_PLATFORM = LINUX64
 +LIBRARY_NAME = libpreprocessor
@@ -139,14 +139,14 @@ index 887899b..4c74f5c 100755
 -	CFLAGS = -fPIC -mcpu=generic-armv7-a -mfpu=vfp -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++
 -endif
 -
--ifeq ($(TARGET_PLATFORM), OSX32)
+-ifeq ($(TARGET_PLATFORM), MACOS32)
 -	PROG = $(LIBRARY_NAME)_i386.dylib
 -	CC = clang++
 -	CFLAGS = -fPIC -m32 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER)
 -
 -endif
 -
--ifeq ($(TARGET_PLATFORM), OSX64)
+-ifeq ($(TARGET_PLATFORM), MACOS64)
 -	PROG = $(LIBRARY_NAME)_x86-64.dylib
 -	CC = clang++
 -	CFLAGS = -fPIC -m64 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER)
@@ -164,5 +164,5 @@ index 887899b..4c74f5c 100755
  clean:
  	rm -f ../octoprint_m33fio/static/libraries/$(PROG)
 -- 
-2.10.2
+2.11.0
 
diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index 8f015245763..2f894514c51 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -12,13 +12,13 @@ let
 
     m33-fio = buildPlugin rec {
       name = "M33-Fio-${version}";
-      version = "1.11";
+      version = "1.17";
 
       src = fetchFromGitHub {
         owner = "donovan6000";
         repo = "M33-Fio";
         rev = "V${version}";
-        sha256 = "11nbsi93clrqlnmaj73ak87hkqyghybccqz5jzhn2dhp0263adhl";
+        sha256 = "19r860hqax09a79s9bl181ab7jsgx0pa8fvnr62lbgkwhis7m8mh";
       };
 
       patches = [
@@ -34,7 +34,7 @@ let
       '';
 
       meta = with stdenv.lib; {
-        homepage = "https://github.com/donovan6000/M3D-Fio";
+        homepage = "https://github.com/donovan6000/M33-Fio";
         description = "OctoPrint plugin for the Micro 3D printer";
         platforms = platforms.all;
         license = licenses.gpl3;

From 7b1cbd0dcbdefc2d0741ff85e804b73fcb48f4e1 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 29 Jan 2017 20:03:45 +0300
Subject: [PATCH 138/899] slade: 3.1.1.4 -> 3.1.1.5

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

diff --git a/pkgs/applications/misc/slade/default.nix b/pkgs/applications/misc/slade/default.nix
index b50c2f18690..3bb97463e5d 100644
--- a/pkgs/applications/misc/slade/default.nix
+++ b/pkgs/applications/misc/slade/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "slade-${version}";
-  version = "3.1.1.4";
+  version = "3.1.1.5";
 
   src = fetchFromGitHub {
     owner = "sirjuddington";
     repo = "SLADE";
     rev = version;
-    sha256 = "0c2yjkpcwxkid1wczmc9f16x1p40my8jv61jc93ldgjzcprmrpn8";
+    sha256 = "0mdn59jm6ab4cdh99bgvadif3wdlqmk5mq635gg7krq35njgw6f6";
   };
 
   nativeBuildInputs = [ cmake pkgconfig zip ];

From e734f044abd0e6846ebda58f46813c9ec02ce898 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 29 Jan 2017 20:03:56 +0300
Subject: [PATCH 139/899] tdesktop: 1.0.0 -> 1.0.2

---
 .../instant-messengers/telegram/tdesktop/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 16956782a24..67d86571b88 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -19,14 +19,14 @@ let
 
 in stdenv.mkDerivation rec {
   name = "telegram-desktop-${version}";
-  version = "1.0.0";
+  version = "1.0.2";
   qtVersion = lib.replaceStrings ["."] ["_"] packagedQt;
 
   src = fetchFromGitHub {
     owner = "telegramdesktop";
     repo = "tdesktop";
     rev = "v${version}";
-    sha256 = "1qxzi82cgd8klk6rn83rzrmik0s76alarfaknknww5iw5px7gi8b";
+    sha256 = "1pakxzs28v794x9mm7pb2m0phkfrwq19shz8a6lfyidb6ng85hy2";
   };
 
   tgaur = fetchgit {

From db9989281779d9e67565093488512970b2ca307e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 29 Jan 2017 20:04:12 +0300
Subject: [PATCH 140/899] treewide: quote homepages in my packages

---
 pkgs/applications/video/bomi/default.nix          | 2 +-
 pkgs/development/interpreters/spidermonkey/38.nix | 2 +-
 pkgs/games/dwarf-fortress/game.nix                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix
index 841fe299430..c98e2747989 100644
--- a/pkgs/applications/video/bomi/default.nix
+++ b/pkgs/applications/video/bomi/default.nix
@@ -110,7 +110,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Powerful and easy-to-use multimedia player";
-    homepage = https://bomi-player.github.io/;
+    homepage = "https://bomi-player.github.io/";
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.abbradar ];
     platforms = platforms.linux;
diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix
index b4823817d4b..e2a4ad2e302 100644
--- a/pkgs/development/interpreters/spidermonkey/38.nix
+++ b/pkgs/development/interpreters/spidermonkey/38.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Mozilla's JavaScript engine written in C/C++";
-    homepage = https://developer.mozilla.org/en/SpiderMonkey;
+    homepage = "https://developer.mozilla.org/en/SpiderMonkey";
     # TODO: MPL/GPL/LGPL tri-license.
 
     maintainers = [ maintainers.abbradar ];
diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix
index 740125bf442..cb56969578e 100644
--- a/pkgs/games/dwarf-fortress/game.nix
+++ b/pkgs/games/dwarf-fortress/game.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "A single-player fantasy game with a randomly generated adventure world";
-    homepage = http://www.bay12games.com/dwarves;
+    homepage = "http://www.bay12games.com/dwarves";
     license = licenses.unfreeRedistributable;
     platforms = platforms.linux;
     maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar ];

From f5f8d59f44b155892b4d485bb5d82e32093a024b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 29 Jan 2017 20:04:38 +0300
Subject: [PATCH 141/899] folly: 2016.11.21.00 -> 2016.12.19.00

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

diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 1e070ca2599..1e8d7ce543f 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "folly-${version}";
-  version = "2016.11.21.00";
+  version = "2016.12.19.00";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "folly";
     rev = "v${version}";
-    sha256 = "1f7j73avj00mmzz8wyh9rl1k9i0cvk77d0nf9c80vzr2zfk9f31x";
+    sha256 = "1q5nh84sxkdi4x0gwr0x7bgk33pq6071vxz5vnjkznwywhgw2hnn";
   };
 
   nativeBuildInputs = [ autoreconfHook python pkgconfig ];

From e778f8032c21387a109b3e3472b2dfa4225abddc Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 29 Jan 2017 20:04:49 +0300
Subject: [PATCH 142/899] crawl: 0.19.1 -> 0.19.3

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

diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix
index dc84b18547b..b6259c033af 100644
--- a/pkgs/games/crawl/default.nix
+++ b/pkgs/games/crawl/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "crawl-${version}${lib.optionalString tileMode "-tiles"}";
-  version = "0.19.1";
+  version = "0.19.3";
 
   src = fetchFromGitHub {
     owner = "crawl-ref";
     repo = "crawl-ref";
     rev = version;
-    sha256 = "02iklz5q5h7h27gw86ws8wk5gz1fg86jclkar05nd7zxxgiwsk96";
+    sha256 = "1qn6r5pg568pk8zgp2ijn04h4brvw675q4nxkkvzyf76ljbpzif7";
   };
 
   patches = [ ./crawl_purify.patch ];

From 1809cb56e12fe0f00d030585907d9fa9ab1b3aa7 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 29 Jan 2017 20:05:10 +0300
Subject: [PATCH 143/899] dwarf-fortress-packages.dfhack: 0.43.05-alpha2 ->
 0.43.05-alpha4

---
 pkgs/games/dwarf-fortress/dfhack/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index 74dddbe8df9..ce935512178 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -7,12 +7,12 @@ let
   dfVersion = "0.43.05";
   # version = "${dfVersion}-r1";
   # rev = "refs/tags/${version}";
-  version = "${dfVersion}-alpha2";
-  rev = "13eb5e702beb6d8e40c0e17be64cda9a8d9d1efb";
-  sha256 = "18i8qfhhfnfrpa519akwagn73q2zns1pry2sdfag63vffxh60zr5";
+  version = "${dfVersion}-alpha4";
+  rev = "refs/tags/${version}";
+  sha256 = "0wnwdapw955k69ds5xh5qsh7h0l547wjxgcy8hkvly6wp5c16sls";
 
   # revision of library/xml submodule
-  xmlRev = "84f6e968a9ec5515f9dbef96b445e3fc83f83e8b";
+  xmlRev = "bb4228f58b1601c4868c95be6763f5ff2e5d0a08";
 
   arch =
     if stdenv.system == "x86_64-linux" then "64"

From 5fb5914c35a57147d9539229975459479c765cd7 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 29 Jan 2017 20:05:33 +0300
Subject: [PATCH 144/899] ioquake3: 2016-11-02 -> 2017-01-27

---
 pkgs/games/quake3/ioquake/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix
index 81077d9461f..734f9daa970 100644
--- a/pkgs/games/quake3/ioquake/default.nix
+++ b/pkgs/games/quake3/ioquake/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "ioquake3-git-${version}";
-  version = "2016-11-02";
+  version = "2017-01-27";
 
   src = fetchFromGitHub {
     owner = "ioquake";
     repo = "ioq3";
-    rev = "1c1e1f61f180596c925a4ac0eddba4806d1369cd";
-    sha256 = "1sx78hzvcbc05g2ikxcmnm6lq7bhgd86dzxnfzqpibcvgrlgsmy1";
+    rev = "468da0fabca2f21b811a501c184b986e270c5113";
+    sha256 = "14mhkqn6h2mbmz90j4ns1wp72ca5w9481sbyw2ving8xpw376i58";
   };
 
   nativeBuildInputs = [ which pkgconfig ];

From 98b0195dde0c2dad83759e314affc2d085d839cc Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 31 Jan 2017 03:35:31 +0300
Subject: [PATCH 145/899] video services: don't install OpenCL files to /etc

They shouldn't be needed now that we search them in /run/opengl-driver.
---
 nixos/modules/hardware/video/amdgpu-pro.nix | 3 ---
 nixos/modules/hardware/video/nvidia.nix     | 2 --
 2 files changed, 5 deletions(-)

diff --git a/nixos/modules/hardware/video/amdgpu-pro.nix b/nixos/modules/hardware/video/amdgpu-pro.nix
index 979810abf90..06a405ee057 100644
--- a/nixos/modules/hardware/video/amdgpu-pro.nix
+++ b/nixos/modules/hardware/video/amdgpu-pro.nix
@@ -44,9 +44,6 @@ in
       "amd/amdrc".source = package + "/etc/amd/amdrc";
       "amd/amdapfxx.blb".source = package + "/etc/amd/amdapfxx.blb";
       "gbm/gbm.conf".source = package + "/etc/gbm/gbm.conf";
-      "OpenCL/vendors/amdocl64.icd".source = package + "/etc/OpenCL/vendors/amdocl64.icd";
-    } // optionalAttrs opengl.driSupport32Bit {
-      "OpenCL/vendors/amdocl32.icd".source = package32 + "/etc/OpenCL/vendors/amdocl32.icd";
     };
 
   };
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 8514f765e61..b604d645132 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -62,8 +62,6 @@ in
 
     services.acpid.enable = true;
 
-    environment.etc."OpenCL/vendors/nvidia.icd".source = "${nvidia_x11}/lib/vendors/nvidia.icd";
-
   };
 
 }

From 8d379ddfef1e7bcf123d8b0092f9924bf5232c07 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 31 Jan 2017 04:20:07 +0300
Subject: [PATCH 146/899] opengl service: use option for XDG_DATA_DIRS

---
 nixos/modules/hardware/opengl.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix
index 5e38a988096..486fe7c1cd8 100644
--- a/nixos/modules/hardware/opengl.nix
+++ b/nixos/modules/hardware/opengl.nix
@@ -133,13 +133,10 @@ in
       '';
 
     environment.sessionVariables.LD_LIBRARY_PATH =
-      [ "/run/opengl-driver/lib" "/run/opengl-driver-32/lib" ];
+      [ "/run/opengl-driver/lib" ] ++ optional cfg.driSupport32Bit "/run/opengl-driver-32/lib";
 
-    environment.extraInit = ''
-      export XDG_DATA_DIRS=$XDG_DATA_DIRS:/run/opengl-driver/share
-    '' + optionalString cfg.driSupport32Bit ''
-      export XDG_DATA_DIRS=$XDG_DATA_DIRS:/run/opengl-driver-32/share
-    '';
+    environment.variables.XDG_DATA_DIRS =
+      [ "/run/opengl-driver/share" ] ++ optional cfg.driSupport32Bit "/run/opengl-driver-32/share";
 
     hardware.opengl.package = mkDefault (makePackage pkgs);
     hardware.opengl.package32 = mkDefault (makePackage pkgs_i686);

From dbd4a35060b242839ba4d41e9bb743365faef8ce Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Sun, 29 Jan 2017 17:15:34 -0800
Subject: [PATCH 147/899] vulkan-loader: 1.0.26.0 -> 1.0.39.1

---
 .../development/compilers/glslang/default.nix |   6 +-
 .../compilers/glslang/install-headers.patch   |  25 +-
 .../libraries/vulkan-loader/default.nix       |  26 +-
 .../vulkan-loader/use-xdg-paths.patch         | 388 +++++++++++++-----
 .../development/tools/spirv-tools/default.nix |  10 +-
 5 files changed, 318 insertions(+), 137 deletions(-)

diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix
index cd03c246624..d2384598456 100644
--- a/pkgs/development/compilers/glslang/default.nix
+++ b/pkgs/development/compilers/glslang/default.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "glslang-git-${version}";
-  version = "2016-08-26";
+  version = "2016-12-21";
 
   # `vulkan-loader` requires a specific version of `glslang` as specified in
   # `<vulkan-loader-repo>/glslang_revision`.
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "glslang";
-    rev = "81cd764b5ffc475bc73f1fb35f75fd1171bb2343";
-    sha256 = "1vfwl6lzkjh9nh29q32b7zca4q1abf3q4nqkahskijgznw5lr59g";
+    rev = "807a0d9e2f4e176f75d62ac3c179c81800ec2608";
+    sha256 = "02jckgihqhagm73glipb4c6ri5fr3pnbxb5vrznn2vppyfdfghbj";
   };
 
   patches = [ ./install-headers.patch ];
diff --git a/pkgs/development/compilers/glslang/install-headers.patch b/pkgs/development/compilers/glslang/install-headers.patch
index 9ad6f5e1906..75f27130978 100644
--- a/pkgs/development/compilers/glslang/install-headers.patch
+++ b/pkgs/development/compilers/glslang/install-headers.patch
@@ -1,21 +1,30 @@
 diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
-index 48a6c46..593d941 100755
+index c538e84..6ece1ab 100755
 --- a/SPIRV/CMakeLists.txt
 +++ b/SPIRV/CMakeLists.txt
-@@ -42,3 +42,8 @@ endif(WIN32)
+@@ -34,8 +34,9 @@ if(ENABLE_AMD_EXTENSIONS)
+ endif(ENABLE_AMD_EXTENSIONS)
+ 
+ if(ENABLE_NV_EXTENSIONS)
+-    set(HEADERS
+-        GLSL.ext.NV.h)
++    list(APPEND
++         HEADERS
++         GLSL.ext.NV.h)
+ endif(ENABLE_NV_EXTENSIONS)
+ 
+ add_library(SPIRV STATIC ${SOURCES} ${HEADERS})
+@@ -51,3 +52,5 @@ endif(WIN32)
  
  install(TARGETS SPIRV SPVRemapper
          ARCHIVE DESTINATION lib)
 +
-+foreach(file ${HEADERS} ${SPVREMAP_HEADERS})
-+    get_filename_component(dir ${file} DIRECTORY)
-+    install(FILES ${file} DESTINATION include/SPIRV/${dir})
-+endforeach()
++install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION include/SPIRV/)
 diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
-index ff91135..4318279 100644
+index 95d4bdd..e7fda90 100644
 --- a/glslang/CMakeLists.txt
 +++ b/glslang/CMakeLists.txt
-@@ -90,3 +90,8 @@ endif(WIN32)
+@@ -93,3 +93,8 @@ endif(WIN32)
  
  install(TARGETS glslang 
          ARCHIVE DESTINATION lib)
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
index 731bd81cb6f..46994a495eb 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -1,13 +1,14 @@
 { stdenv, fetchgit, fetchFromGitHub, cmake, pkgconfig, git, python3,
-  python3Packages, glslang, spirv-tools, x11, libxcb, wayland }:
+  python3Packages, glslang, spirv-tools, x11, libxcb, libXrandr,
+  libXext, wayland }:
 
 let
-  version = "1.0.26.0";
+  version = "1.0.39.1";
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-LoaderAndValidationLayers";
     rev = "sdk-${version}";
-    sha256 = "157m746hc76xrxd3qq0f44f5dy7pjbz8cx74ykqrlbc7rmpjpk58";
+    sha256 = "0y9zzrnjjjza2kkf5jfsdqhn98md6rsq0hb7jg62z2dipzky7zdp";
   };
 in
 
@@ -15,23 +16,13 @@ stdenv.mkDerivation rec {
   name = "vulkan-loader-${version}";
   inherit version src;
 
-  prePatch = ''
-    if [ "$(cat '${src}/spirv-tools_revision')" != '${spirv-tools.src.rev}' ] \
-      || [ "$(cat '${src}/spirv-headers_revision')" != '${spirv-tools.headers.rev}' ] \
-      || [ "$(cat '${src}/glslang_revision')" != '${glslang.src.rev}' ]
-    then
-      echo "Version mismatch, aborting!"
-      false
-    fi
-  '';
-
   buildInputs = [ cmake pkgconfig git python3 python3Packages.lxml
-                  glslang spirv-tools x11 libxcb wayland
+                  glslang spirv-tools x11 libxcb libXrandr libXext wayland
                 ];
   enableParallelBuilding = true;
 
   cmakeFlags = [
-    "-DBUILD_WSI_WAYLAND_SUPPORT=ON" # XLIB/XCB supported by default
+    "-DBUILD_WSI_MIR_SUPPORT=OFF"
   ];
 
   patches = [ ./use-xdg-paths.patch ];
@@ -40,7 +31,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     checkRev() {
-      [ "$2" = $(cat "$1_revision") ] || (echo "ERROR: dependency $1 is revision $2 but should be revision" $(cat "$1_revision") && exit 1)
+      [ "$2" = $(cat "external_revisions/$1_revision") ] || (echo "ERROR: dependency $1 is revision $2 but should be revision" $(cat "external_revisions/$1_revision") && exit 1)
     }
     checkRev spirv-tools "${spirv-tools.src.rev}"
     checkRev spirv-headers "${spirv-tools.headers.rev}"
@@ -58,7 +49,8 @@ stdenv.mkDerivation rec {
     mkdir -p $dev/include
     cp -rv ../include $dev/
     mkdir -p $demos/bin
-    cp demos/smoketest demos/tri demos/cube demos/*.spv demos/*.ppm $demos/bin
+    cp demos/*.spv demos/*.ppm $demos/bin
+    find demos -type f -executable -not -name vulkaninfo -exec cp {} $demos/bin \;
    '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch b/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch
index 1ae0f20889f..eb7869cd73c 100644
--- a/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch
+++ b/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch
@@ -1,142 +1,322 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 27ab6e5..e59256e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -256,17 +256,10 @@ if(NOT WIN32)
+     include(GNUInstallDirs)
+ 
+     add_definitions(-DSYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}")
+-    add_definitions(-DDATADIR="${CMAKE_INSTALL_FULL_DATADIR}")
+-
+     # Make sure /etc is searched by the loader
+-    if (NOT (CMAKE_INSTALL_FULL_SYSCONFDIR STREQUAL "/etc"))
++    if(NOT (CMAKE_INSTALL_FULL_SYSCONFDIR STREQUAL "/etc"))
+         add_definitions(-DEXTRASYSCONFDIR="/etc")
+     endif()
+-
+-    # Make sure /usr/share is searched by the loader
+-    if (NOT (CMAKE_INSTALL_FULL_DATADIR STREQUAL "/usr/share"))
+-        add_definitions(-DEXTRADATADIR="/usr/share")
+-    endif()
+ endif()
+ 
+ if(UNIX)
 diff --git a/loader/loader.c b/loader/loader.c
-index a950ea1..9462d05 100644
+index 24758f4..af7cc85 100644
 --- a/loader/loader.c
 +++ b/loader/loader.c
-@@ -2671,6 +2671,94 @@ static VkResult loader_get_manifest_files(
-         }
+@@ -2909,7 +2909,7 @@ static VkResult
+ loader_get_manifest_files(const struct loader_instance *inst,
+                           const char *env_override, const char *source_override,
+                           bool is_layer, bool warn_if_not_present,
+-                          const char *location, const char *home_location,
++                          const char *location, const char *relative_location,
+                           struct loader_manifest_files *out_files) {
+     const char * override = NULL;
+     char *override_getenv = NULL;
+@@ -2941,9 +2941,9 @@ loader_get_manifest_files(const struct loader_instance *inst,
      }
  
+ #if !defined(_WIN32)
+-    if (location == NULL && home_location == NULL) {
++    if (location == NULL && relative_location == NULL) {
+ #else
+-    home_location = NULL;
++    relative_location = NULL;
+     if (location == NULL) {
+ #endif
+         loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0,
+@@ -2962,16 +2962,89 @@ loader_get_manifest_files(const struct loader_instance *inst,
+     // Make a copy of the input we are using so it is not modified
+     // Also handle getting the location(s) from registry on Windows
+     if (override == NULL) {
+-        loc = loader_stack_alloc(strlen(location) + 1);
++        size_t loc_size = strlen(location) + 1;
 +#if !defined(_WIN32)
-+    if (home_location && override == NULL) {
-+        char *xdgconfdirs = secure_getenv("XDG_CONFIG_DIRS");
-+        char *xdgdatadirs = secure_getenv("XDG_DATA_DIRS");
-+        char *cur, *src = loc;
-+        size_t src_size = strlen(src), rel_size = strlen(home_location);
-+        size_t size = 0;
-+
-+        if (src_size > 0)
-+            size += src_size + 1;
-+
-+        if (xdgconfdirs == NULL)
++        const char *xdgconfdirs = secure_getenv("XDG_CONFIG_DIRS");
++        const char *xdgdatadirs = secure_getenv("XDG_DATA_DIRS");
++        if (xdgconfdirs == NULL || xdgconfdirs[0] == '\0')
 +            xdgconfdirs = "/etc/xdg";
-+        if (xdgdatadirs == NULL)
++        if (xdgdatadirs == NULL || xdgdatadirs[0] == '\0')
 +            xdgdatadirs = "/usr/local/share:/usr/share";
-+
-+        for (char *x = xdgconfdirs; *x; ++x)
-+            if (*x == PATH_SEPERATOR) size += rel_size;
-+        size += strlen(xdgconfdirs) + rel_size + 1;
-+        for (char *x = xdgdatadirs; *x; ++x)
-+            if (*x == PATH_SEPERATOR) size += rel_size;
-+        size += strlen(xdgdatadirs) + rel_size + 1;
-+
-+#if defined(LOCALPREFIX)
-+        size += strlen(LOCALPREFIX "/" SYSCONFDIR) + rel_size + 1;
-+        size += strlen(LOCALPREFIX "/" DATADIR) + rel_size + 1;
++        const size_t rel_size = strlen(relative_location);
++        // Leave space for trailing separators
++        loc_size += strlen(xdgconfdirs) + strlen(xdgdatadirs) + 2*rel_size + 2;
++        for (const char *x = xdgconfdirs; *x; ++x)
++            if (*x == PATH_SEPARATOR) loc_size += rel_size;
++        for (const char *x = xdgdatadirs; *x; ++x)
++            if (*x == PATH_SEPARATOR) loc_size += rel_size;
++        loc_size += strlen(SYSCONFDIR) + rel_size + 1;
++#ifdef EXTRASYSCONFDIR
++        loc_size += strlen(EXTRASYSCONFDIR) + rel_size + 1;
 +#endif
++#endif
++        loc = loader_stack_alloc(loc_size);
+         if (loc == NULL) {
+             loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0,
+                        "loader_get_manifest_files: Failed to allocate "
+                        "%d bytes for manifest file location.",
+-                       strlen(location));
++                       loc_size);
+             res = VK_ERROR_OUT_OF_HOST_MEMORY;
+             goto out;
+         }
+-        strcpy(loc, location);
++        char *loc_write = loc;
++#if !defined(_WIN32)
++        const char *loc_read;
 +
-+        loc = cur = loader_stack_alloc(size);
-+        if (cur == NULL) {
-+            loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0,
-+                        "Out of memory can't get manifest files");
-+            res = VK_ERROR_OUT_OF_HOST_MEMORY;
-+            goto out;
-+        }
-+
-+        if (src_size > 0) {
-+          memcpy(cur, src, src_size);
-+          cur += src_size;
-+          *cur++ = PATH_SEPERATOR;
-+        }
-+
-+        src = xdgconfdirs;
-+        for (char *x = src;; ++x) {
-+            if (*x == PATH_SEPERATOR || *x == 0) {
-+                size_t s = x - src;
-+                memcpy(cur, src, s); cur += s;
-+                memcpy(cur, home_location, rel_size); cur += rel_size;
-+                *cur++ = PATH_SEPERATOR;
++        loc_read = &xdgconfdirs[0];
++        for (const char *x = loc_read;; ++x) {
++            if (*x == PATH_SEPARATOR || *x == '\0') {
++                const size_t s = x - loc_read;
++                memcpy(loc_write, loc_read, s);
++                loc_write += s;
++                memcpy(loc_write, relative_location, rel_size);
++                loc_write += rel_size;
++                *loc_write++ = PATH_SEPARATOR;
 +                if (*x == 0)
 +                    break;
-+                src = ++x;
++                loc_read = ++x;
 +            }
 +        }
 +
-+#if defined(LOCALPREFIX)
-+        strcpy(cur, LOCALPREFIX "/" SYSCONFDIR);
-+        cur += strlen(cur);
-+        memcpy(cur, home_location, rel_size); cur += rel_size;
-+        *cur++ = PATH_SEPERATOR;
++        memcpy(loc_write, SYSCONFDIR, strlen(SYSCONFDIR));
++        loc_write += strlen(SYSCONFDIR);
++        memcpy(loc_write, relative_location, rel_size);
++        loc_write += rel_size;
++        *loc_write++ = PATH_SEPARATOR;
++
++#ifdef EXTRASYSCONFDIR
++        memcpy(loc_write, EXTRASYSCONFDIR, strlen(EXTRASYSCONFDIR));
++        loc_write += strlen(EXTRASYSCONFDIR);
++        memcpy(loc_write, relative_location, rel_size);
++        loc_write += rel_size;
++        *loc_write++ = PATH_SEPARATOR;
 +#endif
 +
-+        src = xdgdatadirs;
-+        for (char *x = src;; ++x) {
-+            if (*x == PATH_SEPERATOR || *x == 0) {
-+                size_t s = x - src;
-+                memcpy(cur, src, s); cur += s;
-+                memcpy(cur, home_location, rel_size); cur += rel_size;
-+                *cur++ = PATH_SEPERATOR;
++        loc_read = &xdgdatadirs[0];
++        for (const char *x = loc_read;; ++x) {
++            if (*x == PATH_SEPARATOR || *x == '\0') {
++                const size_t s = x - loc_read;
++                memcpy(loc_write, loc_read, s);
++                loc_write += s;
++                memcpy(loc_write, relative_location, rel_size);
++                loc_write += rel_size;
++                *loc_write++ = PATH_SEPARATOR;
 +                if (*x == 0)
 +                    break;
-+                src = ++x;
++                loc_read = ++x;
 +            }
 +        }
-+
-+#if defined(LOCALPREFIX)
-+        strcpy(cur, LOCALPREFIX "/" DATADIR);
-+        cur += strlen(cur);
-+        memcpy(cur, home_location, rel_size); cur += rel_size;
-+        *cur++ = PATH_SEPERATOR;
++        --loc_write;
++        *loc_write = '\0';
++#else
++        memcpy(loc_write, location, loc_size);
++        loc[loc_size-1] = '\0';
 +#endif
 +
-+        loc[size - 1] = 0;
-+        assert(cur == loc + size);
-+        list_is_dirs = true;
-+    }
-+#endif
-+
-     // Print out the paths being searched if debugging is enabled
-     loader_log(inst, VK_DEBUG_REPORT_DEBUG_BIT_EXT, 0,
-                "Searching the following paths for manifest files: %s\n", loc);
+ #if defined(_WIN32)
+         VkResult reg_result = loaderGetRegistryFiles(inst, loc, &reg);
+         if (VK_SUCCESS != reg_result || NULL == reg) {
+@@ -3122,14 +3195,14 @@ loader_get_manifest_files(const struct loader_instance *inst,
+         }
+         file = next_file;
+ #if !defined(_WIN32)
+-        if (home_location != NULL &&
++        if (relative_location != NULL &&
+             (next_file == NULL || *next_file == '\0') && override == NULL) {
+             char *xdgdatahome = secure_getenv("XDG_DATA_HOME");
+             size_t len;
+             if (xdgdatahome != NULL) {
+ 
+                 char *home_loc = loader_stack_alloc(strlen(xdgdatahome) + 2 +
+-                                                    strlen(home_location));
++                                                    strlen(relative_location));
+                 if (home_loc == NULL) {
+                     loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0,
+                                "loader_get_manifest_files: Failed to allocate "
+@@ -3139,15 +3212,15 @@ loader_get_manifest_files(const struct loader_instance *inst,
+                 }
+                 strcpy(home_loc, xdgdatahome);
+                 // Add directory separator if needed
+-                if (home_location[0] != DIRECTORY_SYMBOL) {
++                if (relative_location[0] != DIRECTORY_SYMBOL) {
+                     len = strlen(home_loc);
+                     home_loc[len] = DIRECTORY_SYMBOL;
+                     home_loc[len + 1] = '\0';
+                 }
+-                strcat(home_loc, home_location);
++                strcat(home_loc, relative_location);
+                 file = home_loc;
+                 next_file = loader_get_next_path(file);
+-                home_location = NULL;
++                relative_location = NULL;
+ 
+                 loader_log(
+                     inst, VK_DEBUG_REPORT_DEBUG_BIT_EXT, 0,
+@@ -3160,7 +3233,7 @@ loader_get_manifest_files(const struct loader_instance *inst,
+                 char *home = secure_getenv("HOME");
+                 if (home != NULL) {
+                     char *home_loc = loader_stack_alloc(strlen(home) + 16 +
+-                                                        strlen(home_location));
++                                                        strlen(relative_location));
+                     if (home_loc == NULL) {
+                         loader_log(
+                             inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0,
+@@ -3178,15 +3251,15 @@ loader_get_manifest_files(const struct loader_instance *inst,
+                     }
+                     strcat(home_loc, ".local/share");
+ 
+-                    if (home_location[0] != DIRECTORY_SYMBOL) {
++                    if (relative_location[0] != DIRECTORY_SYMBOL) {
+                         len = strlen(home_loc);
+                         home_loc[len] = DIRECTORY_SYMBOL;
+                         home_loc[len + 1] = '\0';
+                     }
+-                    strcat(home_loc, home_location);
++                    strcat(home_loc, relative_location);
+                     file = home_loc;
+                     next_file = loader_get_next_path(file);
+-                    home_location = NULL;
++                    relative_location = NULL;
+ 
+                     loader_log(
+                         inst, VK_DEBUG_REPORT_DEBUG_BIT_EXT, 0,
+@@ -3263,7 +3336,7 @@ VkResult loader_icd_scan(const struct loader_instance *inst,
+     // Get a list of manifest files for ICDs
+     res = loader_get_manifest_files(inst, "VK_ICD_FILENAMES", NULL, false, true,
+                                     DEFAULT_VK_DRIVERS_INFO,
+-                                    HOME_VK_DRIVERS_INFO, &manifest_files);
++                                    RELATIVE_VK_DRIVERS_INFO, &manifest_files);
+     if (VK_SUCCESS != res || manifest_files.count == 0) {
+         goto out;
+     }
+@@ -3490,7 +3563,7 @@ void loader_layer_scan(const struct loader_instance *inst,
+     if (VK_SUCCESS !=
+         loader_get_manifest_files(inst, LAYERS_PATH_ENV, LAYERS_SOURCE_PATH,
+                                   true, true, DEFAULT_VK_ELAYERS_INFO,
+-                                  HOME_VK_ELAYERS_INFO, &manifest_files[0])) {
++                                  RELATIVE_VK_ELAYERS_INFO, &manifest_files[0])) {
+         goto out;
+     }
+ 
+@@ -3499,7 +3572,7 @@ void loader_layer_scan(const struct loader_instance *inst,
+     // overridden by LAYERS_PATH_ENV
+     if (VK_SUCCESS != loader_get_manifest_files(inst, NULL, NULL, true, false,
+                                                 DEFAULT_VK_ILAYERS_INFO,
+-                                                HOME_VK_ILAYERS_INFO,
++                                                RELATIVE_VK_ILAYERS_INFO,
+                                                 &manifest_files[1])) {
+         goto out;
+     }
+@@ -3569,7 +3642,7 @@ void loader_implicit_layer_scan(const struct loader_instance *inst,
+     // overridden by LAYERS_PATH_ENV
+     VkResult res = loader_get_manifest_files(
+         inst, NULL, NULL, true, false, DEFAULT_VK_ILAYERS_INFO,
+-        HOME_VK_ILAYERS_INFO, &manifest_files);
++        RELATIVE_VK_ILAYERS_INFO, &manifest_files);
+     if (VK_SUCCESS != res || manifest_files.count == 0) {
+         return;
+     }
 diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h
-index 3a02640..70a2652 100644
+index dc4ac10..50a7966 100644
 --- a/loader/vk_loader_platform.h
 +++ b/loader/vk_loader_platform.h
-@@ -57,35 +57,10 @@
+@@ -57,47 +57,9 @@
  #define VULKAN_ILAYERCONF_DIR "implicit_layer.d"
  #define VULKAN_LAYER_DIR      "layer"
  
--#if defined(LOCALPREFIX)
--#define LOCAL_DRIVERS_INFO                                                     \
--    LOCALPREFIX "/" SYSCONFDIR VULKAN_DIR VULKAN_ICDCONF_DIR ":"               \
--    LOCALPREFIX "/" DATADIR    VULKAN_DIR VULKAN_ICDCONF_DIR ":"
--#define LOCAL_ELAYERS_INFO                                                     \
--    LOCALPREFIX "/" SYSCONFDIR VULKAN_DIR VULKAN_ELAYERCONF_DIR ":"            \
--    LOCALPREFIX "/" DATADIR    VULKAN_DIR VULKAN_ELAYERCONF_DIR ":"
--#define LOCAL_ILAYERS_INFO                                                     \
--    LOCALPREFIX "/" SYSCONFDIR VULKAN_DIR VULKAN_ILAYERCONF_DIR ":"            \
--    LOCALPREFIX "/" DATADIR    VULKAN_DIR VULKAN_ILAYERCONF_DIR ":"
+-#if defined(EXTRASYSCONFDIR)
+-#define EXTRA_DRIVERS_SYSCONFDIR_INFO ":"                                      \
+-    EXTRASYSCONFDIR VULKAN_DIR VULKAN_ICDCONF_DIR
+-#define EXTRA_ELAYERS_SYSCONFDIR_INFO ":"                                      \
+-    EXTRASYSCONFDIR VULKAN_DIR VULKAN_ELAYERCONF_DIR
+-#define EXTRA_ILAYERS_SYSCONFDIR_INFO ":"                                      \
+-    EXTRASYSCONFDIR VULKAN_DIR VULKAN_ILAYERCONF_DIR
 -#else
--#define LOCAL_DRIVERS_INFO
--#define LOCAL_ELAYERS_INFO
--#define LOCAL_ILAYERS_INFO
+-#define EXTRA_DRIVERS_SYSCONFDIR_INFO
+-#define EXTRA_ELAYERS_SYSCONFDIR_INFO
+-#define EXTRA_ILAYERS_SYSCONFDIR_INFO
+-#endif
+-
+-#if defined(EXTRADATADIR)
+-#define EXTRA_DRIVERS_DATADIR_INFO ":"                                         \
+-    EXTRADATADIR VULKAN_DIR VULKAN_ICDCONF_DIR
+-#define EXTRA_ELAYERS_DATADIR_INFO ":"                                         \
+-    EXTRADATADIR VULKAN_DIR VULKAN_ELAYERCONF_DIR
+-#define EXTRA_ILAYERS_DATADIR_INFO ":"                                         \
+-    EXTRADATADIR VULKAN_DIR VULKAN_ILAYERCONF_DIR
+-#else
+-#define EXTRA_DRIVERS_DATADIR_INFO
+-#define EXTRA_ELAYERS_DATADIR_INFO
+-#define EXTRA_ILAYERS_DATADIR_INFO
 -#endif
 -
 -#define DEFAULT_VK_DRIVERS_INFO                                                \
--    LOCAL_DRIVERS_INFO                                                         \
--    "/"  SYSCONFDIR VULKAN_DIR VULKAN_ICDCONF_DIR ":"                          \
--    "/usr/" DATADIR VULKAN_DIR VULKAN_ICDCONF_DIR
-+#define DEFAULT_VK_DRIVERS_INFO ""
- #define DEFAULT_VK_DRIVERS_PATH ""
+-    SYSCONFDIR   VULKAN_DIR VULKAN_ICDCONF_DIR ":"                             \
+-    DATADIR      VULKAN_DIR VULKAN_ICDCONF_DIR                                 \
+-    EXTRA_DRIVERS_SYSCONFDIR_INFO                                              \
+-    EXTRA_DRIVERS_DATADIR_INFO
 -#define DEFAULT_VK_ELAYERS_INFO                                                \
--    LOCAL_ELAYERS_INFO                                                         \
--    "/"  SYSCONFDIR VULKAN_DIR VULKAN_ELAYERCONF_DIR ":"                       \
--    "/usr/" DATADIR VULKAN_DIR VULKAN_ELAYERCONF_DIR
+-    SYSCONFDIR   VULKAN_DIR VULKAN_ELAYERCONF_DIR ":"                          \
+-    DATADIR      VULKAN_DIR VULKAN_ELAYERCONF_DIR                              \
+-    EXTRA_ELAYERS_SYSCONFDIR_INFO                                              \
+-    EXTRA_ELAYERS_DATADIR_INFO
 -#define DEFAULT_VK_ILAYERS_INFO                                                \
--    LOCAL_ILAYERS_INFO                                                         \
--    "/"  SYSCONFDIR VULKAN_DIR VULKAN_ILAYERCONF_DIR ":"                       \
--    "/usr/" DATADIR VULKAN_DIR VULKAN_ILAYERCONF_DIR
+-    SYSCONFDIR   VULKAN_DIR VULKAN_ILAYERCONF_DIR ":"                          \
+-    DATADIR      VULKAN_DIR VULKAN_ILAYERCONF_DIR                              \
+-    EXTRA_ILAYERS_SYSCONFDIR_INFO                                              \
+-    EXTRA_ILAYERS_DATADIR_INFO
++#define DEFAULT_VK_DRIVERS_INFO ""
 +#define DEFAULT_VK_ELAYERS_INFO ""
 +#define DEFAULT_VK_ILAYERS_INFO ""
- #define DEFAULT_VK_LAYERS_PATH ""
- #if !defined(LAYERS_SOURCE_PATH)
+ 
+ #define DEFAULT_VK_DRIVERS_PATH ""
+ #if !defined(DEFAULT_VK_LAYERS_PATH)
+@@ -109,9 +71,9 @@
+ #endif
+ #define LAYERS_PATH_ENV "VK_LAYER_PATH"
+ 
+-#define HOME_VK_DRIVERS_INFO VULKAN_DIR VULKAN_ICDCONF_DIR
+-#define HOME_VK_ELAYERS_INFO VULKAN_DIR VULKAN_ELAYERCONF_DIR
+-#define HOME_VK_ILAYERS_INFO VULKAN_DIR VULKAN_ILAYERCONF_DIR
++#define RELATIVE_VK_DRIVERS_INFO VULKAN_DIR VULKAN_ICDCONF_DIR
++#define RELATIVE_VK_ELAYERS_INFO VULKAN_DIR VULKAN_ELAYERCONF_DIR
++#define RELATIVE_VK_ILAYERS_INFO VULKAN_DIR VULKAN_ILAYERCONF_DIR
+ 
+ // C99:
+ #define PRINTF_SIZE_T_SPECIFIER "%zu"
+@@ -251,9 +213,9 @@ loader_platform_thread_cond_broadcast(loader_platform_thread_cond *pCond) {
  #define LAYERS_SOURCE_PATH NULL
+ #endif
+ #define LAYERS_PATH_ENV "VK_LAYER_PATH"
+-#define HOME_VK_DRIVERS_INFO ""
+-#define HOME_VK_ELAYERS_INFO ""
+-#define HOME_VK_ILAYERS_INFO ""
++#define RELATIVE_VK_DRIVERS_INFO ""
++#define RELATIVE_VK_ELAYERS_INFO ""
++#define RELATIVE_VK_ILAYERS_INFO ""
+ #define PRINTF_SIZE_T_SPECIFIER "%Iu"
+ 
+ // File IO
diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix
index 4693e547716..9bc9bf9c0e4 100644
--- a/pkgs/development/tools/spirv-tools/default.nix
+++ b/pkgs/development/tools/spirv-tools/default.nix
@@ -8,14 +8,14 @@ spirv_sources = {
   tools = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Tools";
-    rev = "923a4596b44831a07060df45caacb522613730c9";
-    sha256 = "0hmgng2sv34amfsag3ya09prnv1w535djwlzfn8h2vh430vgawxa";
+    rev = "37422e9dba1a3a8cb8028b779dd546d43add6ef8";
+    sha256 = "0sp2p4wg902clq0fr94vj19vyv43cq333jjxr0mjzay8dw2h4yzk";
   };
   headers = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Headers";
-    rev = "33d41376d378761ed3a4c791fc4b647761897f26";
-    sha256 = "1s103bpi3g6hhq453qa4jbabfkyxxpf9vn213j8k4vm26lsi8hs2";
+    rev = "c470b68225a04965bf87d35e143ae92f831e8110";
+    sha256 = "18jgcpmm0ixp6314r5w144l3wayxjkmwqgx8dk5jgyw36dammkwd";
   };
 };
 
@@ -23,7 +23,7 @@ in
 
 stdenv.mkDerivation rec {
   name = "spirv-tools-${version}";
-  version = "2016-07-18";
+  version = "2016-12-19";
 
   src = spirv_sources.tools;
   patchPhase = ''ln -sv ${spirv_sources.headers} external/spirv-headers'';

From a9afa48915730b4a25164892d0b04a6755ab1f70 Mon Sep 17 00:00:00 2001
From: Jake Waksbaum <jake.waksbaum@gmail.com>
Date: Mon, 30 Jan 2017 22:07:44 -0500
Subject: [PATCH 148/899] smartmontools: 6.4 -> 6.5 and fix segfault on darwin

---
 pkgs/tools/system/smartmontools/default.nix   | 24 +++++------------
 .../system/smartmontools/smartmontools.patch  | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 33 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/tools/system/smartmontools/smartmontools.patch

diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix
index cc30cd7a488..1a9e2d3b5b9 100644
--- a/pkgs/tools/system/smartmontools/default.nix
+++ b/pkgs/tools/system/smartmontools/default.nix
@@ -1,30 +1,18 @@
-{ stdenv, fetchurl
-, IOKit ? null }:
+{ stdenv, fetchurl,
+IOKit ? null , ApplicationServices ? null }:
 
-let
-  version = "6.4";
-  drivedbBranch = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}_DRIVEDB";
-  dbrev = "4167";
-  driverdb = fetchurl {
-    url = "http://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw";
-    sha256 = "14rv1cxbpmnq12hjwr3icjiahx5i0ak7j69310c09rah0241l5j1";
-    name = "smartmontools-drivedb.h";
-  };
-in
 stdenv.mkDerivation rec {
+  version = "6.5";
   name = "smartmontools-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/smartmontools/${name}.tar.gz";
-    sha256 = "11bsxcghh7adzdklcslamlynydxb708vfz892d5w7agdq405ddza";
+    sha256 = "1g25r6sx85b5lay5n6sbnqv05qxzj6xsafsp93hnrg1h044bps49";
   };
 
-  buildInputs = [] ++ stdenv.lib.optional stdenv.isDarwin IOKit;
+  buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [IOKit ApplicationServices];
 
-  patchPhase = ''
-    cp ${driverdb} drivedb.h
-    sed -i -e 's@which which >/dev/null || exit 1@alias which="type -p"@' update-smart-drivedb.in
-  '';
+  patches = [ ./smartmontools.patch ];
 
   meta = with stdenv.lib; {
     description = "Tools for monitoring the health of hard drives";
diff --git a/pkgs/tools/system/smartmontools/smartmontools.patch b/pkgs/tools/system/smartmontools/smartmontools.patch
new file mode 100644
index 00000000000..144b2be2d33
--- /dev/null
+++ b/pkgs/tools/system/smartmontools/smartmontools.patch
@@ -0,0 +1,26 @@
+diff --git a/../smartmontools-6.5/configure b/./configure
+index acb028a..5e2c7a1 100755
+--- a/../smartmontools-6.5/configure
++++ b/./configure
+@@ -6703,7 +6703,7 @@ fi
+     ;;
+   *-*-darwin*)
+     os_deps='os_darwin.o'
+-    os_libs='-framework CoreFoundation -framework IOKit'
++    os_libs='-framework ApplicationServices -framework IOKit'
+     os_darwin=yes
+     os_man_filter=Darwin
+     ;;
+diff --git a/../smartmontools-6.5/configure.ac b/./configure.ac
+index 6bd61d7..32ff50c 100644
+--- a/../smartmontools-6.5/configure.ac
++++ b/./configure.ac
+@@ -508,7 +508,7 @@ case "${host}" in
+     ;;
+   *-*-darwin*)
+     os_deps='os_darwin.o'
+-    os_libs='-framework CoreFoundation -framework IOKit'
++    os_libs='-framework ApplicationServices -framework IOKit'
+     os_darwin=yes
+     os_man_filter=Darwin
+     ;;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b587b4fd43..32db483785a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3804,7 +3804,7 @@ with pkgs;
   slsnif = callPackage ../tools/misc/slsnif { };
 
   smartmontools = callPackage ../tools/system/smartmontools {
-    inherit (darwin.apple_sdk.frameworks) IOKit;
+    inherit (darwin.apple_sdk.frameworks) IOKit ApplicationServices;
   };
 
   smbldaptools = callPackage ../tools/networking/smbldaptools {

From 61c48d9c45254e36e4ecb58ce7c263dda13bd9a0 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 31 Jan 2017 05:05:07 +0000
Subject: [PATCH 149/899] luaPackages.luaexpat: fix build on darwin

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

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 3db9e66a98e..ecf6d11547d 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -112,6 +112,11 @@ let
 
     buildInputs = [ expat ];
 
+    preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+      substituteInPlace Makefile \
+      --replace '-shared' '-bundle -undefined dynamic_lookup -all_load'
+    '';
+
     preBuild = ''
       makeFlagsArray=(
         LUA_LDIR="$out/share/lua/${lua.luaversion}"
@@ -121,7 +126,7 @@ let
 
     meta = {
       homepage = "http://matthewwild.co.uk/projects/luaexpat";
-      hydraPlatforms = stdenv.lib.platforms.linux;
+      hydraPlatforms = stdenv.lib.platforms.unix;
       maintainers = [ stdenv.lib.maintainers.flosse ];
     };
   };

From 3dd2a271efff2617a54c3ed63bf3ed212ded77f8 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Tue, 31 Jan 2017 02:17:11 -0500
Subject: [PATCH 150/899] vim: make it possible to build with --enable-gui=gtk3

This doesn't change any defaults; I suspect that dropping gtk2 support
would annoy some people so I didn't want to do that without asking
around first.
---
 pkgs/applications/editors/vim/configurable.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index d0a0c63d9d0..ee33c3e3070 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -1,7 +1,7 @@
 # TODO tidy up eg The patchelf code is patching gvim even if you don't build it..
 # but I have gvim with python support now :) - Marc
 args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, gettext
-, composableDerivation, writeText, lib, config, glib, gtk2, python, perl, tcl, ruby
+, composableDerivation, writeText, lib, config, glib, gtk2, gtk3, python, perl, tcl, ruby
 , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
 , libICE
 
@@ -69,8 +69,8 @@ composableDerivation {
     nativeBuildInputs = [ pkgconfig ];
 
     buildInputs
-      = [ ncurses gtk2 libX11 libXext libSM libXpm libXt libXaw libXau
-          libXmu glib libICE ];
+      = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau
+          libXmu glib libICE ] ++ (if args.gui == "gtk3" then [gtk3] else [gtk2]);
 
     # most interpreters aren't tested yet.. (see python for example how to do it)
     flags = {
@@ -149,7 +149,7 @@ composableDerivation {
     ftNixSupport     = config.vim.ftNix or true;
   };
 
-  #--enable-gui=OPTS     X11 GUI default=auto OPTS=auto/no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/photon/carbon
+  #--enable-gui=OPTS     X11 GUI default=auto OPTS=auto/no/gtk/gtk2/gtk3/gnome/gnome2/motif/athena/neXtaw/photon/carbon
     /*
       // edf "gtk_check" "gtk_check" { } #If auto-select GUI, check for GTK default=yes
       // edf "gtk2_check" "gtk2_check" { } #If GTK GUI, check for GTK+ 2 default=yes
@@ -171,4 +171,3 @@ composableDerivation {
 
   dontStrip = 1;
 })
-

From e01c15d433cdaacca0c0525a29ce304b3832d16a Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Tue, 31 Jan 2017 02:36:35 -0500
Subject: [PATCH 151/899] nixos: if gnome3 is installed, build gvim for gtk3
 too

---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 17e84b1d9a1..21453d1917e 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -78,7 +78,7 @@ in {
       };
 
       debug = mkEnableOption "gnome-session debug messages";
-    };  
+    };
 
     environment.gnome3.packageSet = mkOption {
       default = null;
@@ -86,7 +86,7 @@ in {
       description = "Which GNOME 3 package set to use.";
       apply = p: if p == null then pkgs.gnome3 else p;
     };
-    
+
     environment.gnome3.excludePackages = mkOption {
       default = [];
       example = literalExample "[ pkgs.gnome3.totem ]";
@@ -125,6 +125,9 @@ in {
     services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center
     services.udev.packages = [ pkgs.gnome3.gnome_settings_daemon ];
 
+    # If gnome3 is installed, build vim for gtk3 too.
+    nixpkgs.config.vim.gui = "gtk3";
+
     fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell_fonts ];
 
     services.xserver.desktopManager.session = singleton

From e2bf0416a920e69cca2acc01ca0804ff3757422b Mon Sep 17 00:00:00 2001
From: Tim Digel <tim.digel@active-group.de>
Date: Thu, 26 Jan 2017 08:16:50 +0100
Subject: [PATCH 152/899] pgroonga: init at 1.1.9

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

diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix
new file mode 100644
index 00000000000..edd99aa9a69
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, postgresql, libmsgpack, groonga }:
+
+stdenv.mkDerivation rec {
+  name = "pgroonga-${version}";
+  version = "1.1.9";
+
+  src = fetchurl {
+    url = "http://packages.groonga.org/source/pgroonga/${name}.tar.gz";
+    sha256 = "07afgwll8nxfb7ziw3qrvw0ryjjw3994vj2f6alrjwpg7ynb46ag";
+  };
+
+  buildInputs = [ postgresql pkgconfig libmsgpack groonga ];
+
+  makeFlags = [ "HAVE_MSGPACK=1" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    install -D pgroonga.so -t $out/lib/
+    install -D ./{pgroonga-*.sql,pgroonga.control} -t $out/share/extension
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A PostgreSQL extension to use Groonga as the index";
+    longDescription = "PGroonga is a PostgreSQL extension to use Groonga as the index. PostgreSQL supports full text search against languages that use only alphabet and digit. It means that PostgreSQL doesn't support full text search against Japanese, Chinese and so on. You can use super fast full text search feature against all languages by installing PGroonga into your PostgreSQL.";
+    homepage = https://pgroonga.github.io/;
+    license = licenses.postgresql;
+    maintainers = with maintainers; [ DerTim1 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3dfa9711a1a..51ad8d8b307 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9055,6 +9055,8 @@ with pkgs;
 
   pg_similarity = callPackage ../servers/sql/postgresql/pg_similarity {};
 
+  pgroonga = callPackage ../servers/sql/postgresql/pgroonga {};
+
   phonon = callPackage ../development/libraries/phonon {};
 
   phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {};

From 4cf8ae3a8c239eecef6c275f88e508370defbf08 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 30 Jan 2017 21:17:00 +0100
Subject: [PATCH 153/899] pythonPackages.pytest: use pytest_30

---
 pkgs/tools/misc/tmuxp/default.nix  |  2 +-
 pkgs/top-level/python-packages.nix | 40 ++++++++++++++++--------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix
index 3ca01d7e5eb..04b42f6d722 100644
--- a/pkgs/tools/misc/tmuxp/default.nix
+++ b/pkgs/tools/misc/tmuxp/default.nix
@@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec {
   '';
 
   buildInputs = with pythonPackages; [
-    pytest
+    pytest_29
     pytest-rerunfailures
   ];
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 03d03d6f8dc..d957d452218 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -895,7 +895,7 @@ in {
       sha256 = "1ybywzkd840v1qvb1p2bs08js260vq1jscjg8182hv7bmwacqy0k";
     };
 
-    buildInputs = with self; [ pytest_30 case ];
+    buildInputs = with self; [ pytest case ];
     propagatedBuildInputs = with self; [ vine ];
 
     meta = {
@@ -2650,7 +2650,7 @@ in {
       sha256 = "1anw68rkja1dbgvndxz5mq6f89hmxwaha0fjcdnsl5j1wj7imc1y";
     };
 
-    buildInputs = with self; [ pytest_30 case ];
+    buildInputs = with self; [ pytest case ];
 
     meta = {
       homepage = https://github.com/celery/billiard;
@@ -3566,7 +3566,7 @@ in {
       sha256 = "0kgmbs3fl9879n48p4m79nxy9by2yhvxq1jdvlnqzzvkdb2sdmg3";
     };
 
-    buildInputs = with self; [ pytest_30 case ];
+    buildInputs = with self; [ pytest case ];
     propagatedBuildInputs = with self; [ kombu billiard pytz anyjson amqp eventlet ];
 
     meta = {
@@ -3812,7 +3812,7 @@ in {
       sha256 = "400b0bb63d9096b6bf2806efaf742a1cc8b6c88e0484f0afe7d7a7f0e9870609";
     };
 
-    checkInputs = with self; [ pytest ];
+    checkInputs = with self; [ pytest_29 ];
     propagatedBuildInputs = with self; [ click ] ++ optional (!isPy3k) futures;
 
     checkPhase = ''
@@ -4672,7 +4672,7 @@ in {
       sha256 = "0aw1zxmyvx6gfmmnixbqmdaah28jl7rmqkzhxv53091asc23iw9k";
     };
 
-    buildInputs = with self; [ pytest ];
+    buildInputs = with self; [ pytest_29 ];
     propagatedBuildInputs = with self; [ future numpy ];
 
     doCheck = true;
@@ -4944,7 +4944,7 @@ in {
     };
   };
 
-  pytest = self.pytest_29;
+  pytest = self.pytest_30;
 
   pytest_27 = callPackage ../development/python-modules/pytest/2_7.nix {};
 
@@ -4952,7 +4952,13 @@ in {
 
   pytest_29 = callPackage ../development/python-modules/pytest/2_9.nix {};
 
-  pytest_30 = callPackage ../development/python-modules/pytest {};
+  pytest_30 = callPackage ../development/python-modules/pytest{
+    hypothesis = self.hypothesis.override {
+      # hypothesis requires pytest that causes dependency cycle
+      doCheck = false;
+      pytest = null;
+    };
+  };
 
   pytestcache = buildPythonPackage rec {
     name = "pytest-cache-1.0";
@@ -4978,9 +4984,7 @@ in {
     };
   };
 
-  pytestdjango = callPackage ../development/python-modules/pytestdjango.nix {
-    pytest = self.pytest_30;
-  };
+  pytestdjango = callPackage ../development/python-modules/pytestdjango.nix { };
 
   pytest-fixture-config = buildPythonPackage rec {
     name = "${pname}-${version}";
@@ -5568,7 +5572,7 @@ in {
       sha256 = "117savw47c2givq9vxr5m02nyxmsk34l2ihxyy5axlaiqyxyf20s";
     };
 
-    buildInputs = with self; [ pytest ];
+    buildInputs = with self; [ pytest_29 ];
     patchPhase = ''
       sed -i 's/==.*$//' requirements/test.txt
     '';
@@ -10306,9 +10310,7 @@ in {
     };
   };
 
-  django_guardian = callPackage ../development/python-modules/django_guardian.nix {
-    pytest = self.pytest_30;
-  };
+  django_guardian = callPackage ../development/python-modules/django_guardian.nix { };
 
   django_tagging = buildPythonPackage rec {
     name = "django-tagging-0.4.5";
@@ -13485,7 +13487,7 @@ in {
       sha256 = "18hiricdnbnlz6hx3hbaa4dni6npv8rbid4dhf7k02k16qm6zz6h";
     };
 
-    buildInputs = with self; [ pytest_30 case pytz ];
+    buildInputs = with self; [ pytest case pytz ];
 
     propagatedBuildInputs = with self; [ amqp ];
 
@@ -18370,7 +18372,7 @@ in {
       sha256 = "0v8aq0xzsa7clazszxl42904c3jpq69lg8a5hg754bqcqf72hfrn";
     };
     LC_ALL="en_US.UTF-8";
-    buildInputs = with self; [ pkgs.glibcLocales pytest ];
+    buildInputs = with self; [ pkgs.glibcLocales pytest_29 ];
 
     checkPhase = ''
       py.test
@@ -23334,7 +23336,7 @@ in {
       url = "mirror://pypi/s/${pname}/${name}.tar.gz";
       sha256 = "14220f8f761c48ba1e2526f087195077cf54fad7098b382ce220422f0ff59b12";
     };
-    buildInputs = with self; [ pytest virtualenv pytestrunner pytest-virtualenv ];
+    buildInputs = with self; [ pytest_29 virtualenv pytestrunner pytest-virtualenv ];
     propagatedBuildInputs = with self; [ twisted pathlib2 ];
     postPatch = ''
       sed -i '12,$d' tests/test_main.py
@@ -31558,7 +31560,7 @@ EOF
       url = "mirror://pypi/a/${pname}/${name}.tar.gz";
       sha256 = "1158ml8h3g0vlsgw2jmy579glbg7dn0mjij8xibdl509b8qv9p51";
     };
-    buildInputs = with self; [ unittest2 mock pytest trollius ];
+    buildInputs = with self; [ unittest2 mock pytest_29 trollius ];
     propagatedBuildInputs = with self; [ six twisted txaio ];
     checkPhase = ''
       py.test $out
@@ -31792,7 +31794,7 @@ EOF
       sha256 = "0h94x9mc9bspg23lb1f73h7smdzc39ps7z7sm0q38ds9jahmvfc7";
     };
 
-    buildInputs = with self; [ case pytest_30 ];
+    buildInputs = with self; [ case pytest ];
 
     meta = {
       homepage = https://github.com/celery/vine;

From d409d239459bbe0dabe9bff854ea15b4b12f10d5 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 31 Jan 2017 06:19:56 +0000
Subject: [PATCH 154/899] pidgin-xmpp-receipts: init at 0.7

---
 lib/maintainers.nix                           |  1 +
 .../pidgin-xmpp-receipts/default.nix          | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 298afcbc161..42304f68b45 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -351,6 +351,7 @@
   olejorgenb = "Ole Jørgen Brønner <olejorgenb@yahoo.no>";
   orbekk = "KJ Ørbekk <kjetil.orbekk@gmail.com>";
   orbitz = "Malcolm Matalka <mmatalka@gmail.com>";
+  orivej = "Orivej Desh <orivej@gmx.fr>";
   osener = "Ozan Sener <ozan@ozansener.com>";
   otwieracz = "Slawomir Gonet <slawek@otwiera.cz>";
   oxij = "Jan Malakhovski <oxij@oxij.org>";
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix
new file mode 100644
index 00000000000..c69de60c6cf
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, pidgin } :
+
+let
+  version = "0.7";
+in
+stdenv.mkDerivation rec {
+  name = "pidgin-xmpp-receipts-${version}";
+
+  src = fetchFromGitHub {
+    owner = "noonien-d";
+    repo = "pidgin-xmpp-receipts";
+    rev = "release_${version}";
+    sha256 = "1ackqwsqgy1nfggl9na4jicv7hd542aazkg629y2jmbyj1dl3kjm";
+  };
+
+  buildInputs = [ pidgin ];
+
+  installPhase = ''
+    mkdir -p $out/lib/pidgin/
+    cp xmpp-receipts.so $out/lib/pidgin/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://devel.kondorgulasch.de/pidgin-xmpp-receipts/;
+    description = "Message delivery receipts (XEP-0184) Pidgin plugin";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ orivej ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51ad8d8b307..e8bb1b2262e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14548,6 +14548,8 @@ with pkgs;
 
   pidgin-skypeweb = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb { };
 
+  pidgin-xmpp-receipts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts { };
+
   pidginotr = callPackage ../applications/networking/instant-messengers/pidgin-plugins/otr { };
 
   pidginosd = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-osd { };

From 68b4a1f669e2ca95ebbb3f80631952a7168214f1 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Tue, 31 Jan 2017 03:38:02 -0500
Subject: [PATCH 155/899] nixos: Respect nixpkgs.overlays (#22221)

---
 nixos/modules/misc/nixpkgs.nix | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 7451888484f..b8824e6374b 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -45,9 +45,8 @@ let
 in
 
 {
-  options = {
-
-    nixpkgs.config = mkOption {
+  options.nixpkgs = {
+    config = mkOption {
       default = {};
       example = literalExample
         ''
@@ -61,7 +60,7 @@ in
       '';
     };
 
-    nixpkgs.overlays = mkOption {
+    overlays = mkOption {
       default = [];
       example = literalExample
         ''
@@ -85,7 +84,7 @@ in
       '';
     };
 
-    nixpkgs.system = mkOption {
+    system = mkOption {
       type = types.str;
       example = "i686-linux";
       description = ''
@@ -95,14 +94,9 @@ in
         multi-platform deployment, or when building virtual machines.
       '';
     };
-
   };
 
   config = {
-    _module.args.pkgs = import ../../.. {
-      system = config.nixpkgs.system;
-
-      inherit (config.nixpkgs) config;
-    };
+    _module.args.pkgs = import ../../.. config.nixpkgs;
   };
 }

From 3ccc139b3db8d9417006eb9deeb75038b2fc33fa Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 20 Dec 2016 15:38:02 +0100
Subject: [PATCH 156/899] cataract: init at 1.1.0 and HEAD

---
 pkgs/applications/misc/cataract/build.nix    | 38 ++++++++++++++++++++
 pkgs/applications/misc/cataract/default.nix  | 17 +++++++++
 pkgs/applications/misc/cataract/unstable.nix | 17 +++++++++
 pkgs/top-level/all-packages.nix              |  3 ++
 4 files changed, 75 insertions(+)
 create mode 100644 pkgs/applications/misc/cataract/build.nix
 create mode 100644 pkgs/applications/misc/cataract/default.nix
 create mode 100644 pkgs/applications/misc/cataract/unstable.nix

diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix
new file mode 100644
index 00000000000..587a20b2704
--- /dev/null
+++ b/pkgs/applications/misc/cataract/build.nix
@@ -0,0 +1,38 @@
+{ stdenv
+, fetchgit
+, autoreconfHook
+, glib
+, pkgconfig
+, libxml2
+, exiv2
+, imagemagick
+, version
+, sha256
+, rev }:
+
+stdenv.mkDerivation rec {
+  inherit version;
+  name = "cataract-${version}";
+
+  src = fetchgit {
+    url = "git://git.bzatek.net/cataract";
+    inherit sha256 rev;
+  };
+
+  buildInputs = [ autoreconfHook glib pkgconfig libxml2 exiv2 imagemagick ];
+
+  installPhase = ''
+    mkdir $out/{bin,share} -p
+    cp src/cgg{,-dirgen} $out/bin/
+  '';
+
+  meta = {
+    homepage = "http://cgg.bzatek.net/";
+    description = "a simple static web photo gallery, designed to be clean and easily usable";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
+  };
+}
+
+
diff --git a/pkgs/applications/misc/cataract/default.nix b/pkgs/applications/misc/cataract/default.nix
new file mode 100644
index 00000000000..83292a76c5d
--- /dev/null
+++ b/pkgs/applications/misc/cataract/default.nix
@@ -0,0 +1,17 @@
+{ callPackage
+, stdenv
+, fetchgit
+, autoconf
+, automake
+, glib
+, pkgconfig
+, libxml2
+, exiv2
+, imagemagick }:
+
+callPackage ./build.nix {
+  version = "1.1.0";
+  rev = "675e647dc8ae918d29f520a29be9201ae85a94dd";
+  sha256 = "13b9rvcy9k2ay8w36j28kc7f4lnxp4jc0494ck3xsmwgqsawmzdj";
+}
+
diff --git a/pkgs/applications/misc/cataract/unstable.nix b/pkgs/applications/misc/cataract/unstable.nix
new file mode 100644
index 00000000000..8d8b063e48b
--- /dev/null
+++ b/pkgs/applications/misc/cataract/unstable.nix
@@ -0,0 +1,17 @@
+{ callPackage
+, stdenv
+, fetchgit
+, autoconf
+, automake
+, glib
+, pkgconfig
+, libxml2
+, exiv2
+, imagemagick }:
+
+callPackage ./build.nix {
+  version = "unstable-2016-10-18";
+  rev = "db3d992febbe703931840e9bdad95c43081694a5";
+  sha256 = "04f85piy675lq36w1mw6mw66n8911mmn4ifj8h9x47z8z806h3rf";
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8bb1b2262e..d4c71c6c8fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -696,6 +696,9 @@ with pkgs;
 
   capstone = callPackage ../development/libraries/capstone { };
 
+  cataract          = callPackage ../applications/misc/cataract { };
+  cataract-unstable = callPackage ../applications/misc/cataract/unstable.nix { };
+
   catch = callPackage ../development/libraries/catch { };
 
   catdoc = callPackage ../tools/text/catdoc { };

From 58dc8e30248e5c69ce6af9c80ec0cb5a3e448c43 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Tue, 31 Jan 2017 11:00:14 +0100
Subject: [PATCH 157/899] Remove myself from maintainers

---
 nixos/tests/emacs-daemon.nix                  |  2 +-
 .../misc/open-pdf-presenter/default.nix       |  2 +-
 pkgs/applications/misc/tnef/default.nix       |  2 +-
 .../networking/sync/backintime/common.nix     |  2 +-
 .../science/programming/plm/default.nix       |  2 +-
 pkgs/applications/video/byzanz/default.nix    |  2 +-
 .../video/recordmydesktop/default.nix         |  2 +-
 .../video/recordmydesktop/gtk.nix             |  2 +-
 .../applications/video/recordmydesktop/qt.nix |  2 +-
 .../data/fonts/gentium-book-basic/default.nix |  2 +-
 pkgs/desktops/gnome-3/3.22/default.nix        |  2 +-
 .../gnome-3/3.22/misc/pidgin/default.nix      |  2 +-
 .../gnome-3/3.22/misc/pomodoro/default.nix    |  2 +-
 .../libraries/uhttpmock/default.nix           |  2 +-
 pkgs/development/pharo/launcher/default.nix   |  2 +-
 pkgs/development/pharo/vm/build-vm.nix        |  2 +-
 pkgs/development/pharo/vm/share.nix           |  2 +-
 pkgs/tools/misc/tmate/default.nix             |  2 +-
 pkgs/tools/misc/umlet/default.nix             |  2 +-
 pkgs/tools/misc/vdirsyncer/default.nix        |  2 +-
 pkgs/tools/networking/asynk/default.nix       |  2 +-
 .../typesetting/git-latexdiff/default.nix     |  2 +-
 pkgs/top-level/python-packages.nix            | 36 +++++++++----------
 23 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/nixos/tests/emacs-daemon.nix b/nixos/tests/emacs-daemon.nix
index a4d63bdb7e4..466e772a881 100644
--- a/nixos/tests/emacs-daemon.nix
+++ b/nixos/tests/emacs-daemon.nix
@@ -1,7 +1,7 @@
 import ./make-test.nix ({ pkgs, ...} : {
   name = "emacs-daemon";
   meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ DamienCassou ];
+    maintainers = [ ];
   };
 
   enableOCR = true;
diff --git a/pkgs/applications/misc/open-pdf-presenter/default.nix b/pkgs/applications/misc/open-pdf-presenter/default.nix
index 1d5811226d5..0f40a236c58 100644
--- a/pkgs/applications/misc/open-pdf-presenter/default.nix
+++ b/pkgs/applications/misc/open-pdf-presenter/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/olabini/open-pdf-presenter;
     description = "A program for presenting PDFs on multi-monitor settings (typically a laptop connected to a overhead projector)";
     license = stdenv.lib.licenses.gpl3;
-    maintainers = [ stdenv.lib.maintainers.DamienCassou ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/applications/misc/tnef/default.nix b/pkgs/applications/misc/tnef/default.nix
index b59f1a43710..9e3cf011316 100644
--- a/pkgs/applications/misc/tnef/default.nix
+++ b/pkgs/applications/misc/tnef/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = https://github.com/verdammelt/tnef;
     license = licenses.gpl2;
-    maintainers = [ maintainers.DamienCassou ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix
index 3190d999a91..ccd08e2844e 100644
--- a/pkgs/applications/networking/sync/backintime/common.nix
+++ b/pkgs/applications/networking/sync/backintime/common.nix
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
     homepage = https://github.com/bit-team/backintime;
     description = "Simple backup tool for Linux";
     license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.DamienCassou ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
     longDescription = ''
       Back In Time is a simple backup tool (on top of rsync) for Linux
diff --git a/pkgs/applications/science/programming/plm/default.nix b/pkgs/applications/science/programming/plm/default.nix
index 0e35a0b2264..eb157e8b99f 100644
--- a/pkgs/applications/science/programming/plm/default.nix
+++ b/pkgs/applications/science/programming/plm/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     description = "Free cross-platform programming exerciser";
     Homepage = http://webloria.loria.fr/~quinson/Teaching/PLM/;
     license = licenses.gpl3;
-    maintainers = [ maintainers.DamienCassou ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix
index 872ac098f00..ca9620a0eb0 100644
--- a/pkgs/applications/video/byzanz/default.nix
+++ b/pkgs/applications/video/byzanz/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/GNOME/byzanz;
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = [ maintainers.DamienCassou ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/video/recordmydesktop/default.nix b/pkgs/applications/video/recordmydesktop/default.nix
index 54dc88b452e..8797ad8f953 100644
--- a/pkgs/applications/video/recordmydesktop/default.nix
+++ b/pkgs/applications/video/recordmydesktop/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
     homepage = http://recordmydesktop.sourceforge.net/;
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = [ maintainers.DamienCassou ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/video/recordmydesktop/gtk.nix b/pkgs/applications/video/recordmydesktop/gtk.nix
index f3bf714b941..2beb3ca94f2 100644
--- a/pkgs/applications/video/recordmydesktop/gtk.nix
+++ b/pkgs/applications/video/recordmydesktop/gtk.nix
@@ -32,6 +32,6 @@ in stdenv.mkDerivation rec {
     homepage = http://recordmydesktop.sourceforge.net/;
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = [ maintainers.DamienCassou ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/video/recordmydesktop/qt.nix b/pkgs/applications/video/recordmydesktop/qt.nix
index de372c905bd..56080135151 100644
--- a/pkgs/applications/video/recordmydesktop/qt.nix
+++ b/pkgs/applications/video/recordmydesktop/qt.nix
@@ -32,6 +32,6 @@ in stdenv.mkDerivation rec {
     homepage = http://recordmydesktop.sourceforge.net/;
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = [ maintainers.DamienCassou ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/data/fonts/gentium-book-basic/default.nix b/pkgs/data/fonts/gentium-book-basic/default.nix
index 8bc9ec5e2f3..2c7b1eea577 100644
--- a/pkgs/data/fonts/gentium-book-basic/default.nix
+++ b/pkgs/data/fonts/gentium-book-basic/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = "http://software.sil.org/gentium/";
     description = "A high-quality typeface family for Latin, Cyrillic, and Greek";
-    maintainers = with maintainers; [ DamienCassou ];
+    maintainers = with maintainers; [ ];
     license = licenses.ofl;
     platforms = platforms.all;
   };
diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.22/default.nix
index 6069fc1ed02..21e1ecc7a04 100644
--- a/pkgs/desktops/gnome-3/3.22/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/default.nix
@@ -14,7 +14,7 @@ let
   callPackage = pkgs.newScope self;
 
   version = "3.22";
-  maintainers = with pkgs.lib.maintainers; [ lethalman jgeerds DamienCassou ];
+  maintainers = with pkgs.lib.maintainers; [ lethalman jgeerds ];
 
   corePackages = with gnome3; [
     pkgs.desktop_file_utils pkgs.ibus
diff --git a/pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix b/pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix
index e3f6bca10a4..a5dd1480d3d 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix
@@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
     description = "Make Pidgin IM conversations appear in the Gnome Shell message tray";
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ DamienCassou ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix
index 1c7f712b12c..8c1ab41de52 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
       This GNOME utility helps to manage time according to Pomodoro Technique.
       It intends to improve productivity and focus by taking short breaks.
     '';
-    maintainers = with maintainers; [ DamienCassou jgeerds ];
+    maintainers = with maintainers; [ jgeerds ];
     license = licenses.gpl3;
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix
index 6105db73bc7..94223378151 100644
--- a/pkgs/development/libraries/uhttpmock/default.nix
+++ b/pkgs/development/libraries/uhttpmock/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     description = "Project for mocking web service APIs which use HTTP or HTTPS";
     homepage = https://gitlab.com/groups/uhttpmock/;
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ DamienCassou ];
+    maintainers = with maintainers; [ ];
     platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix
index 6e6722a804f..02004061b83 100644
--- a/pkgs/development/pharo/launcher/default.nix
+++ b/pkgs/development/pharo/launcher/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://pharo.org;
     license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.DamienCassou ];
+    maintainers = [ ];
     platforms = pharo-vm.meta.platforms;
   };
 }
diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix
index 8265e1dc776..1eeb5dc3151 100644
--- a/pkgs/development/pharo/vm/build-vm.nix
+++ b/pkgs/development/pharo/vm/build-vm.nix
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://pharo.org;
     license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.DamienCassou ];
+    maintainers = [ ];
     # Pharo VM sources are packaged separately for darwin (OS X)
     platforms = with stdenv.lib;
                   intersectLists
diff --git a/pkgs/development/pharo/vm/share.nix b/pkgs/development/pharo/vm/share.nix
index 46d25334260..aba42e3981c 100644
--- a/pkgs/development/pharo/vm/share.nix
+++ b/pkgs/development/pharo/vm/share.nix
@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
     description = "Shared files for Pharo";
     homepage = http://pharo.org;
     license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.DamienCassou ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix
index b5009165799..baadd6f3064 100644
--- a/pkgs/tools/misc/tmate/default.nix
+++ b/pkgs/tools/misc/tmate/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     description = "Instant Terminal Sharing";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ DamienCassou ];
+    maintainers = with stdenv.lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix
index 8ef357f65eb..918ff2f3179 100644
--- a/pkgs/tools/misc/umlet/default.nix
+++ b/pkgs/tools/misc/umlet/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.umlet.com;
     license = licenses.gpl3;
-    maintainers = [ maintainers.DamienCassou ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix
index 633371606a8..e32e58fcded 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@@ -32,7 +32,7 @@ pythonPackages.buildPythonApplication rec {
   meta = with stdenv.lib; {
     homepage = https://github.com/pimutils/vdirsyncer;
     description = "Synchronize calendars and contacts";
-    maintainers = with maintainers; [ matthiasbeyer jgeerds DamienCassou ];
+    maintainers = with maintainers; [ matthiasbeyer jgeerds ];
     platforms = platforms.all;
     license = licenses.mit;
   };
diff --git a/pkgs/tools/networking/asynk/default.nix b/pkgs/tools/networking/asynk/default.nix
index 9c381bea65d..de8bcc8e7ff 100644
--- a/pkgs/tools/networking/asynk/default.nix
+++ b/pkgs/tools/networking/asynk/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     homepage = http://asynk.io/;
     description = "Flexible contacts synchronization program";
     license = licenses.agpl3;
-    maintainers = [ maintainers.DamienCassou ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/typesetting/git-latexdiff/default.nix b/pkgs/tools/typesetting/git-latexdiff/default.nix
index 9dc73886b5a..61c05666726 100644
--- a/pkgs/tools/typesetting/git-latexdiff/default.nix
+++ b/pkgs/tools/typesetting/git-latexdiff/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "View diff on LaTeX source files on the generated PDF files";
-    maintainers = [ maintainers.DamienCassou ];
+    maintainers = [ ];
     license = licenses.free; # https://gitlab.com/git-latexdiff/git-latexdiff/issues/9
     platforms = platforms.unix;
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 081448e0d82..11b24891fdb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3819,7 +3819,7 @@ in {
       homepage = https://github.com/click-contrib/click-log/;
       description = "Logging integration for Click";
       license = licenses.mit;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
     };
   };
 
@@ -3846,7 +3846,7 @@ in {
       homepage = https://github.com/click-contrib/click-threading/;
       description = "Multithreaded Click apps made easy";
       license = licenses.mit;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
     };
   };
 
@@ -7403,7 +7403,7 @@ in {
       homepage = https://github.com/matlink/gplaycli;
       description = "Google Play Downloader via Command line";
       license = licenses.agpl3Plus;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
     };
   };
 
@@ -8365,7 +8365,7 @@ in {
       homepage = https://github.com/cedadev/ndg_httpsclient/;
       description = "Provide enhanced HTTPS support for httplib and urllib2 using PyOpenSSL";
       license = licenses.bsd2;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
     };
   };
 
@@ -8620,7 +8620,7 @@ in {
       description = "Tool for extracting information from PDF documents";
       homepage = http://euske.github.io/pdfminer/index.html;
       license = licenses.mit;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
     };
   };
 
@@ -11129,7 +11129,7 @@ in {
     meta = {
       homepage = https://f-droid.org;
       description = "Server and tools for F-Droid, the Free Software repository system for Android";
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
       license = licenses.agpl3;
     };
   };
@@ -15052,7 +15052,7 @@ in {
     meta = {
       homepage = https://github.com/aroig/mutag;
       license = licenses.gpl3;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
     };
   };
 
@@ -15157,7 +15157,7 @@ in {
 
     meta = {
       description = "Python client library to the MediaWiki API";
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
       license = licenses.mit;
       homepage = https://github.com/mwclient/mwclient;
     };
@@ -19547,7 +19547,7 @@ in {
       description = "Module for reading vCard and vCalendar files";
       homepage = http://eventable.github.io/vobject/;
       license = licenses.asl20;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
     };
   };
 
@@ -19568,7 +19568,7 @@ in {
       description = "Command-line interface carddav client";
       homepage = http://lostpackets.de/pycarddav;
       license = licenses.mit;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
     };
   };
 
@@ -20409,7 +20409,7 @@ in {
       description = "Media Meta Data retrieval framework";
       homepage = http://sourceforge.net/projects/mmpython/;
       license = licenses.gpl2;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
     };
   };
 
@@ -20452,7 +20452,7 @@ in {
       description = "Generic application framework, providing the foundation for other modules";
       homepage = https://github.com/freevo/kaa-base;
       license = licenses.lgpl21;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
     };
   };
 
@@ -20499,7 +20499,7 @@ in {
       description = "Python library for parsing media metadata, which can extract metadata (e.g., such as id3 tags) from a wide range of media files";
       homepage = https://github.com/freevo/kaa-metadata;
       license = licenses.gpl2;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
     };
   };
 
@@ -23561,7 +23561,7 @@ in {
       description = "A Parser Generator for Python";
       homepage = https://pypi.python.org/pypi/SimpleParse;
       platforms = platforms.all;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
     };
   };
 
@@ -25033,7 +25033,7 @@ in {
       description = "Tool for automatic download/upload subtitles for videofiles using fast hashing";
       homepage = http://www.subdownloader.net;
       license = licenses.gpl3;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
     };
   };
 
@@ -25171,7 +25171,7 @@ in {
 
     meta = {
       description = " GTK3 & python based GUI for Syncthing ";
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
       platforms = pkgs.syncthing.meta.platforms;
       homepage = "https://github.com/syncthing/syncthing-gtk";
       license = licenses.gpl2;
@@ -27843,7 +27843,7 @@ EOF
       homepage = https://github.com/scs3jb/screenkey;
       description = "A screencast tool to show your keys";
       license = licenses.gpl3Plus;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
       platforms = platforms.linux;
     };
   };
@@ -29361,7 +29361,7 @@ EOF
       homepage = http://weboob.org;
       description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser";
       license = licenses.agpl3;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
     };
   };
 

From eb92d10e1dc76f26f9e327934b121ef0d96f8217 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Tue, 31 Jan 2017 18:38:20 +0800
Subject: [PATCH 158/899] rockbox_utility: use qt5 instead of qt4

---
 pkgs/tools/misc/rockbox-utility/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix
index 3bf704ca68e..7ef6d2ce7ed 100644
--- a/pkgs/tools/misc/rockbox-utility/default.nix
+++ b/pkgs/tools/misc/rockbox-utility/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libusb1, qt4, qmake4Hook }:
+{ stdenv, fetchurl, libusb1, qt5 }:
 
 stdenv.mkDerivation  rec {
   name = "rockbox-utility-${version}";
@@ -9,16 +9,15 @@ stdenv.mkDerivation  rec {
     sha256 = "0k3ycga3b0jnj13whwiip2l0gx32l50pnbh7kfima87nq65aaa5w";
   };
 
-  buildInputs = [ libusb1 qt4 ];
-  nativeBuildInputs = [ qmake4Hook ];
+  buildInputs = [ libusb1 ] ++ (with qt5; [ qtbase qttools ]);
+  nativeBuildInputs = [ qt5.qmakeHook ];
 
   preConfigure = ''
     cd rbutil/rbutilqt
   '';
 
   installPhase = ''
-    mkdir -p $out/bin 
-    cp RockboxUtility $out/bin
+    install -Dm755 RockboxUtility $out/bin/RockboxUtility
   '';
 
   meta = with stdenv.lib; {

From dacbca273007fad83a22fc51b33b2350ed7094c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 31 Jan 2017 12:53:24 +0100
Subject: [PATCH 159/899] knot-dns: yet another attempt to fix build on Darwin

---
 pkgs/servers/dns/knot-dns/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 834d9a09b5b..c7b2032a579 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnutls, jansson, liburcu, lmdb, libcap_ng, libidn
-, systemd, nettle, libedit, zlib, libiconv
+, systemd, nettle, libedit, zlib, libiconv, fetchpatch
 }:
 
 # Note: ATM only the libraries have been tested in nixpkgs.
@@ -12,6 +12,13 @@ stdenv.mkDerivation rec {
     sha256 = "0y9nhp9lfmxv4iy1xg7l4lfxv4168qhag26wwg0dbi0zjpkd790b";
   };
 
+  patches = stdenv.lib.optional stdenv.isDarwin
+      (fetchpatch {
+        name = "before-sierra.diff";
+        url = "https://gitlab.labs.nic.cz/labs/knot/merge_requests/664.diff";
+        sha256 = "0g4gm2m3pi0lfpkp53xayf6jq6yn3ifidh40maiy1a46dfadvw6w";
+      });
+
   outputs = [ "bin" "out" "dev" ];
 
   nativeBuildInputs = [ pkgconfig ];
@@ -27,7 +34,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  CFLAGS = [ "-DNDEBUG" ];
+  CFLAGS = [ "-O2" "-DNDEBUG" ];
 
   #doCheck = true; problems in combination with dynamic linking
 

From 904bcb391dc41717fedeefc07c63b5f8c4e6b88a Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 29 Jan 2017 14:10:44 +0100
Subject: [PATCH 160/899] yaft: init at 0.2.9

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

diff --git a/pkgs/applications/misc/yaft/default.nix b/pkgs/applications/misc/yaft/default.nix
new file mode 100644
index 00000000000..d273d27944a
--- /dev/null
+++ b/pkgs/applications/misc/yaft/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, ncurses }:
+
+stdenv.mkDerivation rec {
+  version = "0.2.9";
+  name = "yaft-${version}";
+
+  src = fetchFromGitHub {
+    owner = "uobikiemukot";
+    repo = "yaft";
+    rev = "v${version}";
+    sha256 = "0l1ig8wm545kpn4l7186rymny83jkahnjim290wsl7hsszfq1ckd";
+  };
+
+  buildInputs = [ ncurses ];
+
+  installFlags = [ "PREFIX=$(out)" "MANPREFIX=$(out)/share/man" ];
+
+  meta = {
+    homepage = https://github.com/uobikiemukot/yaft;
+    description = "Yet another framebuffer terminal";
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d4c71c6c8fa..b97b527998b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4531,6 +4531,8 @@ with pkgs;
 
   xwinmosaic = callPackage ../tools/X11/xwinmosaic {};
 
+  yaft = callPackage ../applications/misc/yaft { };
+
   yarn = callPackage ../development/tools/yarn  { };
 
   yank = callPackage ../tools/misc/yank { };

From 338dcba251d2b2fb245db95be233db6aaa56ed86 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Tue, 31 Jan 2017 20:34:14 +0800
Subject: [PATCH 161/899] krename-qt5: init at 20161228

Upstream hasn't made a proper release based on qt5/kf5, so I'm adding this
package in addition to the kde4 based package instead of replacing it.
---
 .../misc/krename/{default.nix => kde4.nix}    |  0
 pkgs/applications/misc/krename/kde5.nix       | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++-
 3 files changed, 38 insertions(+), 1 deletion(-)
 rename pkgs/applications/misc/krename/{default.nix => kde4.nix} (100%)
 create mode 100644 pkgs/applications/misc/krename/kde5.nix

diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/kde4.nix
similarity index 100%
rename from pkgs/applications/misc/krename/default.nix
rename to pkgs/applications/misc/krename/kde4.nix
diff --git a/pkgs/applications/misc/krename/kde5.nix b/pkgs/applications/misc/krename/kde5.nix
new file mode 100644
index 00000000000..a2137060ef6
--- /dev/null
+++ b/pkgs/applications/misc/krename/kde5.nix
@@ -0,0 +1,35 @@
+{
+  kdeDerivation, kdeWrapper, fetchFromGitHub, lib,
+  ecm, kdoctools, kconfig, kinit, kjsembed,
+  taglib, exiv2, podofo
+}:
+
+let
+  pname = "krename";
+  version = "20161228";
+  unwrapped = kdeDerivation rec {
+    name = "${pname}-${version}";
+
+    src = fetchFromGitHub {
+      owner  = "KDE";
+      repo   = "krename";
+      rev    = "4e55c2bef50898eb4a6485ce068379b166121895";
+      sha256 = "09yz3sxy2l6radfybkj2f7224ggf315vnvyksk0aq8f03gan6cbp";
+    };
+
+    meta = with lib; {
+      homepage = http://www.krename.net;
+      description = "A powerful batch renamer for KDE";
+      inherit (kconfig.meta) platforms;
+      maintainers = with maintainers; [ urkud peterhoeg ];
+    };
+
+    buildInputs = [ taglib exiv2 podofo ];
+    nativeBuildInputs = [ ecm kdoctools ];
+    propagatedBuildInputs = [ kconfig kinit kjsembed ];
+  };
+
+in kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/krename" ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28668e0fc1c..d2b4429b7ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2415,6 +2415,8 @@ with pkgs;
 
   kpcli = callPackage ../tools/security/kpcli { };
 
+  krename-qt5 = qt5.callPackage ../applications/misc/krename/kde5.nix { };
+
   kronometer = qt5.callPackage ../tools/misc/kronometer { };
 
   peruse = qt5.callPackage ../tools/misc/peruse { };
@@ -16593,7 +16595,7 @@ with pkgs;
 
           kvirc = callPackage ../applications/networking/irc/kvirc { };
 
-          krename = callPackage ../applications/misc/krename {
+          krename = callPackage ../applications/misc/krename/kde4.nix {
             taglib = taglib_1_9;
           };
 

From ace284ee9510a8058680425079ea7a3663f14281 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 31 Jan 2017 07:54:02 -0600
Subject: [PATCH 162/899] es: git-2015-04-11 -> 0.9.1

---
 pkgs/shells/es/default.nix | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/pkgs/shells/es/default.nix b/pkgs/shells/es/default.nix
index 037d1e1ec99..62883a1c545 100644
--- a/pkgs/shells/es/default.nix
+++ b/pkgs/shells/es/default.nix
@@ -1,34 +1,28 @@
-{ stdenv, fetchgit, readline, yacc, autoconf, automake, libtool }:
+{ stdenv, fetchurl, readline, yacc }:
 
 let
-  version = "git-2015-04-11";
+  version = "0.9.1";
 in
 stdenv.mkDerivation {
 
   name = "es-${version}";
 
-  src = fetchgit {
-    url = "git://github.com/wryun/es-shell";
-    rev = "fdf29d5296ce3a0ef96d2b5952cff07878753975";
-    sha256 = "12faa9b5ffwydgwyjp57zr19sqap2ma3crj6wd2rx1hv30dkll7p";
+  src = fetchurl {
+    url = "https://github.com/wryun/es-shell/releases/download/v${version}/es-${version}.tar.gz";
+    sha256 = "1fplzxc6lncz2lv2fyr2ig23rgg5j96rm2bbl1rs28mik771zd5h";
   };
 
-  buildInputs = [ readline yacc libtool autoconf automake ];
-
-  preConfigure =
-    ''
-      aclocal
-      autoconf
-      libtoolize -qi
-    '';
-
-  configureFlags="--with-readline --prefix=$(out) --bindir=$(out)/bin --mandir=$(out)/man";
-
-  preInstall = ''
-    mkdir -p $out/bin
-    mkdir -p $out/man/man1
+  # The distribution tarball does not have a single top-level directory.
+  preUnpack = ''
+    mkdir $name
+    cd $name
+    sourceRoot=.
   '';
 
+  buildInputs = [ readline yacc ];
+
+  configureFlags = [ "--with-readline" ];
+
   meta = with stdenv.lib; {
     description = "Es is an extensible shell";
     longDescription =

From a2e1aecc0c56205762e1982aecee977c59a35d8d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 31 Jan 2017 07:54:36 -0600
Subject: [PATCH 163/899] es: add ttuegel to maintainers

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

diff --git a/pkgs/shells/es/default.nix b/pkgs/shells/es/default.nix
index 62883a1c545..789ddaf4d9b 100644
--- a/pkgs/shells/es/default.nix
+++ b/pkgs/shells/es/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
       '';
     homepage = http://wryun.github.io/es-shell/;
     license = licenses.publicDomain;
-    maintainers = [ maintainers.sjmackenzie ];
+    maintainers = with maintainers; [ sjmackenzie ttuegel ];
     platforms = platforms.all;
   };
 

From a3517bf32129e989fb4a3cd932b8ca4945045dba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 31 Jan 2017 16:14:25 +0100
Subject: [PATCH 164/899] lmdb: get rid of $out/man

Why it's annoying: #22318.
---
 pkgs/development/libraries/lmdb/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix
index 80019d52f4f..14c30a30812 100644
--- a/pkgs/development/libraries/lmdb/default.nix
+++ b/pkgs/development/libraries/lmdb/default.nix
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
   checkPhase = "make test";
 
   preInstall = ''
-    mkdir -p $out/{man/man1,bin,lib,include}
+    mkdir -p $out/{bin,lib,include}
   '';
 
   meta = with stdenv.lib; {

From 53bfe0cafebfd3ce5764859470e9042103b456a7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 31 Jan 2017 16:57:57 +0100
Subject: [PATCH 165/899] bitlbee: 3.5 -> 3.5.1 for multiple CVEs

Fixes:

  * CVE-2016-10188
  * CVE-2016-10189
  * CVE-2017-5668
---
 .../networking/instant-messengers/bitlbee/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index 8b0dda1694d..5ee93bd4df5 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -2,11 +2,11 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "bitlbee-3.5";
+  name = "bitlbee-3.5.1";
 
   src = fetchurl {
     url = "mirror://bitlbee/src/${name}.tar.gz";
-    sha256 = "06c371bjly38yrkvfwdh5rjfx9xfl7bszyhrlbldy0xk38c057al";
+    sha256 = "0sgsn0fv41rga46mih3fyv65cvfa6rvki8x92dn7bczbi7yxfdln";
   };
 
   nativeBuildInputs = [ pkgconfig ] ++ optional doCheck check;

From c6b0c8513d7c9a3c10237c9ce96548114f94067e Mon Sep 17 00:00:00 2001
From: Pradeep Chhetri <pradeep.chhetri89@gmail.com>
Date: Tue, 31 Jan 2017 21:28:09 +0530
Subject: [PATCH 166/899] consul: 0.7.0 -> 0.7.3

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

diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index f0501fa57d6..25482b2b388 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "consul-${version}";
-  version = "0.7.0";
+  version = "0.7.3";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/consul";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "hashicorp";
     repo = "consul";
     inherit rev;
-    sha256 = "04h5y5vixjh9np9lsrk02ypbqwcq855h7l1jlnl1vmfq3sfqjds7";
+    sha256 = "0ab84sm281ibl9h6zfk17mr7yc9vxpi8i2xb4kzi8bg43n05lj4d";
   };
 
   # Keep consul.ui for backward compatability

From ca593a729346640d5063cfae6484b85596240ba4 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 31 Jan 2017 17:00:13 +0100
Subject: [PATCH 167/899] libarchive: add patch to fix CVE-2017-5601

---
 pkgs/development/libraries/libarchive/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 3ee35e5bf57..89e2762e3cc 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -17,6 +17,13 @@ stdenv.mkDerivation rec {
     sha256 = "03q6y428rg723c9fj1vidzjw46w1vf8z0h95lkvz1l9jw571j739";
   };
 
+  patches = [
+    (fetchurl {
+      url = "https://github.com/libarchive/libarchive/commit/98dcbbf0bf4854bf987557e55e55fff7abbf3ea9.patch";
+      sha256 = "1934krf5imc9rq1av6immpsfn77pglanhz1csq8j22h9ab87n5z6";
+    })
+  ];
+
   outputs = [ "out" "lib" "dev" ];
 
   nativeBuildInputs = [ pkgconfig ];

From 44cbb0f54dbef38c3cf96615f93b86961aac971b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 31 Jan 2017 17:16:53 +0100
Subject: [PATCH 168/899] tcpdump: 4.8.1 -> 4.9.0 for multiple CVEs

Temporarily use the Debian mirros for the sources because upstream hasn't
released the new version. See https://www.debian.org/security/2017/dsa-3775.

Fixes: CVE-2016-7922, CVE-2016-7923, CVE-2016-7924, CVE-2016-7925,
CVE-2016-7926, CVE-2016-7927, CVE-2016-7928, CVE-2016-7929, CVE-2016-7930,
CVE-2016-7931, CVE-2016-7932, CVE-2016-7933, CVE-2016-7934, CVE-2016-7935,
CVE-2016-7936, CVE-2016-7937, CVE-2016-7938, CVE-2016-7939, CVE-2016-7940,
CVE-2016-7973, CVE-2016-7974, CVE-2016-7975, CVE-2016-7983, CVE-2016-7984,
CVE-2016-7985, CVE-2016-7986, CVE-2016-7992, CVE-2016-7993, CVE-2016-8574,
CVE-2016-8575, CVE-2017-5202, CVE-2017-5203, CVE-2017-5204, CVE-2017-5205,
CVE-2017-5341, CVE-2017-5342, CVE-2017-5482, CVE-2017-5483, CVE-2017-5484,
CVE-2017-5485, CVE-2017-5486.
---
 pkgs/tools/networking/tcpdump/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix
index f51f345d1dd..42cb3867e05 100644
--- a/pkgs/tools/networking/tcpdump/default.nix
+++ b/pkgs/tools/networking/tcpdump/default.nix
@@ -1,11 +1,13 @@
 { stdenv, fetchurl, libpcap, enableStatic ? false }:
 
 stdenv.mkDerivation rec {
-  name = "tcpdump-4.8.1";
+  name = "tcpdump-${version}";
+  version = "4.9.0";
 
   src = fetchurl {
-    url = "http://www.tcpdump.org/release/${name}.tar.gz";
-    sha256 = "0743ipl0l7ymjss3ybvvc5cbk9kb7s8yl4p3ramp5kwgqhg39r10";
+    #url = "http://www.tcpdump.org/release/${name}.tar.gz";
+    url = "mirror://debian/pool/main/t/tcpdump/tcpdump_${version}.orig.tar.gz";
+    sha256 = "0pjsxsy8l71i813sa934cwf1ryp9xbr7nxwsvnzavjdirchq3sga";
   };
 
   buildInputs = [ libpcap ];

From 05f53b83b4a1e7dd105898a2c024ee9d5629d4e4 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 31 Jan 2017 17:29:30 +0100
Subject: [PATCH 169/899] netcdf: 4.3.3.1 -> 4.4.1.1

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

diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix
index 5e296e8d754..e7c64b9a76d 100644
--- a/pkgs/development/libraries/netcdf/default.nix
+++ b/pkgs/development/libraries/netcdf/default.nix
@@ -9,10 +9,10 @@ let
   mpiSupport = hdf5.mpiSupport;
   mpi = hdf5.mpi;
 in stdenv.mkDerivation rec {
-    name = "netcdf-4.3.3.1";
+    name = "netcdf-4.4.1.1";
     src = fetchurl {
         url = "http://www.unidata.ucar.edu/downloads/netcdf/ftp/${name}.tar.gz";
-        sha256 = "06ds8zm4qvjlqvv4qb637cqr0xgvbhnghrddisad5vj81s5kvpmx";
+        sha256 = "1blc7ik5yin7i0ls2kag0a9xjk12m0dzx6v1x88az3ras3scci2d";
     };
 
     buildInputs = [ hdf5 m4 curl mpi];

From fa1e8ffa761108c560c5222b594be7a8a2b7f7b8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 31 Jan 2017 10:34:47 -0600
Subject: [PATCH 170/899] spotify: 1.0.47 -> 1.0.48

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

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 9e310d6e4e4..b678380f12d 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -6,7 +6,7 @@ assert stdenv.system == "x86_64-linux";
 
 let
   # Please update the stable branch!
-  version = "1.0.47.13.gd8e05b1f-47";
+  version = "1.0.48.103.g15edf1ec-94";
 
   deps = [
     alsaLib
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
   src =
     fetchurl {
       url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
-      sha256 = "0079vq2nw07795jyqrjv68sc0vqjy6abjh6jjd5cg3hqlxdf4ckz";
+      sha256 = "0rpwxgxv2ihfhlri98k4n87ynlcp569gm9q6hd8jg0vd2jgji8b3";
     };
 
   buildInputs = [ dpkg makeWrapper ];

From 73f07ecb28a6ae4ac195e351335d15717fba3511 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 31 Jan 2017 12:02:46 -0500
Subject: [PATCH 171/899] nix-exec: 4.1.5 -> 4.1.6

Closes #22316
---
 pkgs/development/interpreters/nix-exec/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix
index ad585f085db..296176148c7 100644
--- a/pkgs/development/interpreters/nix-exec/default.nix
+++ b/pkgs/development/interpreters/nix-exec/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, nix, git }: let
-  version = "4.1.5";
+  version = "4.1.6";
 in stdenv.mkDerivation {
   name = "nix-exec-${version}";
 
   src = fetchurl {
     url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz";
 
-    sha256 = "1npy1did5ysacshclpfxihgh5bc0i9jqmvgxi1fp8prhcdhall9m";
+    sha256 = "0slpsnzzzdkf5d9za7j4kr15jr4mn1k9klfsxibzy47b2bx1vkar";
   };
 
   buildInputs = [ pkgconfig nix git ];

From f2961ac736e2010078f277e64927f9ca9181647b Mon Sep 17 00:00:00 2001
From: Pradeep Chhetri <pradeep.chhetri89@gmail.com>
Date: Tue, 31 Jan 2017 23:19:50 +0530
Subject: [PATCH 172/899] minio: 20161213 -> 20170125

---
 pkgs/servers/minio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index e7b6fff1b66..bc2bbb13c44 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
   name = "minio-${shortVersion}";
 
-  shortVersion = "20161213";
-  longVersion = "2016-12-13T17:19:42Z";
+  shortVersion = "20170125";
+  longVersion = "2017-01-25T03-14-52Z";
 
   src = fetchurl {
     url = "https://github.com/minio/minio/archive/RELEASE.${lib.replaceStrings [":"] ["-"] longVersion}.tar.gz";
-    sha256 = "1x23arrah54q2zqhgpyag531mimvs0wx6ap0hdrn4mygy5dahrqs";
+    sha256 = "0yh8fdgl50sza182kl4jly0apf0dw0ya954ky6j8a8hmdcmk6wzk";
   };
 
   buildInputs = [ go ];

From 551c52f1a24e20fb66546229c4a819cfbe806504 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 31 Jan 2017 20:10:49 +0000
Subject: [PATCH 173/899] feh: 2.17.1 -> 2.18.1

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

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 40fe178d625..5b385f2acbf 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -2,11 +2,11 @@
 , curl, libexif, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "feh-2.17.1";
+  name = "feh-2.18.1";
 
   src = fetchurl {
     url = "http://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "0lyq17kkmjxj3vxpmri56linr1bnfmx5568pgrcjgd3amnj1is59";
+    sha256 = "1ck55rhh5ax1d9k9gy2crvyjwffh6028f4kxaisd8ymgbql40f2c";
   };
 
   outputs = [ "out" "doc" ];

From 887590e1d260bb5fba8ca1c5861d69b5987723ab Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Tue, 31 Jan 2017 18:41:23 +0800
Subject: [PATCH 174/899] wireshark: use cmake and move to gtk3/qt5

wireshark used to use autotools, but instead we now use cmake. The
change alone brought to light a few missing required dependencies.

Additionally, wireshark was using gtk2 and qt4, so that has changed to
gtk3 and qt5.
---
 .../networking/sniffers/wireshark/default.nix | 65 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 28 insertions(+), 38 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 56fe9859caa..d3c3b278607 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,22 +1,21 @@
-{ stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares
-, gnutls, libgcrypt, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib
-, zlib
-, withGtk ? false, gtk2 ? null, pango ? null, cairo ? null, gdk_pixbuf ? null
-, withQt ? false, qt4 ? null
+{ stdenv, lib, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
+, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib
+, libssh, zlib, cmake, ecm
+, withGtk ? false, gtk3 ? null, pango ? null, cairo ? null, gdk_pixbuf ? null
+, withQt ? false, qt5 ? null
 , ApplicationServices, SystemConfiguration, gmp
 }:
 
-assert withGtk -> !withQt && gtk2 != null;
-assert withQt -> !withGtk && qt4 != null;
+assert withGtk -> !withQt  && gtk3 != null;
+assert withQt  -> !withGtk && qt5  != null;
 
 with stdenv.lib;
 
 let
   version = "2.2.4";
   variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
-in
 
-stdenv.mkDerivation {
+in stdenv.mkDerivation {
   name = "wireshark-${variant}-${version}";
 
   src = fetchurl {
@@ -25,45 +24,35 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    bison flex perl pkgconfig libpcap lua5 openssl libgcrypt gnutls
+    bison cmake ecm flex gettext pcre perl pkgconfig libpcap lua5 libssh openssl libgcrypt libgpgerror gnutls
     geoip c-ares python glib zlib
-  ] ++ optional withQt qt4
-    ++ (optionals withGtk [gtk2 pango cairo gdk_pixbuf])
-    ++ optionals stdenv.isLinux [ libcap libnl ]
+  ] ++ (optionals withQt  (with qt5; [ qtbase qtmultimedia qtsvg qttools ]))
+    ++ (optionals withGtk [ gtk3 pango cairo gdk_pixbuf ])
+    ++ optionals stdenv.isLinux  [ libcap libnl ]
     ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ];
 
   patches = [ ./wireshark-lookup-dumpcap-in-path.patch ];
 
-  configureFlags = "--disable-usr-local --disable-silent-rules --with-ssl"
-    + (if withGtk then
-         " --with-gtk2 --without-gtk3 --without-qt"
-       else if withQt then
-         " --without-gtk2 --without-gtk3 --with-qt"
-       else " --disable-wireshark");
-
-  desktopItem = makeDesktopItem {
-    name = "Wireshark";
-    exec = "wireshark";
-    icon = "wireshark";
-    comment = "Powerful network protocol analysis suite";
-    desktopName = "Wireshark";
-    genericName = "Network packet analyzer";
-    categories = "Network;System";
-  };
-
   postInstall = optionalString (withQt || withGtk) ''
-    mkdir -p "$out"/share/applications/
-    mkdir -p "$out"/share/icons/
-    cp "$desktopItem/share/applications/"* "$out/share/applications/"
-    cp image/wsicon.svg "$out"/share/icons/wireshark.svg
+    ${optionalString withGtk ''
+      install -Dm644 -t $out/share/applications ../wireshark-gtk.desktop
+    ''}
+    ${optionalString withQt ''
+      install -Dm644 -t $out/share/applications ../wireshark.desktop
+    ''}
+
+    substituteInPlace $out/share/applications/*.desktop \
+      --replace "Exec=wireshark" "Exec=$out/bin/wireshark"
+
+    install -Dm644 ../image/wsicon.svg $out/share/icons/wireshark.svg
   '';
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.wireshark.org/;
     description = "Powerful network protocol analyzer";
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
 
     longDescription = ''
       Wireshark (formerly known as "Ethereal") is a powerful network
@@ -71,7 +60,7 @@ stdenv.mkDerivation {
       experts. It runs on UNIX, OS X and Windows.
     '';
 
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ bjornfor fpletz ];
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ bjornfor fpletz ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b97b527998b..90e44c9819a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13273,6 +13273,7 @@ with pkgs;
     withGtk = false;
     inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration;
   };
+  # The GTK UI is deprecated by upstream. You probably want the QT version.
   wireshark-gtk = wireshark-cli.override { withGtk = true; };
   wireshark-qt = wireshark-cli.override { withQt = true; };
   wireshark = wireshark-qt;

From 10349e72b91962c838719d4859a5e7cf05f10946 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 31 Jan 2017 22:37:18 +0100
Subject: [PATCH 175/899] nixos: drop unused 'haskellPackages' option from
 ihaskell service

Closes https://github.com/NixOS/nixpkgs/issues/19039.
---
 nixos/modules/services/misc/ihaskell.nix | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix
index d0e9b839e75..df7b9be0db5 100644
--- a/nixos/modules/services/misc/ihaskell.nix
+++ b/nixos/modules/services/misc/ihaskell.nix
@@ -20,18 +20,6 @@ in
         description = "Autostart an IHaskell notebook service.";
       };
 
-      haskellPackages = mkOption {
-        default = pkgs.haskellPackages;
-        defaultText = "pkgs.haskellPackages";
-        example = literalExample "pkgs.haskell.packages.ghc784";
-        description = ''
-          haskellPackages used to build IHaskell and other packages.
-          This can be used to change the GHC version used to build
-          IHaskell and the packages listed in
-          <varname>extraPackages</varname>.
-        '';
-      };
-
       extraPackages = mkOption {
         default = self: [];
         example = literalExample ''

From 7680786f9063af59ecf203149f7c8c330071239a Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 31 Jan 2017 22:11:36 +0100
Subject: [PATCH 176/899] pythonPackages.pep257: 0.3.2 -> 0.7.0

---
 pkgs/development/python-modules/pep257.nix | 23 ++++++++++++++++++++++
 pkgs/top-level/python-packages.nix         | 23 +---------------------
 2 files changed, 24 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/python-modules/pep257.nix

diff --git a/pkgs/development/python-modules/pep257.nix b/pkgs/development/python-modules/pep257.nix
new file mode 100644
index 00000000000..f185019b0f7
--- /dev/null
+++ b/pkgs/development/python-modules/pep257.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchurl, pytest, mock }:
+buildPythonPackage rec {
+  name = "pep257-${version}";
+  version = "0.7.0";
+
+  src = fetchurl {
+    url = "https://github.com/GreenSteam/pep257/archive/${version}.tar.gz";
+    sha256 = "1ldpgil0kaf6wz5gvl9xdx35a62vc6bmgi3wbh9320dj5v2qk4wh";
+  };
+
+  buildInputs = [ pytest mock ];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/GreenSteam/pep257/;
+    description = "Python docstring style checker";
+    longDescription = "Static analysis tool for checking compliance with Python PEP 257.";
+    lecense = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 11b24891fdb..f25937f4b23 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18419,28 +18419,7 @@ in {
     };
   };
 
-  pep257 = buildPythonPackage rec {
-    name = "pep257-${version}";
-    version = "0.3.2";
-
-    src = pkgs.fetchurl {
-      url = "https://github.com/GreenSteam/pep257/archive/${version}.tar.gz";
-      sha256 = "0v8aq0xzsa7clazszxl42904c3jpq69lg8a5hg754bqcqf72hfrn";
-    };
-    LC_ALL="en_US.UTF-8";
-    buildInputs = with self; [ pkgs.glibcLocales pytest_29 ];
-
-    checkPhase = ''
-      py.test
-    '';
-
-    meta = {
-      homepage = https://github.com/GreenSteam/pep257/;
-      description = "Python docstring style checker";
-      longDescription = "Static analysis tool for checking compliance with Python PEP 257.";
-      lecense = licenses.mit;
-    };
-  };
+  pep257 = callPackage ../development/python-modules/pep257.nix { };
 
   percol = buildPythonPackage rec {
     name = "percol-${version}";

From 3b26c2f465c35019a4ab3f35a2c0f6584bd18727 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 31 Jan 2017 22:49:02 +0100
Subject: [PATCH 177/899] callHackage: update Hackage snapshot to a current
 version

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

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 95296108618..447fc1a94bd 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -6,6 +6,6 @@
 fetchFromGitHub {
   owner = "commercialhaskell";
   repo = "all-cabal-hashes";
-  rev = "5c5b04af472eb6c2854b21cb52ee6324252280de";
-  sha256 = "1cnr350044yrlg7wa09fmdarl7y9gkydh25lv94wcqg3w9cdv0fb";
+  rev = "a7e72af80fb1e68d9a2c4a5927a253b71ed68239";
+  sha256 = "1ppk5r7yllvibsgxgs7k9kb2dcwh4pphf0876hcdh392cal47h3x";
 }

From 5e57536ace8eefe6886ee3e98b3d089226ed1c5f Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Tue, 31 Jan 2017 22:27:09 +0100
Subject: [PATCH 178/899] pythonPackages.lpod: fix missing dependency

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 11b24891fdb..773b3d66a13 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8173,7 +8173,7 @@ in {
     # lpod library currently does not support Python 3.x
     disabled = isPy3k;
 
-    propagatedBuildInputs = with self; [ ];
+    propagatedBuildInputs = with self; [ lxml docutils pillow ];
 
     src = pkgs.fetchFromGitHub {
       owner = "lpod";

From 1426779072a5396107b63ee6b6ba3e449816535c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 31 Jan 2017 12:44:57 +0300
Subject: [PATCH 179/899] portmap: remove

rpcbind is used instead
---
 pkgs/servers/portmap/default.nix        | 45 -------------------------
 pkgs/servers/portmap/reuse-socket.patch | 38 ---------------------
 pkgs/top-level/all-packages.nix         |  2 --
 pkgs/top-level/release-small.nix        |  2 +-
 4 files changed, 1 insertion(+), 86 deletions(-)
 delete mode 100644 pkgs/servers/portmap/default.nix
 delete mode 100644 pkgs/servers/portmap/reuse-socket.patch

diff --git a/pkgs/servers/portmap/default.nix b/pkgs/servers/portmap/default.nix
deleted file mode 100644
index e53690ebc11..00000000000
--- a/pkgs/servers/portmap/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ fetchurl, stdenv, lib, tcp_wrappers
-, daemonUser ? false, daemonUID ? false, daemonGID ? false }:
-
-assert daemonUser -> (!daemonUID && !daemonGID);
-
-stdenv.mkDerivation rec {
-  name = "portmap-6.0";
-  
-  src = fetchurl {
-    url = "http://neil.brown.name/portmap/${name}.tgz";
-    sha256 = "1pj13ll4mbfwjwpn3fbg03qq9im6v2i8fcpa3ffp4viykz9j1j02";
-  };
-
-  patches = [ ./reuse-socket.patch ];
-
-  postPatch = ''
-    substituteInPlace "Makefile" --replace "/usr/share" "" \
-      --replace "install -o root -g root" "install"
-  '';
-
-  makeFlags =
-    lib.optional (daemonUser != false) "RPCUSER=\"${daemonUser}\""
-    ++ lib.optional (daemonUID != false) "DAEMON_UID=${toString daemonUID}"
-    ++ lib.optional (daemonGID != false) "DAEMON_GID=${toString daemonGID}";
-
-  buildInputs = [ tcp_wrappers ];
-
-  installPhase = ''
-    mkdir -p "$out/sbin" "$out/man/man8"
-    make install BASEDIR=$out
-  '';
-
-  meta = {
-    description = "ONC RPC portmapper";
-    longDescription = ''
-      Portmap is part of the ONC RPC software collection implementing
-      remote procedure calls (RPCs) between computer programs.  It is
-      widely used by NFS and NIS, among others.
-    '';
-
-    homepage = http://neil.brown.name/portmap/;
-    license = "BSD";
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/servers/portmap/reuse-socket.patch b/pkgs/servers/portmap/reuse-socket.patch
deleted file mode 100644
index 7d1a0ca0952..00000000000
--- a/pkgs/servers/portmap/reuse-socket.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Set SO_REUSEADDR to ensure that portmap can restart properly.
-
-https://bugs.launchpad.net/ubuntu/+source/portmap/+bug/688550
-
-===================================================================
---- portmap-6.0.0.orig/portmap.c	2011-03-16 20:43:26.000000000 +0100
-+++ portmap-6.0.0/portmap.c	2011-03-17 07:30:17.000000000 +0100
-@@ -142,9 +142,9 @@
-   * loopback interface address.
-   */
- 
-+static int on = 1;
- #ifdef LOOPBACK_SETUNSET
- static SVCXPRT *ludpxprt, *ltcpxprt;
--static int on = 1;
- #ifndef INADDR_LOOPBACK
- #define INADDR_LOOPBACK ntohl(inet_addr("127.0.0.1"))
- #endif
-@@ -399,9 +399,7 @@
- 		syslog(LOG_ERR, "cannot create udp socket: %m");
- 		exit(1);
- 	}
--#ifdef LOOPBACK_SETUNSET
- 	setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof on);
--#endif
- 
- 	memset((char *) &addr, 0, sizeof(addr));
- 	addr.sin_addr.s_addr = 0;
-@@ -434,9 +432,7 @@
- 		syslog(LOG_ERR, "cannot create tcp socket: %m");
- 		exit(1);
- 	}
--#ifdef LOOPBACK_SETUNSET
- 	setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof on);
--#endif
- 	if (bind(sock, (struct sockaddr *)&addr, len) != 0) {
- 		syslog(LOG_ERR, "cannot bind tcp: %m");
- 		exit(1);
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c6566bb5710..c8dc9880740 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10464,8 +10464,6 @@ with pkgs;
 
   pies = callPackage ../servers/pies { };
 
-  portmap = callPackage ../servers/portmap { };
-
   rpcbind = callPackage ../servers/rpcbind { };
 
   mariadb = callPackage ../servers/sql/mariadb {
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 8ab27bc171d..86fbb0bf1b8 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -127,12 +127,12 @@ with import ./release-lib.nix { inherit supportedSystems; };
   perl = all;
   pkgconfig = all;
   pmccabe = linux;
-  portmap = linux;
   procps = linux;
   python = allBut cygwin;
   readline = all;
   rlwrap = all;
   rpm = linux;
+  rpcbind = linux;
   rsync = linux;
   screen = linux ++ darwin;
   scrot = linux;

From 314f187b0a6b1097c6329739395b3644c9a66867 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 29 Jan 2017 20:06:07 +0300
Subject: [PATCH 180/899] rpcbind: 0.2.3 -> 0.2.4

Enable warm starts support, use dedicated user.
---
 ...n-t-use-the-xp_auth-pointer-directly.patch | 43 -------------------
 pkgs/servers/rpcbind/default.nix              | 19 ++++----
 2 files changed, 9 insertions(+), 53 deletions(-)
 delete mode 100644 pkgs/servers/rpcbind/0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch

diff --git a/pkgs/servers/rpcbind/0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch b/pkgs/servers/rpcbind/0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch
deleted file mode 100644
index 16b763ef0de..00000000000
--- a/pkgs/servers/rpcbind/0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 9194122389f2a56b1cd1f935e64307e2e963c2da Mon Sep 17 00:00:00 2001
-From: Steve Dickson <steved@redhat.com>
-Date: Mon, 2 Nov 2015 17:05:18 -0500
-Subject: [PATCH] handle_reply: Don't use the xp_auth pointer directly
-
-In the latest libtirpc version to access the xp_auth
-one must use the SVC_XP_AUTH macro. To be backwards
-compatible a couple ifdefs were added to use the
-macro when it exists.
-
-Upstream-Status: Backport
-
-Signed-off-by: Steve Dickson <steved@redhat.com>
-Signed-off-by: Maxin B. John <maxin.john@intel.com>
----
- src/rpcb_svc_com.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
-index 4ae93f1..22d6c84 100644
---- a/src/rpcb_svc_com.c
-+++ b/src/rpcb_svc_com.c
-@@ -1295,10 +1295,17 @@ handle_reply(int fd, SVCXPRT *xprt)
- 	a.rmt_localvers = fi->versnum;
- 
- 	xprt_set_caller(xprt, fi);
-+#if defined(SVC_XP_AUTH)
-+	SVC_XP_AUTH(xprt) = svc_auth_none;
-+#else 
- 	xprt->xp_auth = &svc_auth_none;
-+#endif
- 	svc_sendreply(xprt, (xdrproc_t) xdr_rmtcall_result, (char *) &a);
-+#if !defined(SVC_XP_AUTH)
- 	SVCAUTH_DESTROY(xprt->xp_auth);
- 	xprt->xp_auth = NULL;
-+#endif
-+
- done:
- 	if (buffer)
- 		free(buffer);
--- 
-2.4.0
-
diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix
index 744763c43f1..cc5d7795e05 100644
--- a/pkgs/servers/rpcbind/default.nix
+++ b/pkgs/servers/rpcbind/default.nix
@@ -1,28 +1,27 @@
-{ fetchurl, fetchpatch, stdenv, pkgconfig, libtirpc
+{ fetchurl, stdenv, pkgconfig, libtirpc
 , useSystemd ? true, systemd }:
 
-let version = "0.2.3";
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "rpcbind-${version}";
+  version = "0.2.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/rpcbind/${version}/${name}.tar.bz2";
-    sha256 = "0yyjzv4161rqxrgjcijkrawnk55rb96ha0pav48s03l2klx855wq";
+    sha256 = "0rjc867mdacag4yqvs827wqhkh27135rp9asj06ixhf71m9rljh7";
   };
 
   patches = [
     ./sunrpc.patch
-    ./0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch
-    (fetchpatch {
-      url = "https://sources.debian.net/data/main/r/rpcbind/0.2.3-0.5/debian/patches/CVE-2015-7236.patch";
-      sha256 = "1wsv5j8f5djzxr11n4027x107cam1avmx9w34g6l5d9s61j763wq";
-    })
   ];
 
   buildInputs = [ libtirpc ]
              ++ stdenv.lib.optional useSystemd systemd;
 
-  configureFlags = stdenv.lib.optional (!useSystemd) "--with-systemdsystemunitdir=no";
+  configureFlags = [
+    "--with-systemdsystemunitdir=${if useSystemd then "$(out)/etc/systemd/system" else "no"}"
+    "--enable-warmstarts"
+    "--with-rpcuser=rpc"
+  ];
 
   nativeBuildInputs = [ pkgconfig ];
 

From 876a6d7f0384e3a4637beeb9f1458b2798cf2e3a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 29 Jan 2017 20:06:17 +0300
Subject: [PATCH 181/899] rpcbind service: use upstream systemd unit

---
 nixos/modules/misc/ids.nix                    |  2 +
 nixos/modules/services/networking/rpcbind.nix | 52 +++----------------
 2 files changed, 10 insertions(+), 44 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 0ed44f9d3d1..60e00ce874a 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -286,6 +286,7 @@
       gogs = 268;
       pdns-recursor = 269;
       kresd = 270;
+      rpc = 271;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -541,6 +542,7 @@
       couchpotato = 267;
       gogs = 268;
       kresd = 270;
+      #rpc = 271; # unused
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/services/networking/rpcbind.nix b/nixos/modules/services/networking/rpcbind.nix
index eef1e8e8cd8..cddcb09054e 100644
--- a/nixos/modules/services/networking/rpcbind.nix
+++ b/nixos/modules/services/networking/rpcbind.nix
@@ -2,35 +2,6 @@
 
 with lib;
 
-let
-
-  netconfigFile = {
-    target = "netconfig";
-    source = pkgs.writeText "netconfig" ''
-      #
-      # The network configuration file. This file is currently only used in
-      # conjunction with the TI-RPC code in the libtirpc library.
-      #
-      # Entries consist of:
-      #
-      #       <network_id> <semantics> <flags> <protofamily> <protoname> \
-      #               <device> <nametoaddr_libs>
-      #
-      # The <device> and <nametoaddr_libs> fields are always empty in this
-      # implementation.
-      #
-      udp        tpi_clts      v     inet     udp     -       -
-      tcp        tpi_cots_ord  v     inet     tcp     -       -
-      udp6       tpi_clts      v     inet6    udp     -       -
-      tcp6       tpi_cots_ord  v     inet6    tcp     -       -
-      rawip      tpi_raw       -     inet      -      -       -
-      local      tpi_cots_ord  -     loopback  -      -       -
-      unix       tpi_cots_ord  -     loopback  -      -       -
-    '';
-  };
-
-in
-
 {
 
   ###### interface
@@ -58,25 +29,18 @@ in
   ###### implementation
 
   config = mkIf config.services.rpcbind.enable {
-
     environment.systemPackages = [ pkgs.rpcbind ];
 
-    environment.etc = [ netconfigFile ];
+    systemd.packages = [ pkgs.rpcbind ];
 
-    systemd.services.rpcbind =
-      { description = "ONC RPC Directory Service";
-
-        wantedBy = [ "multi-user.target" ];
-
-        requires = [ "basic.target" ];
-        after = [ "basic.target" ];
-
-        unitConfig.DefaultDependencies = false; # don't stop during shutdown
-
-        serviceConfig.Type = "forking";
-        serviceConfig.ExecStart = "@${pkgs.rpcbind}/bin/rpcbind rpcbind";
-      };
+    systemd.services.rpcbind = {
+      wantedBy = [ "multi-user.target" ];
+    };
 
+    users.extraUsers.rpc = {
+      group = "nogroup";
+      uid = config.ids.uids.rpc;
+    };
   };
 
 }

From 6991e7930ec20f5d34a091b9166e5ff32d7b3816 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 31 Jan 2017 12:59:34 +0300
Subject: [PATCH 182/899] keyutils: split outputs

---
 pkgs/os-specific/linux/keyutils/default.nix | 23 ++++++++++++---------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix
index d1eb38df6da..2aba3ef9112 100644
--- a/pkgs/os-specific/linux/keyutils/default.nix
+++ b/pkgs/os-specific/linux/keyutils/default.nix
@@ -1,23 +1,26 @@
 { stdenv, fetchurl, gnumake, file }:
 
 stdenv.mkDerivation rec {
-  name = "keyutils-1.5.9";
+  name = "keyutils-${version}";
+  version = "1.5.9";
 
   src = fetchurl {
     url = "http://people.redhat.com/dhowells/keyutils/${name}.tar.bz2";
     sha256 = "1bl3w03ygxhc0hz69klfdlwqn33jvzxl1zfl2jmnb2v85iawb8jd";
   };
 
-  buildInputs = [ file ];
+  outputs = [ "out" "lib" "dev" ];
 
-  patchPhase = ''
-    sed -i -e "s, /usr/bin/make, ${gnumake}/bin/make," \
-        -e "s, /usr, ," \
-        -e "s,\$(LNS) \$(LIBDIR)/\$(SONAME),\$(LNS) \$(SONAME)," \
-        Makefile
-  '';
-
-  installPhase = "make install DESTDIR=$out";
+  installFlags = [
+    "ETCDIR=$(out)/etc"
+    "BINDIR=$(out)/bin"
+    "SBINDIR=$(out)/sbin"
+    "SHAREDIR=$(out)/share/keyutils"
+    "MANDIR=$(out)/share/man"
+    "INCLUDEDIR=$(dev)/include"
+    "LIBDIR=$(lib)/lib"
+    "USRLIBDIR=$(lib)/lib"
+  ];
 
   meta = with stdenv.lib; {
     homepage = http://people.redhat.com/dhowells/keyutils/;

From 469546f46e75754f91308e472be1e733fe62a851 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 31 Jan 2017 16:12:22 +0300
Subject: [PATCH 183/899] tcp_wrappers: 7.6 -> 7.6.q

---
 .../linux/tcp-wrappers/default.nix            | 41 +++++++------------
 1 file changed, 15 insertions(+), 26 deletions(-)

diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix
index eb50fc0abce..105a4cacd82 100644
--- a/pkgs/os-specific/linux/tcp-wrappers/default.nix
+++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix
@@ -1,40 +1,30 @@
 { fetchurl, stdenv }:
 
-stdenv.mkDerivation {
-  name = "tcp-wrappers-7.6";
+stdenv.mkDerivation rec {
+  name = "tcp-wrappers-${version}";
+  version = "7.6.q";
 
   src = fetchurl {
-    url = mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_7.6.dbs.orig.tar.gz;
-    sha256 = "0k68ziinx6biwar5lcb9jvv0rp6b3vmj6861n75bvrz4w1piwkdp";
+    url = "mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_${version}.orig.tar.gz";
+    sha256 = "0p9ilj4v96q32klavx0phw9va21fjp8vpk11nbh6v2ppxnnxfhwm";
   };
 
-  patches = [
-    (fetchurl {
-       url = mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_7.6.dbs-13.diff.gz;
-       sha256 = "071ir20rh8ckhgrc0y99wgnlbqjgkprf0qwbv84lqw5i6qajbcnh";
-     })
-  ];
+  debian = fetchurl {
+    url = "mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_${version}-24.debian.tar.xz";
+    sha256 = "1kgax35rwaj5q8nf8fw60aczvxj99h2jjp7iv1f82y85yz9x0ak7";
+  };
 
   prePatch = ''
-    cd upstream/tarballs
-    tar xzvf *
-    cd tcp_wrappers_7.6
+    tar -xaf $debian
+    shopt -s extglob
+    patches="$(echo debian/patches/!(series)) $patches"
   '';
 
-  postPatch = ''
-    for patch in debian/patches/*; do
-      echo "applying Debian patch \`$(basename $patch)'..."
-      patch --batch -p1 < $patch
-    done
-  '';
-
-  buildPhase = ''
-    make REAL_DAEMON_DIR="$out/sbin" linux
-  '';
+  makeFlags = [ "REAL_DAEMON_DIR=$(out)/bin" "linux" ];
 
   installPhase = ''
-    mkdir -p "$out/sbin"
-    cp -v safe_finger tcpd tcpdchk tcpdmatch try-from "$out/sbin"
+    mkdir -p "$out/bin"
+    cp -v safe_finger tcpd tcpdchk tcpdmatch try-from "$out/bin"
 
     mkdir -p "$out/lib"
     cp -v shared/lib*.so* "$out/lib"
@@ -42,7 +32,6 @@ stdenv.mkDerivation {
     mkdir -p "$out/include"
     cp -v *.h "$out/include"
 
-    mkdir -p "$out/man"
     for i in 3 5 8;
     do
       mkdir -p "$out/man/man$i"

From e967068695c052f70a87a285ad60f796231da703 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 31 Jan 2017 20:10:18 -0500
Subject: [PATCH 184/899] nodePackages: Add ios-deploy, update the rest

---
 pkgs/development/node-packages/default-v6.nix |    8 +
 .../node-packages/node-packages-v4.nix        | 1375 ++++++++++-------
 .../node-packages/node-packages-v6.nix        | 1148 +++++++-------
 .../node-packages/node-packages.json          |    1 +
 4 files changed, 1390 insertions(+), 1142 deletions(-)

diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix
index 8e6aeac9683..27664385b61 100644
--- a/pkgs/development/node-packages/default-v6.nix
+++ b/pkgs/development/node-packages/default-v6.nix
@@ -45,4 +45,12 @@ nodePackages // {
       done
     '';
   });
+
+  ios-deploy = nodePackages.ios-deploy.override (oldAttrs: {
+    preRebuild = ''
+      tmp=$(mktemp -d)
+      ln -s /usr/bin/xcodebuild $tmp
+      export PATH="$PATH:$tmp"
+    '';
+  });
 }
diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index 8f5d178e734..72f0f0a24d9 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -3208,13 +3208,13 @@ let
         sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d";
       };
     };
-    "buffer-4.9.1" = {
+    "buffer-5.0.2" = {
       name = "buffer";
       packageName = "buffer";
-      version = "4.9.1";
+      version = "5.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz";
-        sha1 = "6d1bb601b07a4efced97094132093027c95bc298";
+        url = "https://registry.npmjs.org/buffer/-/buffer-5.0.2.tgz";
+        sha1 = "41d0407ff76782e9ec19f52f88e237ce6bb0de6d";
       };
     };
     "cached-path-relative-1.0.0" = {
@@ -4081,6 +4081,15 @@ let
         sha1 = "c033d086cf0d12af73aed5a99c0cedb37367b395";
       };
     };
+    "array-shuffle-1.0.1" = {
+      name = "array-shuffle";
+      packageName = "array-shuffle";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-shuffle/-/array-shuffle-1.0.1.tgz";
+        sha1 = "7ea4882a356b4bca5f545e0b6e52eaf6d971557a";
+      };
+    };
     "castv2-client-1.2.0" = {
       name = "castv2-client";
       packageName = "castv2-client";
@@ -4117,13 +4126,13 @@ let
         sha1 = "e74befcd1a62ae7a5e5fbfbfa6f5d2bacd962bdd";
       };
     };
-    "fs-extended-0.2.1" = {
-      name = "fs-extended";
-      packageName = "fs-extended";
-      version = "0.2.1";
+    "diveSync-0.3.0" = {
+      name = "diveSync";
+      packageName = "diveSync";
+      version = "0.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extended/-/fs-extended-0.2.1.tgz";
-        sha1 = "3910358127e9c72c8296c30142c7763b5f5e2d3a";
+        url = "https://registry.npmjs.org/diveSync/-/diveSync-0.3.0.tgz";
+        sha1 = "d9980493ae33beec36f4fec6f171ff218130cc12";
       };
     };
     "got-1.2.2" = {
@@ -4243,6 +4252,15 @@ let
         sha1 = "17be93eaae3f3b779359c795b419705a8817e868";
       };
     };
+    "xspfr-0.3.1" = {
+      name = "xspfr";
+      packageName = "xspfr";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xspfr/-/xspfr-0.3.1.tgz";
+        sha1 = "f164263325ae671f53836fb210c7ddbcfda46598";
+      };
+    };
     "castv2-0.1.9" = {
       name = "castv2";
       packageName = "castv2";
@@ -4441,6 +4459,15 @@ let
         sha1 = "4ea54ea5a08938153185e15210c68d9092bc1b78";
       };
     };
+    "append-0.1.1" = {
+      name = "append";
+      packageName = "append";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/append/-/append-0.1.1.tgz";
+        sha1 = "7e5dd327747078d877286fbb624b1e8f4d2b396b";
+      };
+    };
     "object-assign-1.0.0" = {
       name = "object-assign";
       packageName = "object-assign";
@@ -5566,22 +5593,22 @@ let
         sha1 = "aa58a3041a066f90eaa16c2f5389ff19f3f461a5";
       };
     };
-    "cordova-common-1.5.1" = {
+    "cordova-common-2.0.0" = {
       name = "cordova-common";
       packageName = "cordova-common";
-      version = "1.5.1";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-common/-/cordova-common-1.5.1.tgz";
-        sha1 = "6770de0d6200ad6f94a1abe8939b5bd9ece139e3";
+        url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.0.0.tgz";
+        sha1 = "125097eb4b50b7353cec226ed21649192293ae97";
       };
     };
-    "cordova-lib-6.4.0" = {
+    "cordova-lib-6.5.0" = {
       name = "cordova-lib";
       packageName = "cordova-lib";
-      version = "6.4.0";
+      version = "6.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-6.4.0.tgz";
-        sha1 = "a3ad3c366c60baf104701a67a7877af75555ed33";
+        url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-6.5.0.tgz";
+        sha1 = "f7630a04c29d6cdee980190b1d93fb1536ac453f";
       };
     };
     "insight-0.8.4" = {
@@ -5656,13 +5683,13 @@ let
         sha1 = "e244b9185b8175473bff6079324905115f83dc7c";
       };
     };
-    "elementtree-0.1.6" = {
+    "elementtree-0.1.7" = {
       name = "elementtree";
       packageName = "elementtree";
-      version = "0.1.6";
+      version = "0.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz";
-        sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c";
+        url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz";
+        sha1 = "9ac91be6e52fb6e6244c4e54a4ac3ed8ae8e29c0";
       };
     };
     "glob-5.0.15" = {
@@ -5728,13 +5755,13 @@ let
         sha1 = "f0dcf5109a949e42a993ee3e8fb2070452817b51";
       };
     };
-    "sax-0.3.5" = {
+    "sax-1.1.4" = {
       name = "sax";
       packageName = "sax";
-      version = "0.3.5";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz";
-        sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d";
+        url = "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz";
+        sha1 = "74b6d33c9ae1e001510f179a91168588f1aedaa9";
       };
     };
     "base64-js-0.0.8" = {
@@ -5764,31 +5791,31 @@ let
         sha1 = "03aa1a5fe5b4cac604e3b967bc4c7ceacf957030";
       };
     };
-    "cordova-fetch-1.0.1" = {
-      name = "cordova-fetch";
-      packageName = "cordova-fetch";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.0.1.tgz";
-        sha1 = "3122ed3dca8e83eae0345f83f3a8cc33680bf769";
-      };
-    };
-    "cordova-create-1.0.1" = {
+    "cordova-create-1.0.2" = {
       name = "cordova-create";
       packageName = "cordova-create";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-create/-/cordova-create-1.0.1.tgz";
-        sha1 = "f1810401807ceec436ece27241180a83c97f8212";
+        url = "https://registry.npmjs.org/cordova-create/-/cordova-create-1.0.2.tgz";
+        sha1 = "cb9bba9817c62a645bacb6e00da8cc50936a0fa5";
       };
     };
-    "cordova-js-4.2.0" = {
+    "cordova-fetch-1.0.2" = {
+      name = "cordova-fetch";
+      packageName = "cordova-fetch";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.0.2.tgz";
+        sha1 = "b8f4903f39fe613888062552a96995413af16d35";
+      };
+    };
+    "cordova-js-4.2.1" = {
       name = "cordova-js";
       packageName = "cordova-js";
-      version = "4.2.0";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.0.tgz";
-        sha1 = "e89689ae1b69637cae7c2f4a800f4b10104db980";
+        url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.1.tgz";
+        sha1 = "01ca186e14e63b01cb6d24e469750e481a038355";
       };
     };
     "cordova-serve-1.0.1" = {
@@ -5809,6 +5836,15 @@ let
         sha1 = "fade86a92799a813e9b42511cdf3dfa6cc8dbefe";
       };
     };
+    "elementtree-0.1.6" = {
+      name = "elementtree";
+      packageName = "elementtree";
+      version = "0.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz";
+        sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c";
+      };
+    };
     "init-package-json-1.9.4" = {
       name = "init-package-json";
       packageName = "init-package-json";
@@ -5908,13 +5944,13 @@ let
         sha1 = "ef1d7093a9d3287e3fce92df916f8616b23f90b4";
       };
     };
-    "xcode-0.8.9" = {
+    "xcode-0.9.1" = {
       name = "xcode";
       packageName = "xcode";
-      version = "0.8.9";
+      version = "0.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xcode/-/xcode-0.8.9.tgz";
-        sha1 = "ec6765f70e9dccccc9f6e9a5b9b4e7e814b4cf35";
+        url = "https://registry.npmjs.org/xcode/-/xcode-0.9.1.tgz";
+        sha1 = "5b4e71b71b03573ff0cdb48439103e8107da0f95";
       };
     };
     "browserify-transform-tools-1.5.3" = {
@@ -5953,6 +5989,15 @@ let
         sha1 = "c54601778ad560f1142ce0e01bcca8b56d13426d";
       };
     };
+    "cordova-app-hello-world-3.11.0" = {
+      name = "cordova-app-hello-world";
+      packageName = "cordova-app-hello-world";
+      version = "3.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.11.0.tgz";
+        sha1 = "9214feb9dd713ca481a1cbabceeca60966c1c0cf";
+      };
+    };
     "dependency-ls-1.0.0" = {
       name = "dependency-ls";
       packageName = "dependency-ls";
@@ -5998,31 +6043,22 @@ let
         sha1 = "85204b54dba82d5742e28c96756ef43af50e3384";
       };
     };
-    "cordova-app-hello-world-3.11.0" = {
-      name = "cordova-app-hello-world";
-      packageName = "cordova-app-hello-world";
-      version = "3.11.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.11.0.tgz";
-        sha1 = "9214feb9dd713ca481a1cbabceeca60966c1c0cf";
-      };
-    };
-    "browserify-13.1.0" = {
+    "browserify-13.3.0" = {
       name = "browserify";
       packageName = "browserify";
-      version = "13.1.0";
+      version = "13.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify/-/browserify-13.1.0.tgz";
-        sha1 = "d81a018e98dd7ca706ec04253d20f8a03b2af8ae";
+        url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz";
+        sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce";
       };
     };
-    "assert-1.3.0" = {
-      name = "assert";
-      packageName = "assert";
-      version = "1.3.0";
+    "buffer-4.9.1" = {
+      name = "buffer";
+      packageName = "buffer";
+      version = "4.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz";
-        sha1 = "03939a622582a812cc202320a0b9a56c9b815849";
+        url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz";
+        sha1 = "6d1bb601b07a4efced97094132093027c95bc298";
       };
     };
     "compression-1.6.2" = {
@@ -6034,13 +6070,13 @@ let
         sha1 = "cceb121ecc9d09c52d7ad0c3350ea93ddd402bc3";
       };
     };
-    "express-4.14.0" = {
+    "express-4.14.1" = {
       name = "express";
       packageName = "express";
-      version = "4.14.0";
+      version = "4.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-4.14.0.tgz";
-        sha1 = "c1ee3f42cdc891fb3dc650a8922d51ec847d0d66";
+        url = "https://registry.npmjs.org/express/-/express-4.14.1.tgz";
+        sha1 = "646c237f766f148c2120aff073817b9e4d7e0d33";
       };
     };
     "accepts-1.3.3" = {
@@ -6124,13 +6160,13 @@ let
         sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2";
       };
     };
-    "content-disposition-0.5.1" = {
+    "content-disposition-0.5.2" = {
       name = "content-disposition";
       packageName = "content-disposition";
-      version = "0.5.1";
+      version = "0.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.1.tgz";
-        sha1 = "87476c6a67c8daa87e32e87616df883ba7fb071b";
+        url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz";
+        sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4";
       };
     };
     "content-type-1.0.2" = {
@@ -6196,13 +6232,13 @@ let
         sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8";
       };
     };
-    "finalhandler-0.5.0" = {
+    "finalhandler-0.5.1" = {
       name = "finalhandler";
       packageName = "finalhandler";
-      version = "0.5.0";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz";
-        sha1 = "e9508abece9b6dba871a6942a1d7911b91911ac7";
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz";
+        sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd";
       };
     };
     "fresh-0.3.0" = {
@@ -6277,22 +6313,22 @@ let
         sha1 = "3b7848c03c2dece69a9522b0fae8c4126d745f3b";
       };
     };
-    "send-0.14.1" = {
+    "send-0.14.2" = {
       name = "send";
       packageName = "send";
-      version = "0.14.1";
+      version = "0.14.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.14.1.tgz";
-        sha1 = "a954984325392f51532a7760760e459598c89f7a";
+        url = "https://registry.npmjs.org/send/-/send-0.14.2.tgz";
+        sha1 = "39b0438b3f510be5dc6f667a11f71689368cdeef";
       };
     };
-    "serve-static-1.11.1" = {
+    "serve-static-1.11.2" = {
       name = "serve-static";
       packageName = "serve-static";
-      version = "1.11.1";
+      version = "1.11.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.11.1.tgz";
-        sha1 = "d6cce7693505f733c759de57befc1af76c0f0805";
+        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.11.2.tgz";
+        sha1 = "2cf9889bd4435a320cc36895c9aa57bd662e6ac7";
       };
     };
     "type-is-1.6.14" = {
@@ -6385,6 +6421,15 @@ let
         sha1 = "fc5c6b0765673d92a2d4ac8b4dc0aa88702e2bd4";
       };
     };
+    "sax-0.3.5" = {
+      name = "sax";
+      packageName = "sax";
+      version = "0.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz";
+        sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d";
+      };
+    };
     "npm-package-arg-4.2.0" = {
       name = "npm-package-arg";
       packageName = "npm-package-arg";
@@ -8024,13 +8069,13 @@ let
         sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
       };
     };
-    "nan-2.5.0" = {
+    "nan-2.5.1" = {
       name = "nan";
       packageName = "nan";
-      version = "2.5.0";
+      version = "2.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz";
-        sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8";
+        url = "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz";
+        sha1 = "d5b01691253326a97a2bbee9e61c55d8d60351e2";
       };
     };
     "jsonparse-0.0.6" = {
@@ -8069,13 +8114,13 @@ let
         sha1 = "42c5c18a9016bcb0db28a4d340ebb831f55d1b66";
       };
     };
-    "faye-websocket-0.11.0" = {
+    "faye-websocket-0.11.1" = {
       name = "faye-websocket";
       packageName = "faye-websocket";
-      version = "0.11.0";
+      version = "0.11.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.0.tgz";
-        sha1 = "d9ccf0e789e7db725d74bc4877d23aa42972ac50";
+        url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz";
+        sha1 = "f0efe18c4f56e4f40afc7e06c719fd5ee6188f38";
       };
     };
     "eventemitter3-0.1.6" = {
@@ -9035,13 +9080,13 @@ let
         sha1 = "8859936af0038741263053b39d0e76ca241e4034";
       };
     };
-    "ignore-3.2.0" = {
+    "ignore-3.2.2" = {
       name = "ignore";
       packageName = "ignore";
-      version = "3.2.0";
+      version = "3.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ignore/-/ignore-3.2.0.tgz";
-        sha1 = "8d88f03c3002a0ac52114db25d2c673b0bf1e435";
+        url = "https://registry.npmjs.org/ignore/-/ignore-3.2.2.tgz";
+        sha1 = "1c51e1ef53bab6ddc15db4d9ac4ec139eceb3410";
       };
     };
     "inquirer-0.12.0" = {
@@ -9152,13 +9197,13 @@ let
         sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f";
       };
     };
-    "js-tokens-3.0.0" = {
+    "js-tokens-3.0.1" = {
       name = "js-tokens";
       packageName = "js-tokens";
-      version = "3.0.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.0.tgz";
-        sha1 = "a2f2a969caae142fb3cd56228358c89366957bd1";
+        url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz";
+        sha1 = "08e9f132484a2c45a30907e9dc4d5567b7f114d7";
       };
     };
     "es6-map-0.1.4" = {
@@ -9449,22 +9494,22 @@ let
         sha1 = "afab96262910a7f33c19a5775825c69f34e350ca";
       };
     };
-    "ajv-4.10.4" = {
+    "ajv-4.11.2" = {
       name = "ajv";
       packageName = "ajv";
-      version = "4.10.4";
+      version = "4.11.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.10.4.tgz";
-        sha1 = "c0974dd00b3464984892d6010aa9c2c945933254";
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.2.tgz";
+        sha1 = "f166c3c11cbc6cb9dcc102a5bcfe5b72c95287e6";
       };
     };
-    "ajv-keywords-1.5.0" = {
+    "ajv-keywords-1.5.1" = {
       name = "ajv-keywords";
       packageName = "ajv-keywords";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.0.tgz";
-        sha1 = "c11e6859eafff83e0dafc416929472eca946aa2c";
+        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz";
+        sha1 = "314dd0a4b3368fad3dfcdc54ede6171b886daf3c";
       };
     };
     "slice-ansi-0.0.4" = {
@@ -10206,13 +10251,13 @@ let
         sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149";
       };
     };
-    "coffee-script-1.12.2" = {
+    "coffee-script-1.12.3" = {
       name = "coffee-script";
       packageName = "coffee-script";
-      version = "1.12.2";
+      version = "1.12.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz";
-        sha1 = "0d4cbdee183f650da95419570c4929d08ef91376";
+        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.3.tgz";
+        sha1 = "de5f4b1b934a4e9f915c57acd7ad323f68f715db";
       };
     };
     "jade-1.11.0" = {
@@ -11655,6 +11700,15 @@ let
         sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96";
       };
     };
+    "finalhandler-0.5.0" = {
+      name = "finalhandler";
+      packageName = "finalhandler";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz";
+        sha1 = "e9508abece9b6dba871a6942a1d7911b91911ac7";
+      };
+    };
     "custom-event-1.0.1" = {
       name = "custom-event";
       packageName = "custom-event";
@@ -13302,6 +13356,15 @@ let
         sha1 = "3a86c09b41b8f261ac863a7cc85ea4735857eab2";
       };
     };
+    "express-4.14.0" = {
+      name = "express";
+      packageName = "express";
+      version = "4.14.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/express/-/express-4.14.0.tgz";
+        sha1 = "c1ee3f42cdc891fb3dc650a8922d51ec847d0d66";
+      };
+    };
     "follow-redirects-1.2.1" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
@@ -13608,6 +13671,24 @@ let
         sha1 = "9b76c03d8ef514c7e4249a7bbce649eed39ef29f";
       };
     };
+    "content-disposition-0.5.1" = {
+      name = "content-disposition";
+      packageName = "content-disposition";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.1.tgz";
+        sha1 = "87476c6a67c8daa87e32e87616df883ba7fb071b";
+      };
+    };
+    "send-0.14.1" = {
+      name = "send";
+      packageName = "send";
+      version = "0.14.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/send/-/send-0.14.1.tgz";
+        sha1 = "a954984325392f51532a7760760e459598c89f7a";
+      };
+    };
     "retry-0.6.1" = {
       name = "retry";
       packageName = "retry";
@@ -13770,13 +13851,13 @@ let
         sha1 = "2f4b58b5592972350cd97f482aba68f8e05574bc";
       };
     };
-    "mailparser-0.6.1" = {
+    "mailparser-0.6.2" = {
       name = "mailparser";
       packageName = "mailparser";
-      version = "0.6.1";
+      version = "0.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mailparser/-/mailparser-0.6.1.tgz";
-        sha1 = "3de4db3f4a90c160c06d8cb8b825a7f1c6f6a7c3";
+        url = "https://registry.npmjs.org/mailparser/-/mailparser-0.6.2.tgz";
+        sha1 = "03c486039bdf4df6cd3b6adcaaac4107dfdbc068";
       };
     };
     "imap-0.8.19" = {
@@ -13896,13 +13977,13 @@ let
         sha1 = "586db8101db30cb4438eb546737a41aad0cf13d5";
       };
     };
-    "mimelib-0.2.19" = {
+    "mimelib-0.3.0" = {
       name = "mimelib";
       packageName = "mimelib";
-      version = "0.2.19";
+      version = "0.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mimelib/-/mimelib-0.2.19.tgz";
-        sha1 = "37ec90a6ac7d00954851d0b2c31618f0a49da0ee";
+        url = "https://registry.npmjs.org/mimelib/-/mimelib-0.3.0.tgz";
+        sha1 = "4b16d4b435403daf692bc227890c7165ff3de894";
       };
     };
     "encoding-0.1.12" = {
@@ -13923,6 +14004,15 @@ let
         sha1 = "5d67d37030e66efebbb4b8aac46daf9b55befbf6";
       };
     };
+    "addressparser-1.0.1" = {
+      name = "addressparser";
+      packageName = "addressparser";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz";
+        sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746";
+      };
+    };
     "utf7-1.0.2" = {
       name = "utf7";
       packageName = "utf7";
@@ -13950,6 +14040,15 @@ let
         sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971";
       };
     };
+    "nan-2.5.0" = {
+      name = "nan";
+      packageName = "nan";
+      version = "2.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz";
+        sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8";
+      };
+    };
     "mongoose-3.6.7" = {
       name = "mongoose";
       packageName = "mongoose";
@@ -14454,15 +14553,6 @@ let
         sha1 = "51a1a9e7448ecbd32cda54421675bb21bc093da6";
       };
     };
-    "addressparser-1.0.1" = {
-      name = "addressparser";
-      packageName = "addressparser";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz";
-        sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746";
-      };
-    };
     "nodemailer-fetch-1.6.0" = {
       name = "nodemailer-fetch";
       packageName = "nodemailer-fetch";
@@ -14544,15 +14634,6 @@ let
         sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
       };
     };
-    "JSONStream-1.2.1" = {
-      name = "JSONStream";
-      packageName = "JSONStream";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.2.1.tgz";
-        sha1 = "32aa5790e799481083b49b4b7fa94e23bae69bf9";
-      };
-    };
     "fstream-npm-1.2.0" = {
       name = "fstream-npm";
       packageName = "fstream-npm";
@@ -14616,6 +14697,15 @@ let
         sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c";
       };
     };
+    "node-gyp-3.5.0" = {
+      name = "node-gyp";
+      packageName = "node-gyp";
+      version = "3.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz";
+        sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a";
+      };
+    };
     "nopt-4.0.1" = {
       name = "nopt";
       packageName = "nopt";
@@ -14688,15 +14778,6 @@ let
         sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3";
       };
     };
-    "write-file-atomic-1.2.0" = {
-      name = "write-file-atomic";
-      packageName = "write-file-atomic";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz";
-        sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab";
-      };
-    };
     "lodash._baseindexof-3.1.0" = {
       name = "lodash._baseindexof";
       packageName = "lodash._baseindexof";
@@ -15057,6 +15138,15 @@ let
         sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93";
       };
     };
+    "write-file-atomic-1.2.0" = {
+      name = "write-file-atomic";
+      packageName = "write-file-atomic";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz";
+        sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab";
+      };
+    };
     "form-data-2.0.0" = {
       name = "form-data";
       packageName = "form-data";
@@ -15247,13 +15337,13 @@ let
         sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf";
       };
     };
-    "domino-1.0.27" = {
+    "domino-1.0.28" = {
       name = "domino";
       packageName = "domino";
-      version = "1.0.27";
+      version = "1.0.28";
       src = fetchurl {
-        url = "https://registry.npmjs.org/domino/-/domino-1.0.27.tgz";
-        sha1 = "26bc01f739707505c51456af7f59e3373369475d";
+        url = "https://registry.npmjs.org/domino/-/domino-1.0.28.tgz";
+        sha1 = "9ce3f6a9221a2c3288984b14ea191cd27b392f87";
       };
     };
     "express-handlebars-3.0.0" = {
@@ -15265,15 +15355,6 @@ let
         sha1 = "80a070bb819b09e4af2ca6d0780f75ce05e75c2f";
       };
     };
-    "finalhandler-0.5.1" = {
-      name = "finalhandler";
-      packageName = "finalhandler";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz";
-        sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd";
-      };
-    };
     "gelf-stream-0.2.4" = {
       name = "gelf-stream";
       packageName = "gelf-stream";
@@ -16916,13 +16997,13 @@ let
         sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4";
       };
     };
-    "express-5.0.0-alpha.2" = {
+    "express-5.0.0-alpha.3" = {
       name = "express";
       packageName = "express";
-      version = "5.0.0-alpha.2";
+      version = "5.0.0-alpha.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.2.tgz";
-        sha1 = "fd54177f657b6a4c4540727702edd1cbaa3a6ac5";
+        url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.3.tgz";
+        sha1 = "19d63b931bf0f64c42725952ef0602c381fe64db";
       };
     };
     "express-json5-0.1.0" = {
@@ -17006,58 +17087,13 @@ let
         sha1 = "4bd28e0770fad421fc807745c1ef3010905b2332";
       };
     };
-    "array-flatten-1.1.0" = {
-      name = "array-flatten";
-      packageName = "array-flatten";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.0.tgz";
-        sha1 = "ac3efac717b0e7bbdc778ce0bde7381ac6604393";
-      };
-    };
-    "path-is-absolute-1.0.0" = {
-      name = "path-is-absolute";
-      packageName = "path-is-absolute";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz";
-        sha1 = "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912";
-      };
-    };
-    "path-to-regexp-0.1.6" = {
-      name = "path-to-regexp";
-      packageName = "path-to-regexp";
-      version = "0.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.6.tgz";
-        sha1 = "f01fd5734047b6bfbc5f208c6135a33d7af09c36";
-      };
-    };
-    "router-1.1.4" = {
+    "router-1.1.5" = {
       name = "router";
       packageName = "router";
-      version = "1.1.4";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/router/-/router-1.1.4.tgz";
-        sha1 = "5d449dde9d6e0ad5c3f53369064baf7798834a97";
-      };
-    };
-    "array-flatten-2.0.0" = {
-      name = "array-flatten";
-      packageName = "array-flatten";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.0.0.tgz";
-        sha1 = "24dd98b38b9194b59b2087ba40c21384d6b8a8dc";
-      };
-    };
-    "setprototypeof-1.0.0" = {
-      name = "setprototypeof";
-      packageName = "setprototypeof";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.0.tgz";
-        sha1 = "d5fafca01e1174d0079bd1bf881f09c8a339794c";
+        url = "https://registry.npmjs.org/router/-/router-1.1.5.tgz";
+        sha1 = "c9c6935201b30ac1f227ada6af86e8cea6515387";
       };
     };
     "raw-body-1.3.4" = {
@@ -17339,13 +17375,13 @@ let
         sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66";
       };
     };
-    "csv-parse-1.1.10" = {
+    "csv-parse-1.2.0" = {
       name = "csv-parse";
       packageName = "csv-parse";
-      version = "1.1.10";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.1.10.tgz";
-        sha1 = "767340d0d1f26d05434c798b7132222c669189de";
+        url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.2.0.tgz";
+        sha1 = "047b73868ab9a85746e885f637f9ed0fb645a425";
       };
     };
     "stream-transform-0.1.1" = {
@@ -17510,15 +17546,6 @@ let
         sha1 = "7f959346cfc8719e3f7233cd6852854a7c67d8a3";
       };
     };
-    "js-yaml-3.6.1" = {
-      name = "js-yaml";
-      packageName = "js-yaml";
-      version = "3.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz";
-        sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30";
-      };
-    };
     "whet.extend-0.9.9" = {
       name = "whet.extend";
       packageName = "whet.extend";
@@ -17528,13 +17555,13 @@ let
         sha1 = "f877d5bf648c97e5aa542fadc16d6a259b9c11a1";
       };
     };
-    "csso-2.2.1" = {
+    "csso-2.3.1" = {
       name = "csso";
       packageName = "csso";
-      version = "2.2.1";
+      version = "2.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csso/-/csso-2.2.1.tgz";
-        sha1 = "51fbb5347e50e81e6ed51668a48490ae6fe2afe2";
+        url = "https://registry.npmjs.org/csso/-/csso-2.3.1.tgz";
+        sha1 = "4f8d91a156f2f1c2aebb40b8fb1b5eb83d94d3b9";
       };
     };
     "clap-1.1.2" = {
@@ -18095,15 +18122,6 @@ let
         sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
       };
     };
-    "node-gyp-3.5.0" = {
-      name = "node-gyp";
-      packageName = "node-gyp";
-      version = "3.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz";
-        sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a";
-      };
-    };
     "lsmod-1.0.0" = {
       name = "lsmod";
       packageName = "lsmod";
@@ -18185,22 +18203,40 @@ let
         sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65";
       };
     };
-    "enhanced-resolve-0.9.1" = {
-      name = "enhanced-resolve";
-      packageName = "enhanced-resolve";
-      version = "0.9.1";
+    "acorn-dynamic-import-2.0.1" = {
+      name = "acorn-dynamic-import";
+      packageName = "acorn-dynamic-import";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz";
-        sha1 = "4d6e689b3725f86090927ccc86cd9f1635b89e2e";
+        url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.1.tgz";
+        sha1 = "23f671eb6e650dab277fef477c321b1178a8cca2";
       };
     };
-    "interpret-0.6.6" = {
-      name = "interpret";
-      packageName = "interpret";
-      version = "0.6.6";
+    "enhanced-resolve-3.0.3" = {
+      name = "enhanced-resolve";
+      packageName = "enhanced-resolve";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/interpret/-/interpret-0.6.6.tgz";
-        sha1 = "fecd7a18e7ce5ca6abfb953e1f86213a49f1625b";
+        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.0.3.tgz";
+        sha1 = "df14c06b5fc5eecade1094c9c5a12b4b3edc0b62";
+      };
+    };
+    "json-loader-0.5.4" = {
+      name = "json-loader";
+      packageName = "json-loader";
+      version = "0.5.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz";
+        sha1 = "8baa1365a632f58a3c46d20175fc6002c96e37de";
+      };
+    };
+    "loader-runner-2.3.0" = {
+      name = "loader-runner";
+      packageName = "loader-runner";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz";
+        sha1 = "f482aea82d543e07921700d5a46ef26fdac6b8a2";
       };
     };
     "loader-utils-0.2.16" = {
@@ -18212,58 +18248,49 @@ let
         sha1 = "f08632066ed8282835dff88dfb52704765adee6d";
       };
     };
-    "memory-fs-0.3.0" = {
+    "memory-fs-0.4.1" = {
       name = "memory-fs";
       packageName = "memory-fs";
-      version = "0.3.0";
+      version = "0.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz";
-        sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20";
+        url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz";
+        sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552";
       };
     };
-    "node-libs-browser-0.7.0" = {
+    "node-libs-browser-2.0.0" = {
       name = "node-libs-browser";
       packageName = "node-libs-browser";
-      version = "0.7.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.7.0.tgz";
-        sha1 = "3e272c0819e308935e26674408d7af0e1491b83b";
+        url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz";
+        sha1 = "a3a59ec97024985b46e958379646f96c4b616646";
       };
     };
-    "tapable-0.1.10" = {
+    "tapable-0.2.6" = {
       name = "tapable";
       packageName = "tapable";
-      version = "0.1.10";
+      version = "0.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz";
-        sha1 = "29c35707c2b70e50d07482b5d202e8ed446dafd4";
+        url = "https://registry.npmjs.org/tapable/-/tapable-0.2.6.tgz";
+        sha1 = "206be8e188860b514425375e6f1ae89bfb01fd8d";
       };
     };
-    "watchpack-0.2.9" = {
+    "watchpack-1.2.0" = {
       name = "watchpack";
       packageName = "watchpack";
-      version = "0.2.9";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/watchpack/-/watchpack-0.2.9.tgz";
-        sha1 = "62eaa4ab5e5ba35fdfc018275626e3c0f5e3fb0b";
+        url = "https://registry.npmjs.org/watchpack/-/watchpack-1.2.0.tgz";
+        sha1 = "15d4620f1e7471f13fcb551d5c030d2c3eb42dbb";
       };
     };
-    "webpack-core-0.6.9" = {
-      name = "webpack-core";
-      packageName = "webpack-core";
-      version = "0.6.9";
+    "webpack-sources-0.1.4" = {
+      name = "webpack-sources";
+      packageName = "webpack-sources";
+      version = "0.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz";
-        sha1 = "fc571588c8558da77be9efb6debdc5a3b172bdc2";
-      };
-    };
-    "memory-fs-0.2.0" = {
-      name = "memory-fs";
-      packageName = "memory-fs";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz";
-        sha1 = "f2bb25368bc121e391c2520de92969caee0a0290";
+        url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.4.tgz";
+        sha1 = "ccc2c817e08e5fa393239412690bb481821393cd";
       };
     };
     "big.js-3.1.3" = {
@@ -18293,15 +18320,6 @@ let
         sha1 = "1eade7acc012034ad84e2396767ead9fa5495821";
       };
     };
-    "crypto-browserify-3.3.0" = {
-      name = "crypto-browserify";
-      packageName = "crypto-browserify";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.3.0.tgz";
-        sha1 = "b9fc75bb4a0ed61dcf1cd5dae96eb30c9c3e506c";
-      };
-    };
     "os-browserify-0.2.1" = {
       name = "os-browserify";
       packageName = "os-browserify";
@@ -18320,42 +18338,6 @@ let
         sha1 = "ab4883cf597dcd50af211349a00fbca56ac86b86";
       };
     };
-    "pbkdf2-compat-2.0.1" = {
-      name = "pbkdf2-compat";
-      packageName = "pbkdf2-compat";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz";
-        sha1 = "b6e0c8fa99494d94e0511575802a59a5c142f288";
-      };
-    };
-    "ripemd160-0.2.0" = {
-      name = "ripemd160";
-      packageName = "ripemd160";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz";
-        sha1 = "2bf198bde167cacfa51c0a928e84b68bbe171fce";
-      };
-    };
-    "sha.js-2.2.6" = {
-      name = "sha.js";
-      packageName = "sha.js";
-      version = "2.2.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz";
-        sha1 = "17ddeddc5f722fb66501658895461977867315ba";
-      };
-    };
-    "browserify-aes-0.4.0" = {
-      name = "browserify-aes";
-      packageName = "browserify-aes";
-      version = "0.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-0.4.0.tgz";
-        sha1 = "067149b668df31c4b58533e02d01e806d8608e2c";
-      };
-    };
     "setimmediate-1.0.5" = {
       name = "setimmediate";
       packageName = "setimmediate";
@@ -18524,10 +18506,10 @@ in
   alloy = nodeEnv.buildNodePackage {
     name = "alloy";
     packageName = "alloy";
-    version = "1.9.5";
+    version = "1.9.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.5.tgz";
-      sha1 = "78be031931f4b9012f6085e1544069c56dcba233";
+      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.6.tgz";
+      sha1 = "550505b1a9133189e98276952ad845b8cbcfdc9e";
     };
     dependencies = [
       sources."colors-0.6.0-1"
@@ -19447,10 +19429,10 @@ in
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "13.3.0";
+    version = "14.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz";
-      sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce";
+      url = "https://registry.npmjs.org/browserify/-/browserify-14.0.0.tgz";
+      sha1 = "67e6cfe7acb2fb1a1908e8a763452306de0bcf38";
     };
     dependencies = [
       (sources."JSONStream-1.3.0" // {
@@ -19483,11 +19465,10 @@ in
           sources."pako-0.2.9"
         ];
       })
-      (sources."buffer-4.9.1" // {
+      (sources."buffer-5.0.2" // {
         dependencies = [
           sources."base64-js-1.2.0"
           sources."ieee754-1.1.8"
-          sources."isarray-1.0.0"
         ];
       })
       sources."cached-path-relative-1.0.0"
@@ -19782,13 +19763,14 @@ in
   castnow = nodeEnv.buildNodePackage {
     name = "castnow";
     packageName = "castnow";
-    version = "0.4.17";
+    version = "0.4.18";
     src = fetchurl {
-      url = "https://registry.npmjs.org/castnow/-/castnow-0.4.17.tgz";
-      sha1 = "7d9ce3c5605b5aa74ae5348c826443374d5863a8";
+      url = "https://registry.npmjs.org/castnow/-/castnow-0.4.18.tgz";
+      sha1 = "4ffd81c55f381a5aa10c637607683a196830bdd8";
     };
     dependencies = [
       sources."array-loop-1.0.0"
+      sources."array-shuffle-1.0.1"
       (sources."castv2-client-1.2.0" // {
         dependencies = [
           (sources."castv2-0.1.9" // {
@@ -19863,7 +19845,11 @@ in
           sources."ms-0.7.2"
         ];
       })
-      sources."fs-extended-0.2.1"
+      (sources."diveSync-0.3.0" // {
+        dependencies = [
+          sources."append-0.1.1"
+        ];
+      })
       (sources."got-1.2.2" // {
         dependencies = [
           sources."object-assign-1.0.0"
@@ -20461,6 +20447,11 @@ in
           })
         ];
       })
+      (sources."xspfr-0.3.1" // {
+        dependencies = [
+          sources."underscore-1.6.0"
+        ];
+      })
       sources."xtend-4.0.1"
     ];
     buildInputs = globalBuildInputs;
@@ -20474,10 +20465,10 @@ in
   coffee-script = nodeEnv.buildNodePackage {
     name = "coffee-script";
     packageName = "coffee-script";
-    version = "1.12.2";
+    version = "1.12.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz";
-      sha1 = "0d4cbdee183f650da95419570c4929d08ef91376";
+      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.3.tgz";
+      sha1 = "de5f4b1b934a4e9f915c57acd7ad323f68f715db";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -20490,13 +20481,13 @@ in
   cordova = nodeEnv.buildNodePackage {
     name = "cordova";
     packageName = "cordova";
-    version = "6.4.0";
+    version = "6.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/cordova/-/cordova-6.4.0.tgz";
-      sha1 = "3fd9e8b9ad77a6a93ec76947704de21ac2991776";
+      url = "https://registry.npmjs.org/cordova/-/cordova-6.5.0.tgz";
+      sha1 = "e6ec81b17dd50c17c40b4b87330f7ced38fb0b47";
     };
     dependencies = [
-      (sources."cordova-common-1.5.1" // {
+      (sources."cordova-common-2.0.0" // {
         dependencies = [
           sources."ansi-0.3.1"
           (sources."bplist-parser-0.1.1" // {
@@ -20505,9 +20496,9 @@ in
             ];
           })
           sources."cordova-registry-mapper-1.1.15"
-          (sources."elementtree-0.1.6" // {
+          (sources."elementtree-0.1.7" // {
             dependencies = [
-              sources."sax-0.3.5"
+              sources."sax-1.1.4"
             ];
           })
           (sources."glob-5.0.15" // {
@@ -20561,7 +20552,7 @@ in
           sources."unorm-1.4.1"
         ];
       })
-      (sources."cordova-lib-6.4.0" // {
+      (sources."cordova-lib-6.5.0" // {
         dependencies = [
           (sources."aliasify-1.9.0" // {
             dependencies = [
@@ -20580,7 +20571,12 @@ in
               })
             ];
           })
-          (sources."cordova-fetch-1.0.1" // {
+          (sources."cordova-create-1.0.2" // {
+            dependencies = [
+              sources."cordova-app-hello-world-3.11.0"
+            ];
+          })
+          (sources."cordova-fetch-1.0.2" // {
             dependencies = [
               sources."dependency-ls-1.0.0"
               sources."is-url-1.2.2"
@@ -20624,14 +20620,9 @@ in
               })
             ];
           })
-          (sources."cordova-create-1.0.1" // {
+          (sources."cordova-js-4.2.1" // {
             dependencies = [
-              sources."cordova-app-hello-world-3.11.0"
-            ];
-          })
-          (sources."cordova-js-4.2.0" // {
-            dependencies = [
-              (sources."browserify-13.1.0" // {
+              (sources."browserify-13.3.0" // {
                 dependencies = [
                   (sources."JSONStream-1.3.0" // {
                     dependencies = [
@@ -20639,7 +20630,7 @@ in
                       sources."through-2.3.8"
                     ];
                   })
-                  sources."assert-1.3.0"
+                  sources."assert-1.4.1"
                   (sources."browser-pack-6.0.2" // {
                     dependencies = [
                       (sources."combine-source-map-0.7.2" // {
@@ -20670,6 +20661,7 @@ in
                       sources."isarray-1.0.0"
                     ];
                   })
+                  sources."cached-path-relative-1.0.0"
                   (sources."concat-stream-1.5.2" // {
                     dependencies = [
                       sources."typedarray-0.0.6"
@@ -20800,6 +20792,32 @@ in
                   sources."domain-browser-1.1.7"
                   sources."duplexer2-0.1.4"
                   sources."events-1.1.1"
+                  (sources."glob-7.1.1" // {
+                    dependencies = [
+                      sources."fs.realpath-1.0.0"
+                      (sources."inflight-1.0.6" // {
+                        dependencies = [
+                          sources."wrappy-1.0.2"
+                        ];
+                      })
+                      (sources."minimatch-3.0.3" // {
+                        dependencies = [
+                          (sources."brace-expansion-1.1.6" // {
+                            dependencies = [
+                              sources."balanced-match-0.4.2"
+                              sources."concat-map-0.0.1"
+                            ];
+                          })
+                        ];
+                      })
+                      (sources."once-1.4.0" // {
+                        dependencies = [
+                          sources."wrappy-1.0.2"
+                        ];
+                      })
+                      sources."path-is-absolute-1.0.1"
+                    ];
+                  })
                   (sources."has-1.0.1" // {
                     dependencies = [
                       sources."function-bind-1.1.0"
@@ -20838,7 +20856,6 @@ in
                   })
                   (sources."module-deps-4.0.8" // {
                     dependencies = [
-                      sources."cached-path-relative-1.0.0"
                       (sources."detective-4.3.2" // {
                         dependencies = [
                           sources."acorn-3.3.0"
@@ -20975,7 +20992,7 @@ in
                   sources."vary-1.1.0"
                 ];
               })
-              (sources."express-4.14.0" // {
+              (sources."express-4.14.1" // {
                 dependencies = [
                   (sources."accepts-1.3.3" // {
                     dependencies = [
@@ -20988,7 +21005,7 @@ in
                     ];
                   })
                   sources."array-flatten-1.1.1"
-                  sources."content-disposition-0.5.1"
+                  sources."content-disposition-0.5.2"
                   sources."content-type-1.0.2"
                   sources."cookie-0.3.1"
                   sources."cookie-signature-1.0.6"
@@ -21001,7 +21018,7 @@ in
                   sources."encodeurl-1.0.1"
                   sources."escape-html-1.0.3"
                   sources."etag-1.7.0"
-                  (sources."finalhandler-0.5.0" // {
+                  (sources."finalhandler-0.5.1" // {
                     dependencies = [
                       sources."statuses-1.3.1"
                       sources."unpipe-1.0.0"
@@ -21025,7 +21042,7 @@ in
                   })
                   sources."qs-6.2.0"
                   sources."range-parser-1.2.0"
-                  (sources."send-0.14.1" // {
+                  (sources."send-0.14.2" // {
                     dependencies = [
                       sources."destroy-1.0.4"
                       (sources."http-errors-1.5.1" // {
@@ -21035,11 +21052,11 @@ in
                         ];
                       })
                       sources."mime-1.3.4"
-                      sources."ms-0.7.1"
+                      sources."ms-0.7.2"
                       sources."statuses-1.3.1"
                     ];
                   })
-                  sources."serve-static-1.11.1"
+                  sources."serve-static-1.11.2"
                   (sources."type-is-1.6.14" // {
                     dependencies = [
                       sources."media-typer-0.3.0"
@@ -21657,7 +21674,7 @@ in
           })
           sources."unorm-1.3.3"
           sources."valid-identifier-0.0.1"
-          (sources."xcode-0.8.9" // {
+          (sources."xcode-0.9.1" // {
             dependencies = [
               sources."node-uuid-1.4.7"
               sources."pegjs-0.9.0"
@@ -22170,7 +22187,7 @@ in
       (sources."hiredis-0.4.1" // {
         dependencies = [
           sources."bindings-1.2.1"
-          sources."nan-2.5.0"
+          sources."nan-2.5.1"
         ];
       })
       (sources."json-rpc2-0.8.1" // {
@@ -22187,7 +22204,7 @@ in
               sources."better-curry-1.6.0"
             ];
           })
-          (sources."faye-websocket-0.11.0" // {
+          (sources."faye-websocket-0.11.1" // {
             dependencies = [
               (sources."websocket-driver-0.6.5" // {
                 dependencies = [
@@ -23034,15 +23051,15 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "3.13.1";
+    version = "3.14.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-3.13.1.tgz";
-      sha1 = "564d2646b5efded85df96985332edd91a23bff25";
+      url = "https://registry.npmjs.org/eslint/-/eslint-3.14.1.tgz";
+      sha1 = "8a62175f2255109494747a1b25128d97b8eb3d97";
     };
     dependencies = [
       (sources."babel-code-frame-6.22.0" // {
         dependencies = [
-          sources."js-tokens-3.0.0"
+          sources."js-tokens-3.0.1"
         ];
       })
       (sources."chalk-1.1.3" // {
@@ -23195,7 +23212,7 @@ in
         ];
       })
       sources."globals-9.14.0"
-      sources."ignore-3.2.0"
+      sources."ignore-3.2.2"
       sources."imurmurhash-0.1.4"
       (sources."inquirer-0.12.0" // {
         dependencies = [
@@ -23334,12 +23351,12 @@ in
       sources."strip-json-comments-2.0.1"
       (sources."table-3.8.3" // {
         dependencies = [
-          (sources."ajv-4.10.4" // {
+          (sources."ajv-4.11.2" // {
             dependencies = [
               sources."co-4.6.0"
             ];
           })
-          sources."ajv-keywords-1.5.0"
+          sources."ajv-keywords-1.5.1"
           sources."slice-ansi-0.0.4"
           (sources."string-width-2.0.0" // {
             dependencies = [
@@ -23599,7 +23616,7 @@ in
               })
               (sources."fsevents-1.0.17" // {
                 dependencies = [
-                  sources."nan-2.5.0"
+                  sources."nan-2.5.1"
                   (sources."node-pre-gyp-0.6.32" // {
                     dependencies = [
                       (sources."mkdirp-0.5.1" // {
@@ -24074,7 +24091,7 @@ in
       sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c";
     };
     dependencies = [
-      sources."coffee-script-1.12.2"
+      sources."coffee-script-1.12.3"
       (sources."jade-1.11.0" // {
         dependencies = [
           sources."character-parser-1.2.1"
@@ -24224,7 +24241,7 @@ in
       })
       (sources."msgpack-1.0.2" // {
         dependencies = [
-          sources."nan-2.5.0"
+          sources."nan-2.5.1"
         ];
       })
     ];
@@ -24814,6 +24831,22 @@ in
     };
     production = true;
   };
+  ios-deploy = nodeEnv.buildNodePackage {
+    name = "ios-deploy";
+    packageName = "ios-deploy";
+    version = "1.9.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/ios-deploy/-/ios-deploy-1.9.1.tgz";
+      sha1 = "e7dec9508bb464a1f2d546bb07fada41d2708e66";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "launch iOS apps iOS devices from the command line (Xcode 7)";
+      homepage = "https://github.com/phonegap/ios-deploy#readme";
+      license = "GPLv3";
+    };
+    production = true;
+  };
   istanbul = nodeEnv.buildNodePackage {
     name = "istanbul";
     packageName = "istanbul";
@@ -25132,10 +25165,10 @@ in
   karma = nodeEnv.buildNodePackage {
     name = "karma";
     packageName = "karma";
-    version = "1.4.0";
+    version = "1.4.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/karma/-/karma-1.4.0.tgz";
-      sha1 = "bf5edbccabb8579cb68ae699871f3e79608ec94b";
+      url = "https://registry.npmjs.org/karma/-/karma-1.4.1.tgz";
+      sha1 = "41981a71d54237606b0a3ea8c58c90773f41650e";
     };
     dependencies = [
       sources."bluebird-3.4.7"
@@ -25286,7 +25319,7 @@ in
           })
           (sources."fsevents-1.0.17" // {
             dependencies = [
-              sources."nan-2.5.0"
+              sources."nan-2.5.1"
               (sources."node-pre-gyp-0.6.32" // {
                 dependencies = [
                   (sources."mkdirp-0.5.1" // {
@@ -27201,7 +27234,7 @@ in
           sources."ms-0.7.2"
         ];
       })
-      (sources."express-4.14.0" // {
+      (sources."express-4.14.1" // {
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
@@ -27214,7 +27247,7 @@ in
             ];
           })
           sources."array-flatten-1.1.1"
-          sources."content-disposition-0.5.1"
+          sources."content-disposition-0.5.2"
           sources."content-type-1.0.2"
           sources."cookie-0.3.1"
           sources."cookie-signature-1.0.6"
@@ -27227,7 +27260,7 @@ in
           sources."encodeurl-1.0.1"
           sources."escape-html-1.0.3"
           sources."etag-1.7.0"
-          (sources."finalhandler-0.5.0" // {
+          (sources."finalhandler-0.5.1" // {
             dependencies = [
               sources."statuses-1.3.1"
               sources."unpipe-1.0.0"
@@ -27251,7 +27284,7 @@ in
           })
           sources."qs-6.2.0"
           sources."range-parser-1.2.0"
-          (sources."send-0.14.1" // {
+          (sources."send-0.14.2" // {
             dependencies = [
               sources."destroy-1.0.4"
               (sources."http-errors-1.5.1" // {
@@ -27261,11 +27294,11 @@ in
                 ];
               })
               sources."mime-1.3.4"
-              sources."ms-0.7.1"
+              sources."ms-0.7.2"
               sources."statuses-1.3.1"
             ];
           })
-          sources."serve-static-1.11.1"
+          sources."serve-static-1.11.2"
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
@@ -27330,7 +27363,7 @@ in
       })
       (sources."v8-debug-0.7.7" // {
         dependencies = [
-          sources."nan-2.5.0"
+          sources."nan-2.5.1"
           (sources."node-pre-gyp-0.6.32" // {
             dependencies = [
               (sources."mkdirp-0.5.1" // {
@@ -27598,7 +27631,7 @@ in
       })
       (sources."v8-profiler-5.6.5" // {
         dependencies = [
-          sources."nan-2.5.0"
+          sources."nan-2.5.1"
           (sources."node-pre-gyp-0.6.32" // {
             dependencies = [
               (sources."mkdirp-0.5.1" // {
@@ -28327,7 +28360,7 @@ in
           })
           (sources."fsevents-1.0.17" // {
             dependencies = [
-              sources."nan-2.5.0"
+              sources."nan-2.5.1"
               (sources."node-pre-gyp-0.6.32" // {
                 dependencies = [
                   (sources."mkdirp-0.5.1" // {
@@ -28810,10 +28843,10 @@ in
   node-red = nodeEnv.buildNodePackage {
     name = "node-red";
     packageName = "node-red";
-    version = "0.16.1";
+    version = "0.16.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-red/-/node-red-0.16.1.tgz";
-      sha1 = "eff4162e6e08ef7e2ae9b17ad99571876f7d895d";
+      url = "https://registry.npmjs.org/node-red/-/node-red-0.16.2.tgz";
+      sha1 = "3f77d608f1b0e89907af3f31e2c3eb8844a2b17b";
     };
     dependencies = [
       sources."basic-auth-1.1.0"
@@ -28995,7 +29028,24 @@ in
               sources."statuses-1.3.1"
             ];
           })
-          sources."serve-static-1.11.1"
+          (sources."serve-static-1.11.2" // {
+            dependencies = [
+              (sources."send-0.14.2" // {
+                dependencies = [
+                  sources."destroy-1.0.4"
+                  (sources."http-errors-1.5.1" // {
+                    dependencies = [
+                      sources."inherits-2.0.3"
+                      sources."setprototypeof-1.0.2"
+                    ];
+                  })
+                  sources."mime-1.3.4"
+                  sources."ms-0.7.2"
+                  sources."statuses-1.3.1"
+                ];
+              })
+            ];
+          })
           (sources."type-is-1.6.14" // {
             dependencies = [
               (sources."mime-types-2.1.14" // {
@@ -29616,11 +29666,11 @@ in
               })
             ];
           })
-          (sources."mailparser-0.6.1" // {
+          (sources."mailparser-0.6.2" // {
             dependencies = [
-              (sources."mimelib-0.2.19" // {
+              (sources."mimelib-0.3.0" // {
                 dependencies = [
-                  sources."addressparser-0.3.2"
+                  sources."addressparser-1.0.1"
                 ];
               })
               (sources."encoding-0.1.12" // {
@@ -30117,7 +30167,7 @@ in
       (sources."config-0.4.15" // {
         dependencies = [
           sources."js-yaml-0.3.7"
-          sources."coffee-script-1.12.2"
+          sources."coffee-script-1.12.3"
           (sources."vows-0.8.1" // {
             dependencies = [
               sources."eyes-0.1.8"
@@ -30244,13 +30294,13 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "4.1.1";
+    version = "4.1.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-4.1.1.tgz";
-      sha1 = "76d8f1f32a87619f000e0e25a0e6be90561484d4";
+      url = "https://registry.npmjs.org/npm/-/npm-4.1.2.tgz";
+      sha1 = "daaa77d631947135b36528c304573243f5cd2e07";
     };
     dependencies = [
-      (sources."JSONStream-1.2.1" // {
+      (sources."JSONStream-1.3.0" // {
         dependencies = [
           sources."jsonparse-1.3.0"
           sources."through-2.3.8"
@@ -30402,7 +30452,7 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      (sources."node-gyp-3.4.0" // {
+      (sources."node-gyp-3.5.0" // {
         dependencies = [
           (sources."minimatch-3.0.3" // {
             dependencies = [
@@ -30415,58 +30465,6 @@ in
             ];
           })
           sources."nopt-3.0.6"
-          (sources."npmlog-3.1.2" // {
-            dependencies = [
-              (sources."are-we-there-yet-1.1.2" // {
-                dependencies = [
-                  sources."delegates-1.0.0"
-                ];
-              })
-              sources."console-control-strings-1.1.0"
-              (sources."gauge-2.6.0" // {
-                dependencies = [
-                  sources."has-color-0.1.7"
-                  sources."object-assign-4.1.1"
-                  sources."signal-exit-3.0.2"
-                  (sources."string-width-1.0.2" // {
-                    dependencies = [
-                      sources."code-point-at-1.1.0"
-                      (sources."is-fullwidth-code-point-1.0.0" // {
-                        dependencies = [
-                          sources."number-is-nan-1.0.1"
-                        ];
-                      })
-                    ];
-                  })
-                  sources."wide-align-1.1.0"
-                ];
-              })
-              sources."set-blocking-2.0.0"
-            ];
-          })
-          (sources."path-array-1.0.1" // {
-            dependencies = [
-              (sources."array-index-1.0.0" // {
-                dependencies = [
-                  (sources."debug-2.6.0" // {
-                    dependencies = [
-                      sources."ms-0.7.2"
-                    ];
-                  })
-                  (sources."es6-symbol-3.1.0" // {
-                    dependencies = [
-                      sources."d-0.1.1"
-                      (sources."es5-ext-0.10.12" // {
-                        dependencies = [
-                          sources."es6-iterator-2.0.0"
-                        ];
-                      })
-                    ];
-                  })
-                ];
-              })
-            ];
-          })
         ];
       })
       sources."nopt-4.0.1"
@@ -30734,7 +30732,7 @@ in
         ];
       })
       sources."wrappy-1.0.2"
-      sources."write-file-atomic-1.2.0"
+      sources."write-file-atomic-1.3.1"
       sources."ansi-regex-2.1.1"
       sources."debuglog-1.0.1"
       sources."imurmurhash-0.1.4"
@@ -31087,7 +31085,7 @@ in
         ];
       })
       sources."findit-1.2.0"
-      sources."coffee-script-1.12.2"
+      sources."coffee-script-1.12.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -31911,9 +31909,9 @@ in
       sources."content-type-git+https://github.com/wikimedia/content-type.git#master"
       sources."core-js-2.4.1"
       sources."diff-1.4.0"
-      sources."domino-1.0.27"
+      sources."domino-1.0.28"
       sources."entities-1.1.1"
-      (sources."express-4.14.0" // {
+      (sources."express-4.14.1" // {
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
@@ -31925,7 +31923,7 @@ in
             ];
           })
           sources."array-flatten-1.1.1"
-          sources."content-disposition-0.5.1"
+          sources."content-disposition-0.5.2"
           sources."content-type-1.0.2"
           sources."cookie-0.3.1"
           sources."cookie-signature-1.0.6"
@@ -31938,12 +31936,6 @@ in
           sources."encodeurl-1.0.1"
           sources."escape-html-1.0.3"
           sources."etag-1.7.0"
-          (sources."finalhandler-0.5.0" // {
-            dependencies = [
-              sources."statuses-1.3.1"
-              sources."unpipe-1.0.0"
-            ];
-          })
           sources."fresh-0.3.0"
           sources."merge-descriptors-1.0.1"
           sources."methods-1.1.2"
@@ -31962,7 +31954,7 @@ in
           })
           sources."qs-6.2.0"
           sources."range-parser-1.2.0"
-          (sources."send-0.14.1" // {
+          (sources."send-0.14.2" // {
             dependencies = [
               sources."destroy-1.0.4"
               (sources."http-errors-1.5.1" // {
@@ -31972,11 +31964,11 @@ in
                 ];
               })
               sources."mime-1.3.4"
-              sources."ms-0.7.1"
+              sources."ms-0.7.2"
               sources."statuses-1.3.1"
             ];
           })
-          sources."serve-static-1.11.1"
+          sources."serve-static-1.11.2"
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
@@ -32270,7 +32262,7 @@ in
             dependencies = [
               (sources."dtrace-provider-0.8.0" // {
                 dependencies = [
-                  sources."nan-2.5.0"
+                  sources."nan-2.5.1"
                 ];
               })
               (sources."mv-2.1.1" // {
@@ -33310,10 +33302,10 @@ in
   peerflix-server = nodeEnv.buildNodePackage {
     name = "peerflix-server";
     packageName = "peerflix-server";
-    version = "0.1.2";
+    version = "0.1.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.2.tgz";
-      sha1 = "92d39be205b36a0986001a1d9ea34e3927937ab6";
+      url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.3.tgz";
+      sha1 = "1f3c2b81188de82482f64cf89d015f5428e4c4e5";
     };
     dependencies = [
       (sources."connect-multiparty-1.2.5" // {
@@ -34447,38 +34439,40 @@ in
       sha1 = "36bf5209356facbf6cef18fa32274d116043ed24";
     };
     dependencies = [
-      (sources."express-5.0.0-alpha.2" // {
+      (sources."express-5.0.0-alpha.3" // {
         dependencies = [
-          (sources."accepts-1.2.13" // {
+          (sources."accepts-1.3.3" // {
             dependencies = [
               (sources."mime-types-2.1.14" // {
                 dependencies = [
                   sources."mime-db-1.26.0"
                 ];
               })
-              sources."negotiator-0.5.3"
+              sources."negotiator-0.6.1"
             ];
           })
-          sources."array-flatten-1.1.0"
-          sources."content-disposition-0.5.0"
+          sources."array-flatten-2.1.1"
+          sources."content-disposition-0.5.2"
           sources."content-type-1.0.2"
-          sources."cookie-0.1.3"
+          sources."cookie-0.3.1"
           sources."cookie-signature-1.0.6"
           (sources."debug-2.2.0" // {
             dependencies = [
               sources."ms-0.7.1"
             ];
           })
-          sources."depd-1.0.1"
-          sources."escape-html-1.0.2"
+          sources."depd-1.1.0"
+          sources."encodeurl-1.0.1"
+          sources."escape-html-1.0.3"
           sources."etag-1.7.0"
-          (sources."finalhandler-0.4.0" // {
+          (sources."finalhandler-0.5.1" // {
             dependencies = [
+              sources."statuses-1.3.1"
               sources."unpipe-1.0.0"
             ];
           })
           sources."fresh-0.3.0"
-          sources."merge-descriptors-1.0.0"
+          sources."merge-descriptors-1.0.1"
           sources."methods-1.1.2"
           (sources."on-finished-2.3.0" // {
             dependencies = [
@@ -34486,55 +34480,30 @@ in
             ];
           })
           sources."parseurl-1.3.1"
-          sources."path-is-absolute-1.0.0"
-          sources."path-to-regexp-0.1.6"
-          (sources."proxy-addr-1.0.10" // {
+          sources."path-is-absolute-1.0.1"
+          sources."path-to-regexp-0.1.7"
+          (sources."proxy-addr-1.1.3" // {
             dependencies = [
               sources."forwarded-0.1.0"
-              sources."ipaddr.js-1.0.5"
+              sources."ipaddr.js-1.2.0"
             ];
           })
-          sources."qs-4.0.0"
-          sources."range-parser-1.0.3"
-          (sources."router-1.1.4" // {
+          sources."qs-6.2.0"
+          sources."range-parser-1.2.0"
+          (sources."router-1.1.5" // {
             dependencies = [
-              sources."array-flatten-2.0.0"
-              sources."path-to-regexp-0.1.7"
-              sources."setprototypeof-1.0.0"
+              sources."setprototypeof-1.0.2"
             ];
           })
-          (sources."send-0.13.0" // {
+          (sources."send-0.14.2" // {
             dependencies = [
-              sources."destroy-1.0.3"
-              (sources."http-errors-1.3.1" // {
-                dependencies = [
-                  sources."inherits-2.0.3"
-                ];
-              })
+              sources."destroy-1.0.4"
               sources."mime-1.3.4"
-              sources."ms-0.7.1"
-              sources."statuses-1.2.1"
-            ];
-          })
-          (sources."serve-static-1.10.3" // {
-            dependencies = [
-              sources."escape-html-1.0.3"
-              (sources."send-0.13.2" // {
-                dependencies = [
-                  sources."depd-1.1.0"
-                  sources."destroy-1.0.4"
-                  (sources."http-errors-1.3.1" // {
-                    dependencies = [
-                      sources."inherits-2.0.3"
-                    ];
-                  })
-                  sources."mime-1.3.4"
-                  sources."ms-0.7.1"
-                  sources."statuses-1.2.1"
-                ];
-              })
+              sources."ms-0.7.2"
+              sources."statuses-1.3.1"
             ];
           })
+          sources."serve-static-1.11.2"
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
@@ -34545,8 +34514,8 @@ in
               })
             ];
           })
-          sources."vary-1.0.1"
           sources."utils-merge-1.0.0"
+          sources."vary-1.1.0"
         ];
       })
       (sources."express-json5-0.1.0" // {
@@ -34762,7 +34731,7 @@ in
         dependencies = [
           (sources."dtrace-provider-0.8.0" // {
             dependencies = [
-              sources."nan-2.5.0"
+              sources."nan-2.5.1"
             ];
           })
           (sources."mv-2.1.1" // {
@@ -34905,12 +34874,12 @@ in
       })
       (sources."fs-ext-0.5.0" // {
         dependencies = [
-          sources."nan-2.5.0"
+          sources."nan-2.5.1"
         ];
       })
       (sources."crypt3-0.2.0" // {
         dependencies = [
-          sources."nan-2.5.0"
+          sources."nan-2.5.1"
         ];
       })
     ];
@@ -34928,13 +34897,17 @@ in
   sloc = nodeEnv.buildNodePackage {
     name = "sloc";
     packageName = "sloc";
-    version = "0.1.11";
+    version = "0.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/sloc/-/sloc-0.1.11.tgz";
-      sha1 = "341f94d44fe9b977c9e2109b134aa92f6394d411";
+      url = "https://registry.npmjs.org/sloc/-/sloc-0.2.0.tgz";
+      sha1 = "b42d3da1a442a489f454c32c628e8ebf0007875c";
     };
     dependencies = [
-      sources."async-1.5.2"
+      (sources."async-2.1.4" // {
+        dependencies = [
+          sources."lodash-4.17.4"
+        ];
+      })
       (sources."cli-table-0.3.1" // {
         dependencies = [
           sources."colors-1.0.3"
@@ -35007,7 +34980,7 @@ in
           (sources."csv-0.4.6" // {
             dependencies = [
               sources."csv-generate-0.0.6"
-              sources."csv-parse-1.1.10"
+              sources."csv-parse-1.2.0"
               sources."stream-transform-0.1.1"
               sources."csv-stringify-0.0.8"
             ];
@@ -35052,7 +35025,7 @@ in
           })
           (sources."dtrace-provider-0.6.0" // {
             dependencies = [
-              sources."nan-2.5.0"
+              sources."nan-2.5.1"
             ];
           })
         ];
@@ -35061,7 +35034,7 @@ in
         dependencies = [
           (sources."dtrace-provider-0.6.0" // {
             dependencies = [
-              sources."nan-2.5.0"
+              sources."nan-2.5.1"
             ];
           })
           (sources."mv-2.1.1" // {
@@ -35264,10 +35237,10 @@ in
   svgo = nodeEnv.buildNodePackage {
     name = "svgo";
     packageName = "svgo";
-    version = "0.7.1";
+    version = "0.7.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/svgo/-/svgo-0.7.1.tgz";
-      sha1 = "287320fed972cb097e72c2bb1685f96fe08f8034";
+      url = "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz";
+      sha1 = "9f5772413952135c6fefbf40afe6a4faa88b4bb5";
     };
     dependencies = [
       sources."sax-1.2.1"
@@ -35276,7 +35249,7 @@ in
           sources."q-1.4.1"
         ];
       })
-      (sources."js-yaml-3.6.1" // {
+      (sources."js-yaml-3.7.0" // {
         dependencies = [
           (sources."argparse-1.0.9" // {
             dependencies = [
@@ -35293,7 +35266,7 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      (sources."csso-2.2.1" // {
+      (sources."csso-2.3.1" // {
         dependencies = [
           (sources."clap-1.1.2" // {
             dependencies = [
@@ -35782,10 +35755,10 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.0.1";
+    version = "1.1.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.0.1.tgz";
-      sha1 = "83b852a8811f4c8f1446fd4f53b19a541c327418";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.3.tgz";
+      sha1 = "d07fd8486b5f82d65b3452671d30b16c59e13303";
     };
     dependencies = [
       sources."async-2.1.4"
@@ -35874,7 +35847,7 @@ in
           sources."whatwg-fetch-2.0.2"
         ];
       })
-      (sources."express-4.14.0" // {
+      (sources."express-4.14.1" // {
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
@@ -35887,7 +35860,7 @@ in
             ];
           })
           sources."array-flatten-1.1.1"
-          sources."content-disposition-0.5.1"
+          sources."content-disposition-0.5.2"
           sources."content-type-1.0.2"
           sources."cookie-0.3.1"
           sources."cookie-signature-1.0.6"
@@ -35900,7 +35873,7 @@ in
           sources."encodeurl-1.0.1"
           sources."escape-html-1.0.3"
           sources."etag-1.7.0"
-          (sources."finalhandler-0.5.0" // {
+          (sources."finalhandler-0.5.1" // {
             dependencies = [
               sources."statuses-1.3.1"
               sources."unpipe-1.0.0"
@@ -35924,7 +35897,7 @@ in
           })
           sources."qs-6.2.0"
           sources."range-parser-1.2.0"
-          (sources."send-0.14.1" // {
+          (sources."send-0.14.2" // {
             dependencies = [
               sources."destroy-1.0.4"
               (sources."http-errors-1.5.1" // {
@@ -35934,7 +35907,7 @@ in
                 ];
               })
               sources."mime-1.3.4"
-              sources."ms-0.7.1"
+              sources."ms-0.7.2"
               sources."statuses-1.3.1"
             ];
           })
@@ -36099,7 +36072,7 @@ in
         ];
       })
       sources."hasher-1.2.0"
-      sources."ignore-3.2.0"
+      sources."ignore-3.2.2"
       (sources."keen.io-0.1.3" // {
         dependencies = [
           sources."underscore-1.5.2"
@@ -36829,14 +36802,18 @@ in
         ];
       })
       sources."semver-5.3.0"
-      (sources."serve-static-1.11.1" // {
+      (sources."serve-static-1.11.2" // {
         dependencies = [
           sources."encodeurl-1.0.1"
           sources."escape-html-1.0.3"
           sources."parseurl-1.3.1"
-          (sources."send-0.14.1" // {
+          (sources."send-0.14.2" // {
             dependencies = [
-              sources."debug-2.2.0"
+              (sources."debug-2.2.0" // {
+                dependencies = [
+                  sources."ms-0.7.1"
+                ];
+              })
               sources."depd-1.1.0"
               sources."destroy-1.0.4"
               sources."etag-1.7.0"
@@ -36848,7 +36825,7 @@ in
                 ];
               })
               sources."mime-1.3.4"
-              sources."ms-0.7.1"
+              sources."ms-0.7.2"
               (sources."on-finished-2.3.0" // {
                 dependencies = [
                   sources."ee-first-1.1.1"
@@ -37448,22 +37425,39 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "1.14.0";
+    version = "2.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-1.14.0.tgz";
-      sha1 = "54f1ffb92051a328a5b2057d6ae33c289462c823";
+      url = "https://registry.npmjs.org/webpack/-/webpack-2.2.1.tgz";
+      sha1 = "7bb1d72ae2087dd1a4af526afec15eed17dda475";
     };
     dependencies = [
-      sources."acorn-3.3.0"
-      sources."async-1.5.2"
-      sources."clone-1.0.2"
-      (sources."enhanced-resolve-0.9.1" // {
+      sources."acorn-4.0.4"
+      sources."acorn-dynamic-import-2.0.1"
+      (sources."ajv-4.11.2" // {
         dependencies = [
-          sources."memory-fs-0.2.0"
-          sources."graceful-fs-4.1.11"
+          sources."co-4.6.0"
+          (sources."json-stable-stringify-1.0.1" // {
+            dependencies = [
+              sources."jsonify-0.0.0"
+            ];
+          })
         ];
       })
-      sources."interpret-0.6.6"
+      sources."ajv-keywords-1.5.1"
+      (sources."async-2.1.4" // {
+        dependencies = [
+          sources."lodash-4.17.4"
+        ];
+      })
+      (sources."enhanced-resolve-3.0.3" // {
+        dependencies = [
+          sources."graceful-fs-4.1.11"
+          sources."object-assign-4.1.1"
+        ];
+      })
+      sources."interpret-1.0.1"
+      sources."json-loader-0.5.4"
+      sources."loader-runner-2.3.0"
       (sources."loader-utils-0.2.16" // {
         dependencies = [
           sources."big.js-3.1.3"
@@ -37472,7 +37466,7 @@ in
           sources."object-assign-4.1.1"
         ];
       })
-      (sources."memory-fs-0.3.0" // {
+      (sources."memory-fs-0.4.1" // {
         dependencies = [
           (sources."errno-0.1.4" // {
             dependencies = [
@@ -37497,7 +37491,7 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      (sources."node-libs-browser-0.7.0" // {
+      (sources."node-libs-browser-2.0.0" // {
         dependencies = [
           sources."assert-1.4.1"
           (sources."browserify-zlib-0.1.4" // {
@@ -37518,16 +37512,111 @@ in
             ];
           })
           sources."constants-browserify-1.0.0"
-          (sources."crypto-browserify-3.3.0" // {
+          (sources."crypto-browserify-3.11.0" // {
             dependencies = [
-              sources."pbkdf2-compat-2.0.1"
-              sources."ripemd160-0.2.0"
-              sources."sha.js-2.2.6"
-              (sources."browserify-aes-0.4.0" // {
+              (sources."browserify-cipher-1.0.0" // {
                 dependencies = [
-                  sources."inherits-2.0.3"
+                  (sources."browserify-aes-1.0.6" // {
+                    dependencies = [
+                      sources."buffer-xor-1.0.3"
+                      sources."cipher-base-1.0.3"
+                    ];
+                  })
+                  (sources."browserify-des-1.0.0" // {
+                    dependencies = [
+                      sources."cipher-base-1.0.3"
+                      (sources."des.js-1.0.0" // {
+                        dependencies = [
+                          sources."minimalistic-assert-1.0.0"
+                        ];
+                      })
+                    ];
+                  })
+                  sources."evp_bytestokey-1.0.0"
                 ];
               })
+              (sources."browserify-sign-4.0.0" // {
+                dependencies = [
+                  sources."bn.js-4.11.6"
+                  sources."browserify-rsa-4.0.1"
+                  (sources."elliptic-6.3.2" // {
+                    dependencies = [
+                      sources."brorand-1.0.6"
+                      sources."hash.js-1.0.3"
+                    ];
+                  })
+                  (sources."parse-asn1-5.0.0" // {
+                    dependencies = [
+                      (sources."asn1.js-4.9.1" // {
+                        dependencies = [
+                          sources."minimalistic-assert-1.0.0"
+                        ];
+                      })
+                      (sources."browserify-aes-1.0.6" // {
+                        dependencies = [
+                          sources."buffer-xor-1.0.3"
+                          sources."cipher-base-1.0.3"
+                        ];
+                      })
+                      sources."evp_bytestokey-1.0.0"
+                    ];
+                  })
+                ];
+              })
+              (sources."create-ecdh-4.0.0" // {
+                dependencies = [
+                  sources."bn.js-4.11.6"
+                  (sources."elliptic-6.3.2" // {
+                    dependencies = [
+                      sources."brorand-1.0.6"
+                      sources."hash.js-1.0.3"
+                    ];
+                  })
+                ];
+              })
+              (sources."create-hash-1.1.2" // {
+                dependencies = [
+                  sources."cipher-base-1.0.3"
+                  sources."ripemd160-1.0.1"
+                  sources."sha.js-2.4.8"
+                ];
+              })
+              sources."create-hmac-1.1.4"
+              (sources."diffie-hellman-5.0.2" // {
+                dependencies = [
+                  sources."bn.js-4.11.6"
+                  (sources."miller-rabin-4.0.0" // {
+                    dependencies = [
+                      sources."brorand-1.0.6"
+                    ];
+                  })
+                ];
+              })
+              sources."inherits-2.0.3"
+              sources."pbkdf2-3.0.9"
+              (sources."public-encrypt-4.0.0" // {
+                dependencies = [
+                  sources."bn.js-4.11.6"
+                  sources."browserify-rsa-4.0.1"
+                  (sources."parse-asn1-5.0.0" // {
+                    dependencies = [
+                      (sources."asn1.js-4.9.1" // {
+                        dependencies = [
+                          sources."minimalistic-assert-1.0.0"
+                        ];
+                      })
+                      (sources."browserify-aes-1.0.6" // {
+                        dependencies = [
+                          sources."buffer-xor-1.0.3"
+                          sources."cipher-base-1.0.3"
+                        ];
+                      })
+                      sources."evp_bytestokey-1.0.0"
+                    ];
+                  })
+                ];
+              })
+              sources."randombytes-2.0.3"
             ];
           })
           sources."domain-browser-1.1.7"
@@ -37586,22 +37675,16 @@ in
           })
         ];
       })
-      (sources."optimist-0.6.1" // {
-        dependencies = [
-          sources."wordwrap-0.0.3"
-          sources."minimist-0.0.10"
-        ];
-      })
+      sources."source-map-0.5.6"
       (sources."supports-color-3.2.3" // {
         dependencies = [
           sources."has-flag-1.0.0"
         ];
       })
-      sources."tapable-0.1.10"
+      sources."tapable-0.2.6"
       (sources."uglify-js-2.7.5" // {
         dependencies = [
           sources."async-0.2.10"
-          sources."source-map-0.5.6"
           sources."uglify-to-browserify-1.0.2"
           (sources."yargs-3.10.0" // {
             dependencies = [
@@ -37648,9 +37731,8 @@ in
           })
         ];
       })
-      (sources."watchpack-0.2.9" // {
+      (sources."watchpack-1.2.0" // {
         dependencies = [
-          sources."async-0.9.2"
           (sources."chokidar-1.6.1" // {
             dependencies = [
               (sources."anymatch-1.3.0" // {
@@ -37767,7 +37849,7 @@ in
               })
               (sources."fsevents-1.0.17" // {
                 dependencies = [
-                  sources."nan-2.5.0"
+                  sources."nan-2.5.1"
                   (sources."node-pre-gyp-0.6.32" // {
                     dependencies = [
                       (sources."nopt-3.0.6" // {
@@ -38027,20 +38109,137 @@ in
           sources."graceful-fs-4.1.11"
         ];
       })
-      (sources."webpack-core-0.6.9" // {
+      (sources."webpack-sources-0.1.4" // {
         dependencies = [
-          (sources."source-map-0.4.4" // {
+          sources."source-list-map-0.1.8"
+        ];
+      })
+      (sources."yargs-6.6.0" // {
+        dependencies = [
+          sources."camelcase-3.0.0"
+          (sources."cliui-3.2.0" // {
             dependencies = [
-              sources."amdefine-1.0.1"
+              (sources."strip-ansi-3.0.1" // {
+                dependencies = [
+                  sources."ansi-regex-2.1.1"
+                ];
+              })
+              sources."wrap-ansi-2.1.0"
             ];
           })
-          sources."source-list-map-0.1.8"
+          sources."decamelize-1.2.0"
+          sources."get-caller-file-1.0.2"
+          (sources."os-locale-1.4.0" // {
+            dependencies = [
+              (sources."lcid-1.0.0" // {
+                dependencies = [
+                  sources."invert-kv-1.0.0"
+                ];
+              })
+            ];
+          })
+          (sources."read-pkg-up-1.0.1" // {
+            dependencies = [
+              (sources."find-up-1.1.2" // {
+                dependencies = [
+                  sources."path-exists-2.1.0"
+                  (sources."pinkie-promise-2.0.1" // {
+                    dependencies = [
+                      sources."pinkie-2.0.4"
+                    ];
+                  })
+                ];
+              })
+              (sources."read-pkg-1.1.0" // {
+                dependencies = [
+                  (sources."load-json-file-1.1.0" // {
+                    dependencies = [
+                      sources."graceful-fs-4.1.11"
+                      (sources."parse-json-2.2.0" // {
+                        dependencies = [
+                          (sources."error-ex-1.3.0" // {
+                            dependencies = [
+                              sources."is-arrayish-0.2.1"
+                            ];
+                          })
+                        ];
+                      })
+                      sources."pify-2.3.0"
+                      (sources."pinkie-promise-2.0.1" // {
+                        dependencies = [
+                          sources."pinkie-2.0.4"
+                        ];
+                      })
+                      (sources."strip-bom-2.0.0" // {
+                        dependencies = [
+                          sources."is-utf8-0.2.1"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."normalize-package-data-2.3.5" // {
+                    dependencies = [
+                      sources."hosted-git-info-2.1.5"
+                      (sources."is-builtin-module-1.0.0" // {
+                        dependencies = [
+                          sources."builtin-modules-1.1.1"
+                        ];
+                      })
+                      sources."semver-5.3.0"
+                      (sources."validate-npm-package-license-3.0.1" // {
+                        dependencies = [
+                          (sources."spdx-correct-1.0.2" // {
+                            dependencies = [
+                              sources."spdx-license-ids-1.2.2"
+                            ];
+                          })
+                          sources."spdx-expression-parse-1.0.4"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."path-type-1.1.0" // {
+                    dependencies = [
+                      sources."graceful-fs-4.1.11"
+                      sources."pify-2.3.0"
+                      (sources."pinkie-promise-2.0.1" // {
+                        dependencies = [
+                          sources."pinkie-2.0.4"
+                        ];
+                      })
+                    ];
+                  })
+                ];
+              })
+            ];
+          })
+          sources."require-directory-2.1.1"
+          sources."require-main-filename-1.0.1"
+          sources."set-blocking-2.0.0"
+          (sources."string-width-1.0.2" // {
+            dependencies = [
+              sources."code-point-at-1.1.0"
+              (sources."is-fullwidth-code-point-1.0.0" // {
+                dependencies = [
+                  sources."number-is-nan-1.0.1"
+                ];
+              })
+              (sources."strip-ansi-3.0.1" // {
+                dependencies = [
+                  sources."ansi-regex-2.1.1"
+                ];
+              })
+            ];
+          })
+          sources."which-module-1.0.0"
+          sources."y18n-3.2.1"
+          sources."yargs-parser-4.2.1"
         ];
       })
     ];
     buildInputs = globalBuildInputs;
     meta = {
-      description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jade, coffee, css, less, ... and your custom stuff.";
+      description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.";
       homepage = https://github.com/webpack/webpack;
       license = "MIT";
     };
@@ -38206,7 +38405,7 @@ in
         dependencies = [
           (sources."loose-envify-1.3.1" // {
             dependencies = [
-              sources."js-tokens-3.0.0"
+              sources."js-tokens-3.0.1"
             ];
           })
         ];
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 7de48f6c175..59e73e58070 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -3190,13 +3190,13 @@ let
         sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d";
       };
     };
-    "buffer-4.9.1" = {
+    "buffer-5.0.2" = {
       name = "buffer";
       packageName = "buffer";
-      version = "4.9.1";
+      version = "5.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz";
-        sha1 = "6d1bb601b07a4efced97094132093027c95bc298";
+        url = "https://registry.npmjs.org/buffer/-/buffer-5.0.2.tgz";
+        sha1 = "41d0407ff76782e9ec19f52f88e237ce6bb0de6d";
       };
     };
     "cached-path-relative-1.0.0" = {
@@ -4063,6 +4063,15 @@ let
         sha1 = "c033d086cf0d12af73aed5a99c0cedb37367b395";
       };
     };
+    "array-shuffle-1.0.1" = {
+      name = "array-shuffle";
+      packageName = "array-shuffle";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-shuffle/-/array-shuffle-1.0.1.tgz";
+        sha1 = "7ea4882a356b4bca5f545e0b6e52eaf6d971557a";
+      };
+    };
     "castv2-client-1.2.0" = {
       name = "castv2-client";
       packageName = "castv2-client";
@@ -4099,13 +4108,13 @@ let
         sha1 = "e74befcd1a62ae7a5e5fbfbfa6f5d2bacd962bdd";
       };
     };
-    "fs-extended-0.2.1" = {
-      name = "fs-extended";
-      packageName = "fs-extended";
-      version = "0.2.1";
+    "diveSync-0.3.0" = {
+      name = "diveSync";
+      packageName = "diveSync";
+      version = "0.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extended/-/fs-extended-0.2.1.tgz";
-        sha1 = "3910358127e9c72c8296c30142c7763b5f5e2d3a";
+        url = "https://registry.npmjs.org/diveSync/-/diveSync-0.3.0.tgz";
+        sha1 = "d9980493ae33beec36f4fec6f171ff218130cc12";
       };
     };
     "got-1.2.2" = {
@@ -4225,6 +4234,15 @@ let
         sha1 = "17be93eaae3f3b779359c795b419705a8817e868";
       };
     };
+    "xspfr-0.3.1" = {
+      name = "xspfr";
+      packageName = "xspfr";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xspfr/-/xspfr-0.3.1.tgz";
+        sha1 = "f164263325ae671f53836fb210c7ddbcfda46598";
+      };
+    };
     "castv2-0.1.9" = {
       name = "castv2";
       packageName = "castv2";
@@ -4423,6 +4441,15 @@ let
         sha1 = "4ea54ea5a08938153185e15210c68d9092bc1b78";
       };
     };
+    "append-0.1.1" = {
+      name = "append";
+      packageName = "append";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/append/-/append-0.1.1.tgz";
+        sha1 = "7e5dd327747078d877286fbb624b1e8f4d2b396b";
+      };
+    };
     "object-assign-1.0.0" = {
       name = "object-assign";
       packageName = "object-assign";
@@ -5557,22 +5584,22 @@ let
         sha1 = "aa58a3041a066f90eaa16c2f5389ff19f3f461a5";
       };
     };
-    "cordova-common-1.5.1" = {
+    "cordova-common-2.0.0" = {
       name = "cordova-common";
       packageName = "cordova-common";
-      version = "1.5.1";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-common/-/cordova-common-1.5.1.tgz";
-        sha1 = "6770de0d6200ad6f94a1abe8939b5bd9ece139e3";
+        url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.0.0.tgz";
+        sha1 = "125097eb4b50b7353cec226ed21649192293ae97";
       };
     };
-    "cordova-lib-6.4.0" = {
+    "cordova-lib-6.5.0" = {
       name = "cordova-lib";
       packageName = "cordova-lib";
-      version = "6.4.0";
+      version = "6.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-6.4.0.tgz";
-        sha1 = "a3ad3c366c60baf104701a67a7877af75555ed33";
+        url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-6.5.0.tgz";
+        sha1 = "f7630a04c29d6cdee980190b1d93fb1536ac453f";
       };
     };
     "insight-0.8.4" = {
@@ -5647,13 +5674,13 @@ let
         sha1 = "e244b9185b8175473bff6079324905115f83dc7c";
       };
     };
-    "elementtree-0.1.6" = {
+    "elementtree-0.1.7" = {
       name = "elementtree";
       packageName = "elementtree";
-      version = "0.1.6";
+      version = "0.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz";
-        sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c";
+        url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz";
+        sha1 = "9ac91be6e52fb6e6244c4e54a4ac3ed8ae8e29c0";
       };
     };
     "glob-5.0.15" = {
@@ -5719,13 +5746,13 @@ let
         sha1 = "f0dcf5109a949e42a993ee3e8fb2070452817b51";
       };
     };
-    "sax-0.3.5" = {
+    "sax-1.1.4" = {
       name = "sax";
       packageName = "sax";
-      version = "0.3.5";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz";
-        sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d";
+        url = "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz";
+        sha1 = "74b6d33c9ae1e001510f179a91168588f1aedaa9";
       };
     };
     "base64-js-0.0.8" = {
@@ -5755,31 +5782,31 @@ let
         sha1 = "03aa1a5fe5b4cac604e3b967bc4c7ceacf957030";
       };
     };
-    "cordova-fetch-1.0.1" = {
-      name = "cordova-fetch";
-      packageName = "cordova-fetch";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.0.1.tgz";
-        sha1 = "3122ed3dca8e83eae0345f83f3a8cc33680bf769";
-      };
-    };
-    "cordova-create-1.0.1" = {
+    "cordova-create-1.0.2" = {
       name = "cordova-create";
       packageName = "cordova-create";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-create/-/cordova-create-1.0.1.tgz";
-        sha1 = "f1810401807ceec436ece27241180a83c97f8212";
+        url = "https://registry.npmjs.org/cordova-create/-/cordova-create-1.0.2.tgz";
+        sha1 = "cb9bba9817c62a645bacb6e00da8cc50936a0fa5";
       };
     };
-    "cordova-js-4.2.0" = {
+    "cordova-fetch-1.0.2" = {
+      name = "cordova-fetch";
+      packageName = "cordova-fetch";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.0.2.tgz";
+        sha1 = "b8f4903f39fe613888062552a96995413af16d35";
+      };
+    };
+    "cordova-js-4.2.1" = {
       name = "cordova-js";
       packageName = "cordova-js";
-      version = "4.2.0";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.0.tgz";
-        sha1 = "e89689ae1b69637cae7c2f4a800f4b10104db980";
+        url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.1.tgz";
+        sha1 = "01ca186e14e63b01cb6d24e469750e481a038355";
       };
     };
     "cordova-serve-1.0.1" = {
@@ -5800,6 +5827,15 @@ let
         sha1 = "fade86a92799a813e9b42511cdf3dfa6cc8dbefe";
       };
     };
+    "elementtree-0.1.6" = {
+      name = "elementtree";
+      packageName = "elementtree";
+      version = "0.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz";
+        sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c";
+      };
+    };
     "init-package-json-1.9.4" = {
       name = "init-package-json";
       packageName = "init-package-json";
@@ -5899,13 +5935,13 @@ let
         sha1 = "ef1d7093a9d3287e3fce92df916f8616b23f90b4";
       };
     };
-    "xcode-0.8.9" = {
+    "xcode-0.9.1" = {
       name = "xcode";
       packageName = "xcode";
-      version = "0.8.9";
+      version = "0.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xcode/-/xcode-0.8.9.tgz";
-        sha1 = "ec6765f70e9dccccc9f6e9a5b9b4e7e814b4cf35";
+        url = "https://registry.npmjs.org/xcode/-/xcode-0.9.1.tgz";
+        sha1 = "5b4e71b71b03573ff0cdb48439103e8107da0f95";
       };
     };
     "browserify-transform-tools-1.5.3" = {
@@ -5944,6 +5980,15 @@ let
         sha1 = "c54601778ad560f1142ce0e01bcca8b56d13426d";
       };
     };
+    "cordova-app-hello-world-3.11.0" = {
+      name = "cordova-app-hello-world";
+      packageName = "cordova-app-hello-world";
+      version = "3.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.11.0.tgz";
+        sha1 = "9214feb9dd713ca481a1cbabceeca60966c1c0cf";
+      };
+    };
     "dependency-ls-1.0.0" = {
       name = "dependency-ls";
       packageName = "dependency-ls";
@@ -5989,31 +6034,22 @@ let
         sha1 = "85204b54dba82d5742e28c96756ef43af50e3384";
       };
     };
-    "cordova-app-hello-world-3.11.0" = {
-      name = "cordova-app-hello-world";
-      packageName = "cordova-app-hello-world";
-      version = "3.11.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.11.0.tgz";
-        sha1 = "9214feb9dd713ca481a1cbabceeca60966c1c0cf";
-      };
-    };
-    "browserify-13.1.0" = {
+    "browserify-13.3.0" = {
       name = "browserify";
       packageName = "browserify";
-      version = "13.1.0";
+      version = "13.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify/-/browserify-13.1.0.tgz";
-        sha1 = "d81a018e98dd7ca706ec04253d20f8a03b2af8ae";
+        url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz";
+        sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce";
       };
     };
-    "assert-1.3.0" = {
-      name = "assert";
-      packageName = "assert";
-      version = "1.3.0";
+    "buffer-4.9.1" = {
+      name = "buffer";
+      packageName = "buffer";
+      version = "4.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz";
-        sha1 = "03939a622582a812cc202320a0b9a56c9b815849";
+        url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz";
+        sha1 = "6d1bb601b07a4efced97094132093027c95bc298";
       };
     };
     "compression-1.6.2" = {
@@ -6025,13 +6061,13 @@ let
         sha1 = "cceb121ecc9d09c52d7ad0c3350ea93ddd402bc3";
       };
     };
-    "express-4.14.0" = {
+    "express-4.14.1" = {
       name = "express";
       packageName = "express";
-      version = "4.14.0";
+      version = "4.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-4.14.0.tgz";
-        sha1 = "c1ee3f42cdc891fb3dc650a8922d51ec847d0d66";
+        url = "https://registry.npmjs.org/express/-/express-4.14.1.tgz";
+        sha1 = "646c237f766f148c2120aff073817b9e4d7e0d33";
       };
     };
     "accepts-1.3.3" = {
@@ -6115,13 +6151,13 @@ let
         sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2";
       };
     };
-    "content-disposition-0.5.1" = {
+    "content-disposition-0.5.2" = {
       name = "content-disposition";
       packageName = "content-disposition";
-      version = "0.5.1";
+      version = "0.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.1.tgz";
-        sha1 = "87476c6a67c8daa87e32e87616df883ba7fb071b";
+        url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz";
+        sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4";
       };
     };
     "content-type-1.0.2" = {
@@ -6187,13 +6223,13 @@ let
         sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8";
       };
     };
-    "finalhandler-0.5.0" = {
+    "finalhandler-0.5.1" = {
       name = "finalhandler";
       packageName = "finalhandler";
-      version = "0.5.0";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz";
-        sha1 = "e9508abece9b6dba871a6942a1d7911b91911ac7";
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz";
+        sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd";
       };
     };
     "fresh-0.3.0" = {
@@ -6268,22 +6304,22 @@ let
         sha1 = "3b7848c03c2dece69a9522b0fae8c4126d745f3b";
       };
     };
-    "send-0.14.1" = {
+    "send-0.14.2" = {
       name = "send";
       packageName = "send";
-      version = "0.14.1";
+      version = "0.14.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.14.1.tgz";
-        sha1 = "a954984325392f51532a7760760e459598c89f7a";
+        url = "https://registry.npmjs.org/send/-/send-0.14.2.tgz";
+        sha1 = "39b0438b3f510be5dc6f667a11f71689368cdeef";
       };
     };
-    "serve-static-1.11.1" = {
+    "serve-static-1.11.2" = {
       name = "serve-static";
       packageName = "serve-static";
-      version = "1.11.1";
+      version = "1.11.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.11.1.tgz";
-        sha1 = "d6cce7693505f733c759de57befc1af76c0f0805";
+        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.11.2.tgz";
+        sha1 = "2cf9889bd4435a320cc36895c9aa57bd662e6ac7";
       };
     };
     "type-is-1.6.14" = {
@@ -6376,6 +6412,15 @@ let
         sha1 = "fc5c6b0765673d92a2d4ac8b4dc0aa88702e2bd4";
       };
     };
+    "sax-0.3.5" = {
+      name = "sax";
+      packageName = "sax";
+      version = "0.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz";
+        sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d";
+      };
+    };
     "npm-package-arg-4.2.0" = {
       name = "npm-package-arg";
       packageName = "npm-package-arg";
@@ -8015,13 +8060,13 @@ let
         sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
       };
     };
-    "nan-2.5.0" = {
+    "nan-2.5.1" = {
       name = "nan";
       packageName = "nan";
-      version = "2.5.0";
+      version = "2.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz";
-        sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8";
+        url = "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz";
+        sha1 = "d5b01691253326a97a2bbee9e61c55d8d60351e2";
       };
     };
     "jsonparse-0.0.6" = {
@@ -8060,13 +8105,13 @@ let
         sha1 = "42c5c18a9016bcb0db28a4d340ebb831f55d1b66";
       };
     };
-    "faye-websocket-0.11.0" = {
+    "faye-websocket-0.11.1" = {
       name = "faye-websocket";
       packageName = "faye-websocket";
-      version = "0.11.0";
+      version = "0.11.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.0.tgz";
-        sha1 = "d9ccf0e789e7db725d74bc4877d23aa42972ac50";
+        url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz";
+        sha1 = "f0efe18c4f56e4f40afc7e06c719fd5ee6188f38";
       };
     };
     "eventemitter3-0.1.6" = {
@@ -9026,13 +9071,13 @@ let
         sha1 = "8859936af0038741263053b39d0e76ca241e4034";
       };
     };
-    "ignore-3.2.0" = {
+    "ignore-3.2.2" = {
       name = "ignore";
       packageName = "ignore";
-      version = "3.2.0";
+      version = "3.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ignore/-/ignore-3.2.0.tgz";
-        sha1 = "8d88f03c3002a0ac52114db25d2c673b0bf1e435";
+        url = "https://registry.npmjs.org/ignore/-/ignore-3.2.2.tgz";
+        sha1 = "1c51e1ef53bab6ddc15db4d9ac4ec139eceb3410";
       };
     };
     "inquirer-0.12.0" = {
@@ -9143,13 +9188,13 @@ let
         sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f";
       };
     };
-    "js-tokens-3.0.0" = {
+    "js-tokens-3.0.1" = {
       name = "js-tokens";
       packageName = "js-tokens";
-      version = "3.0.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.0.tgz";
-        sha1 = "a2f2a969caae142fb3cd56228358c89366957bd1";
+        url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz";
+        sha1 = "08e9f132484a2c45a30907e9dc4d5567b7f114d7";
       };
     };
     "es6-map-0.1.4" = {
@@ -9440,22 +9485,22 @@ let
         sha1 = "afab96262910a7f33c19a5775825c69f34e350ca";
       };
     };
-    "ajv-4.10.4" = {
+    "ajv-4.11.2" = {
       name = "ajv";
       packageName = "ajv";
-      version = "4.10.4";
+      version = "4.11.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.10.4.tgz";
-        sha1 = "c0974dd00b3464984892d6010aa9c2c945933254";
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.2.tgz";
+        sha1 = "f166c3c11cbc6cb9dcc102a5bcfe5b72c95287e6";
       };
     };
-    "ajv-keywords-1.5.0" = {
+    "ajv-keywords-1.5.1" = {
       name = "ajv-keywords";
       packageName = "ajv-keywords";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.0.tgz";
-        sha1 = "c11e6859eafff83e0dafc416929472eca946aa2c";
+        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz";
+        sha1 = "314dd0a4b3368fad3dfcdc54ede6171b886daf3c";
       };
     };
     "slice-ansi-0.0.4" = {
@@ -10197,13 +10242,13 @@ let
         sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149";
       };
     };
-    "coffee-script-1.12.2" = {
+    "coffee-script-1.12.3" = {
       name = "coffee-script";
       packageName = "coffee-script";
-      version = "1.12.2";
+      version = "1.12.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz";
-        sha1 = "0d4cbdee183f650da95419570c4929d08ef91376";
+        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.3.tgz";
+        sha1 = "de5f4b1b934a4e9f915c57acd7ad323f68f715db";
       };
     };
     "jade-1.11.0" = {
@@ -11646,6 +11691,15 @@ let
         sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96";
       };
     };
+    "finalhandler-0.5.0" = {
+      name = "finalhandler";
+      packageName = "finalhandler";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz";
+        sha1 = "e9508abece9b6dba871a6942a1d7911b91911ac7";
+      };
+    };
     "custom-event-1.0.1" = {
       name = "custom-event";
       packageName = "custom-event";
@@ -13302,6 +13356,15 @@ let
         sha1 = "3a86c09b41b8f261ac863a7cc85ea4735857eab2";
       };
     };
+    "express-4.14.0" = {
+      name = "express";
+      packageName = "express";
+      version = "4.14.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/express/-/express-4.14.0.tgz";
+        sha1 = "c1ee3f42cdc891fb3dc650a8922d51ec847d0d66";
+      };
+    };
     "follow-redirects-1.2.1" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
@@ -13608,6 +13671,24 @@ let
         sha1 = "9b76c03d8ef514c7e4249a7bbce649eed39ef29f";
       };
     };
+    "content-disposition-0.5.1" = {
+      name = "content-disposition";
+      packageName = "content-disposition";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.1.tgz";
+        sha1 = "87476c6a67c8daa87e32e87616df883ba7fb071b";
+      };
+    };
+    "send-0.14.1" = {
+      name = "send";
+      packageName = "send";
+      version = "0.14.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/send/-/send-0.14.1.tgz";
+        sha1 = "a954984325392f51532a7760760e459598c89f7a";
+      };
+    };
     "retry-0.6.1" = {
       name = "retry";
       packageName = "retry";
@@ -13770,13 +13851,13 @@ let
         sha1 = "2f4b58b5592972350cd97f482aba68f8e05574bc";
       };
     };
-    "mailparser-0.6.1" = {
+    "mailparser-0.6.2" = {
       name = "mailparser";
       packageName = "mailparser";
-      version = "0.6.1";
+      version = "0.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mailparser/-/mailparser-0.6.1.tgz";
-        sha1 = "3de4db3f4a90c160c06d8cb8b825a7f1c6f6a7c3";
+        url = "https://registry.npmjs.org/mailparser/-/mailparser-0.6.2.tgz";
+        sha1 = "03c486039bdf4df6cd3b6adcaaac4107dfdbc068";
       };
     };
     "imap-0.8.19" = {
@@ -13896,13 +13977,13 @@ let
         sha1 = "586db8101db30cb4438eb546737a41aad0cf13d5";
       };
     };
-    "mimelib-0.2.19" = {
+    "mimelib-0.3.0" = {
       name = "mimelib";
       packageName = "mimelib";
-      version = "0.2.19";
+      version = "0.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mimelib/-/mimelib-0.2.19.tgz";
-        sha1 = "37ec90a6ac7d00954851d0b2c31618f0a49da0ee";
+        url = "https://registry.npmjs.org/mimelib/-/mimelib-0.3.0.tgz";
+        sha1 = "4b16d4b435403daf692bc227890c7165ff3de894";
       };
     };
     "encoding-0.1.12" = {
@@ -13923,6 +14004,15 @@ let
         sha1 = "5d67d37030e66efebbb4b8aac46daf9b55befbf6";
       };
     };
+    "addressparser-1.0.1" = {
+      name = "addressparser";
+      packageName = "addressparser";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz";
+        sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746";
+      };
+    };
     "utf7-1.0.2" = {
       name = "utf7";
       packageName = "utf7";
@@ -13950,6 +14040,15 @@ let
         sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971";
       };
     };
+    "nan-2.5.0" = {
+      name = "nan";
+      packageName = "nan";
+      version = "2.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz";
+        sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8";
+      };
+    };
     "mongoose-3.6.7" = {
       name = "mongoose";
       packageName = "mongoose";
@@ -14454,15 +14553,6 @@ let
         sha1 = "51a1a9e7448ecbd32cda54421675bb21bc093da6";
       };
     };
-    "addressparser-1.0.1" = {
-      name = "addressparser";
-      packageName = "addressparser";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz";
-        sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746";
-      };
-    };
     "nodemailer-fetch-1.6.0" = {
       name = "nodemailer-fetch";
       packageName = "nodemailer-fetch";
@@ -14544,15 +14634,6 @@ let
         sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
       };
     };
-    "JSONStream-1.2.1" = {
-      name = "JSONStream";
-      packageName = "JSONStream";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.2.1.tgz";
-        sha1 = "32aa5790e799481083b49b4b7fa94e23bae69bf9";
-      };
-    };
     "fstream-npm-1.2.0" = {
       name = "fstream-npm";
       packageName = "fstream-npm";
@@ -14616,6 +14697,15 @@ let
         sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c";
       };
     };
+    "node-gyp-3.5.0" = {
+      name = "node-gyp";
+      packageName = "node-gyp";
+      version = "3.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz";
+        sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a";
+      };
+    };
     "nopt-4.0.1" = {
       name = "nopt";
       packageName = "nopt";
@@ -14688,15 +14778,6 @@ let
         sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3";
       };
     };
-    "write-file-atomic-1.2.0" = {
-      name = "write-file-atomic";
-      packageName = "write-file-atomic";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz";
-        sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab";
-      };
-    };
     "lodash._baseindexof-3.1.0" = {
       name = "lodash._baseindexof";
       packageName = "lodash._baseindexof";
@@ -15057,6 +15138,15 @@ let
         sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93";
       };
     };
+    "write-file-atomic-1.2.0" = {
+      name = "write-file-atomic";
+      packageName = "write-file-atomic";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz";
+        sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab";
+      };
+    };
     "form-data-2.0.0" = {
       name = "form-data";
       packageName = "form-data";
@@ -15247,13 +15337,13 @@ let
         sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf";
       };
     };
-    "domino-1.0.27" = {
+    "domino-1.0.28" = {
       name = "domino";
       packageName = "domino";
-      version = "1.0.27";
+      version = "1.0.28";
       src = fetchurl {
-        url = "https://registry.npmjs.org/domino/-/domino-1.0.27.tgz";
-        sha1 = "26bc01f739707505c51456af7f59e3373369475d";
+        url = "https://registry.npmjs.org/domino/-/domino-1.0.28.tgz";
+        sha1 = "9ce3f6a9221a2c3288984b14ea191cd27b392f87";
       };
     };
     "express-handlebars-3.0.0" = {
@@ -15265,15 +15355,6 @@ let
         sha1 = "80a070bb819b09e4af2ca6d0780f75ce05e75c2f";
       };
     };
-    "finalhandler-0.5.1" = {
-      name = "finalhandler";
-      packageName = "finalhandler";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz";
-        sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd";
-      };
-    };
     "gelf-stream-0.2.4" = {
       name = "gelf-stream";
       packageName = "gelf-stream";
@@ -16916,13 +16997,13 @@ let
         sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4";
       };
     };
-    "express-5.0.0-alpha.2" = {
+    "express-5.0.0-alpha.3" = {
       name = "express";
       packageName = "express";
-      version = "5.0.0-alpha.2";
+      version = "5.0.0-alpha.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.2.tgz";
-        sha1 = "fd54177f657b6a4c4540727702edd1cbaa3a6ac5";
+        url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.3.tgz";
+        sha1 = "19d63b931bf0f64c42725952ef0602c381fe64db";
       };
     };
     "express-json5-0.1.0" = {
@@ -17006,58 +17087,13 @@ let
         sha1 = "4bd28e0770fad421fc807745c1ef3010905b2332";
       };
     };
-    "array-flatten-1.1.0" = {
-      name = "array-flatten";
-      packageName = "array-flatten";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.0.tgz";
-        sha1 = "ac3efac717b0e7bbdc778ce0bde7381ac6604393";
-      };
-    };
-    "path-is-absolute-1.0.0" = {
-      name = "path-is-absolute";
-      packageName = "path-is-absolute";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz";
-        sha1 = "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912";
-      };
-    };
-    "path-to-regexp-0.1.6" = {
-      name = "path-to-regexp";
-      packageName = "path-to-regexp";
-      version = "0.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.6.tgz";
-        sha1 = "f01fd5734047b6bfbc5f208c6135a33d7af09c36";
-      };
-    };
-    "router-1.1.4" = {
+    "router-1.1.5" = {
       name = "router";
       packageName = "router";
-      version = "1.1.4";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/router/-/router-1.1.4.tgz";
-        sha1 = "5d449dde9d6e0ad5c3f53369064baf7798834a97";
-      };
-    };
-    "array-flatten-2.0.0" = {
-      name = "array-flatten";
-      packageName = "array-flatten";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.0.0.tgz";
-        sha1 = "24dd98b38b9194b59b2087ba40c21384d6b8a8dc";
-      };
-    };
-    "setprototypeof-1.0.0" = {
-      name = "setprototypeof";
-      packageName = "setprototypeof";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.0.tgz";
-        sha1 = "d5fafca01e1174d0079bd1bf881f09c8a339794c";
+        url = "https://registry.npmjs.org/router/-/router-1.1.5.tgz";
+        sha1 = "c9c6935201b30ac1f227ada6af86e8cea6515387";
       };
     };
     "raw-body-1.3.4" = {
@@ -17339,13 +17375,13 @@ let
         sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66";
       };
     };
-    "csv-parse-1.1.10" = {
+    "csv-parse-1.2.0" = {
       name = "csv-parse";
       packageName = "csv-parse";
-      version = "1.1.10";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.1.10.tgz";
-        sha1 = "767340d0d1f26d05434c798b7132222c669189de";
+        url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.2.0.tgz";
+        sha1 = "047b73868ab9a85746e885f637f9ed0fb645a425";
       };
     };
     "stream-transform-0.1.1" = {
@@ -17510,15 +17546,6 @@ let
         sha1 = "7f959346cfc8719e3f7233cd6852854a7c67d8a3";
       };
     };
-    "js-yaml-3.6.1" = {
-      name = "js-yaml";
-      packageName = "js-yaml";
-      version = "3.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz";
-        sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30";
-      };
-    };
     "whet.extend-0.9.9" = {
       name = "whet.extend";
       packageName = "whet.extend";
@@ -17528,13 +17555,13 @@ let
         sha1 = "f877d5bf648c97e5aa542fadc16d6a259b9c11a1";
       };
     };
-    "csso-2.2.1" = {
+    "csso-2.3.1" = {
       name = "csso";
       packageName = "csso";
-      version = "2.2.1";
+      version = "2.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csso/-/csso-2.2.1.tgz";
-        sha1 = "51fbb5347e50e81e6ed51668a48490ae6fe2afe2";
+        url = "https://registry.npmjs.org/csso/-/csso-2.3.1.tgz";
+        sha1 = "4f8d91a156f2f1c2aebb40b8fb1b5eb83d94d3b9";
       };
     };
     "clap-1.1.2" = {
@@ -18095,15 +18122,6 @@ let
         sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
       };
     };
-    "node-gyp-3.5.0" = {
-      name = "node-gyp";
-      packageName = "node-gyp";
-      version = "3.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz";
-        sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a";
-      };
-    };
     "lsmod-1.0.0" = {
       name = "lsmod";
       packageName = "lsmod";
@@ -18185,22 +18203,40 @@ let
         sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65";
       };
     };
-    "enhanced-resolve-0.9.1" = {
-      name = "enhanced-resolve";
-      packageName = "enhanced-resolve";
-      version = "0.9.1";
+    "acorn-dynamic-import-2.0.1" = {
+      name = "acorn-dynamic-import";
+      packageName = "acorn-dynamic-import";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz";
-        sha1 = "4d6e689b3725f86090927ccc86cd9f1635b89e2e";
+        url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.1.tgz";
+        sha1 = "23f671eb6e650dab277fef477c321b1178a8cca2";
       };
     };
-    "interpret-0.6.6" = {
-      name = "interpret";
-      packageName = "interpret";
-      version = "0.6.6";
+    "enhanced-resolve-3.0.3" = {
+      name = "enhanced-resolve";
+      packageName = "enhanced-resolve";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/interpret/-/interpret-0.6.6.tgz";
-        sha1 = "fecd7a18e7ce5ca6abfb953e1f86213a49f1625b";
+        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.0.3.tgz";
+        sha1 = "df14c06b5fc5eecade1094c9c5a12b4b3edc0b62";
+      };
+    };
+    "json-loader-0.5.4" = {
+      name = "json-loader";
+      packageName = "json-loader";
+      version = "0.5.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz";
+        sha1 = "8baa1365a632f58a3c46d20175fc6002c96e37de";
+      };
+    };
+    "loader-runner-2.3.0" = {
+      name = "loader-runner";
+      packageName = "loader-runner";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz";
+        sha1 = "f482aea82d543e07921700d5a46ef26fdac6b8a2";
       };
     };
     "loader-utils-0.2.16" = {
@@ -18212,58 +18248,49 @@ let
         sha1 = "f08632066ed8282835dff88dfb52704765adee6d";
       };
     };
-    "memory-fs-0.3.0" = {
+    "memory-fs-0.4.1" = {
       name = "memory-fs";
       packageName = "memory-fs";
-      version = "0.3.0";
+      version = "0.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz";
-        sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20";
+        url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz";
+        sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552";
       };
     };
-    "node-libs-browser-0.7.0" = {
+    "node-libs-browser-2.0.0" = {
       name = "node-libs-browser";
       packageName = "node-libs-browser";
-      version = "0.7.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.7.0.tgz";
-        sha1 = "3e272c0819e308935e26674408d7af0e1491b83b";
+        url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz";
+        sha1 = "a3a59ec97024985b46e958379646f96c4b616646";
       };
     };
-    "tapable-0.1.10" = {
+    "tapable-0.2.6" = {
       name = "tapable";
       packageName = "tapable";
-      version = "0.1.10";
+      version = "0.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz";
-        sha1 = "29c35707c2b70e50d07482b5d202e8ed446dafd4";
+        url = "https://registry.npmjs.org/tapable/-/tapable-0.2.6.tgz";
+        sha1 = "206be8e188860b514425375e6f1ae89bfb01fd8d";
       };
     };
-    "watchpack-0.2.9" = {
+    "watchpack-1.2.0" = {
       name = "watchpack";
       packageName = "watchpack";
-      version = "0.2.9";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/watchpack/-/watchpack-0.2.9.tgz";
-        sha1 = "62eaa4ab5e5ba35fdfc018275626e3c0f5e3fb0b";
+        url = "https://registry.npmjs.org/watchpack/-/watchpack-1.2.0.tgz";
+        sha1 = "15d4620f1e7471f13fcb551d5c030d2c3eb42dbb";
       };
     };
-    "webpack-core-0.6.9" = {
-      name = "webpack-core";
-      packageName = "webpack-core";
-      version = "0.6.9";
+    "webpack-sources-0.1.4" = {
+      name = "webpack-sources";
+      packageName = "webpack-sources";
+      version = "0.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz";
-        sha1 = "fc571588c8558da77be9efb6debdc5a3b172bdc2";
-      };
-    };
-    "memory-fs-0.2.0" = {
-      name = "memory-fs";
-      packageName = "memory-fs";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz";
-        sha1 = "f2bb25368bc121e391c2520de92969caee0a0290";
+        url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.4.tgz";
+        sha1 = "ccc2c817e08e5fa393239412690bb481821393cd";
       };
     };
     "big.js-3.1.3" = {
@@ -18293,15 +18320,6 @@ let
         sha1 = "1eade7acc012034ad84e2396767ead9fa5495821";
       };
     };
-    "crypto-browserify-3.3.0" = {
-      name = "crypto-browserify";
-      packageName = "crypto-browserify";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.3.0.tgz";
-        sha1 = "b9fc75bb4a0ed61dcf1cd5dae96eb30c9c3e506c";
-      };
-    };
     "os-browserify-0.2.1" = {
       name = "os-browserify";
       packageName = "os-browserify";
@@ -18320,42 +18338,6 @@ let
         sha1 = "ab4883cf597dcd50af211349a00fbca56ac86b86";
       };
     };
-    "pbkdf2-compat-2.0.1" = {
-      name = "pbkdf2-compat";
-      packageName = "pbkdf2-compat";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz";
-        sha1 = "b6e0c8fa99494d94e0511575802a59a5c142f288";
-      };
-    };
-    "ripemd160-0.2.0" = {
-      name = "ripemd160";
-      packageName = "ripemd160";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz";
-        sha1 = "2bf198bde167cacfa51c0a928e84b68bbe171fce";
-      };
-    };
-    "sha.js-2.2.6" = {
-      name = "sha.js";
-      packageName = "sha.js";
-      version = "2.2.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz";
-        sha1 = "17ddeddc5f722fb66501658895461977867315ba";
-      };
-    };
-    "browserify-aes-0.4.0" = {
-      name = "browserify-aes";
-      packageName = "browserify-aes";
-      version = "0.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-0.4.0.tgz";
-        sha1 = "067149b668df31c4b58533e02d01e806d8608e2c";
-      };
-    };
     "setimmediate-1.0.5" = {
       name = "setimmediate";
       packageName = "setimmediate";
@@ -18524,10 +18506,10 @@ in
   alloy = nodeEnv.buildNodePackage {
     name = "alloy";
     packageName = "alloy";
-    version = "1.9.5";
+    version = "1.9.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.5.tgz";
-      sha1 = "78be031931f4b9012f6085e1544069c56dcba233";
+      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.6.tgz";
+      sha1 = "550505b1a9133189e98276952ad845b8cbcfdc9e";
     };
     dependencies = [
       sources."colors-0.6.0-1"
@@ -19085,10 +19067,10 @@ in
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "13.3.0";
+    version = "14.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz";
-      sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce";
+      url = "https://registry.npmjs.org/browserify/-/browserify-14.0.0.tgz";
+      sha1 = "67e6cfe7acb2fb1a1908e8a763452306de0bcf38";
     };
     dependencies = [
       sources."JSONStream-1.3.0"
@@ -19100,7 +19082,7 @@ in
         ];
       })
       sources."browserify-zlib-0.1.4"
-      sources."buffer-4.9.1"
+      sources."buffer-5.0.2"
       sources."cached-path-relative-1.0.0"
       (sources."concat-stream-1.5.2" // {
         dependencies = [
@@ -19173,9 +19155,9 @@ in
       sources."pako-0.2.9"
       sources."base64-js-1.2.0"
       sources."ieee754-1.1.8"
-      sources."isarray-1.0.0"
       sources."typedarray-0.0.6"
       sources."core-util-is-1.0.2"
+      sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
       sources."util-deprecate-1.0.2"
       sources."date-now-0.1.4"
@@ -19250,19 +19232,20 @@ in
   castnow = nodeEnv.buildNodePackage {
     name = "castnow";
     packageName = "castnow";
-    version = "0.4.17";
+    version = "0.4.18";
     src = fetchurl {
-      url = "https://registry.npmjs.org/castnow/-/castnow-0.4.17.tgz";
-      sha1 = "7d9ce3c5605b5aa74ae5348c826443374d5863a8";
+      url = "https://registry.npmjs.org/castnow/-/castnow-0.4.18.tgz";
+      sha1 = "4ffd81c55f381a5aa10c637607683a196830bdd8";
     };
     dependencies = [
       sources."array-loop-1.0.0"
+      sources."array-shuffle-1.0.1"
       sources."castv2-client-1.2.0"
       sources."chalk-1.0.0"
       sources."chromecast-player-0.2.3"
       sources."debounced-seeker-1.0.0"
       sources."debug-2.6.0"
-      sources."fs-extended-0.2.1"
+      sources."diveSync-0.3.0"
       sources."got-1.2.2"
       sources."internal-ip-1.2.0"
       sources."keypress-0.2.1"
@@ -19303,6 +19286,7 @@ in
           sources."lodash-4.17.4"
         ];
       })
+      sources."xspfr-0.3.1"
       sources."xtend-4.0.1"
       sources."castv2-0.1.9"
       sources."protobufjs-3.8.2"
@@ -19330,6 +19314,7 @@ in
       sources."wrap-fn-0.1.5"
       sources."co-3.1.0"
       sources."ms-0.7.2"
+      sources."append-0.1.1"
       sources."object-assign-1.0.0"
       (sources."meow-3.7.0" // {
         dependencies = [
@@ -19596,6 +19581,7 @@ in
       sources."typedarray-0.0.6"
       sources."graceful-readlink-1.0.1"
       sources."sax-1.2.1"
+      sources."underscore-1.6.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -19608,10 +19594,10 @@ in
   coffee-script = nodeEnv.buildNodePackage {
     name = "coffee-script";
     packageName = "coffee-script";
-    version = "1.12.2";
+    version = "1.12.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz";
-      sha1 = "0d4cbdee183f650da95419570c4929d08ef91376";
+      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.3.tgz";
+      sha1 = "de5f4b1b934a4e9f915c57acd7ad323f68f715db";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -19624,24 +19610,26 @@ in
   cordova = nodeEnv.buildNodePackage {
     name = "cordova";
     packageName = "cordova";
-    version = "6.4.0";
+    version = "6.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/cordova/-/cordova-6.4.0.tgz";
-      sha1 = "3fd9e8b9ad77a6a93ec76947704de21ac2991776";
+      url = "https://registry.npmjs.org/cordova/-/cordova-6.5.0.tgz";
+      sha1 = "e6ec81b17dd50c17c40b4b87330f7ced38fb0b47";
     };
     dependencies = [
-      (sources."cordova-common-1.5.1" // {
+      (sources."cordova-common-2.0.0" // {
         dependencies = [
           sources."q-1.4.1"
           sources."underscore-1.8.3"
         ];
       })
-      (sources."cordova-lib-6.4.0" // {
+      (sources."cordova-lib-6.5.0" // {
         dependencies = [
+          sources."elementtree-0.1.6"
           sources."nopt-3.0.6"
           sources."semver-4.3.6"
           sources."shelljs-0.3.0"
           sources."unorm-1.3.3"
+          sources."sax-0.3.5"
         ];
       })
       (sources."insight-0.8.4" // {
@@ -19658,7 +19646,7 @@ in
       sources."ansi-0.3.1"
       sources."bplist-parser-0.1.1"
       sources."cordova-registry-mapper-1.1.15"
-      sources."elementtree-0.1.6"
+      sources."elementtree-0.1.7"
       sources."glob-5.0.15"
       sources."minimatch-3.0.3"
       sources."osenv-0.1.4"
@@ -19667,7 +19655,7 @@ in
       sources."shelljs-0.5.3"
       sources."unorm-1.4.1"
       sources."big-integer-1.6.17"
-      sources."sax-0.3.5"
+      sources."sax-1.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."once-1.4.0"
@@ -19684,19 +19672,19 @@ in
       sources."util-deprecate-1.0.2"
       sources."lodash-3.10.1"
       sources."aliasify-1.9.0"
-      (sources."cordova-fetch-1.0.1" // {
+      (sources."cordova-create-1.0.2" // {
+        dependencies = [
+          sources."shelljs-0.3.0"
+        ];
+      })
+      (sources."cordova-fetch-1.0.2" // {
         dependencies = [
           sources."q-1.4.1"
           sources."shelljs-0.7.6"
           sources."glob-7.1.1"
         ];
       })
-      (sources."cordova-create-1.0.1" // {
-        dependencies = [
-          sources."shelljs-0.3.0"
-        ];
-      })
-      sources."cordova-js-4.2.0"
+      sources."cordova-js-4.2.1"
       (sources."cordova-serve-1.0.1" // {
         dependencies = [
           sources."q-1.4.1"
@@ -19754,7 +19742,7 @@ in
       })
       sources."tar-1.0.2"
       sources."valid-identifier-0.0.1"
-      sources."xcode-0.8.9"
+      sources."xcode-0.9.1"
       sources."browserify-transform-tools-1.5.3"
       sources."falafel-1.2.0"
       sources."through-2.3.8"
@@ -19762,6 +19750,7 @@ in
       sources."foreach-2.0.5"
       sources."isarray-0.0.1"
       sources."object-keys-1.0.11"
+      sources."cordova-app-hello-world-3.11.0"
       (sources."dependency-ls-1.0.0" // {
         dependencies = [
           sources."q-1.4.1"
@@ -19772,10 +19761,13 @@ in
       sources."rechoir-0.6.2"
       sources."fs.realpath-1.0.0"
       sources."resolve-1.2.0"
-      sources."cordova-app-hello-world-3.11.0"
-      sources."browserify-13.1.0"
+      (sources."browserify-13.3.0" // {
+        dependencies = [
+          sources."glob-7.1.1"
+        ];
+      })
       sources."JSONStream-1.3.0"
-      sources."assert-1.3.0"
+      sources."assert-1.4.1"
       sources."browser-pack-6.0.2"
       (sources."browser-resolve-1.11.2" // {
         dependencies = [
@@ -19789,6 +19781,7 @@ in
           sources."isarray-1.0.0"
         ];
       })
+      sources."cached-path-relative-1.0.0"
       (sources."concat-stream-1.5.2" // {
         dependencies = [
           sources."readable-stream-2.0.6"
@@ -19891,7 +19884,6 @@ in
       sources."lexical-scope-1.2.0"
       sources."astw-2.0.0"
       sources."stream-splicer-2.0.0"
-      sources."cached-path-relative-1.0.0"
       (sources."detective-4.3.2" // {
         dependencies = [
           sources."acorn-3.3.0"
@@ -19912,7 +19904,7 @@ in
       sources."indexof-0.0.1"
       sources."chalk-1.1.3"
       sources."compression-1.6.2"
-      sources."express-4.14.0"
+      sources."express-4.14.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
@@ -19930,7 +19922,7 @@ in
       sources."mime-db-1.26.0"
       sources."ms-0.7.1"
       sources."array-flatten-1.1.1"
-      sources."content-disposition-0.5.1"
+      sources."content-disposition-0.5.2"
       sources."content-type-1.0.2"
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
@@ -19938,7 +19930,7 @@ in
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.7.0"
-      sources."finalhandler-0.5.0"
+      sources."finalhandler-0.5.1"
       sources."fresh-0.3.0"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
@@ -19948,8 +19940,12 @@ in
       sources."proxy-addr-1.1.3"
       sources."qs-6.2.0"
       sources."range-parser-1.2.0"
-      sources."send-0.14.1"
-      sources."serve-static-1.11.1"
+      (sources."send-0.14.2" // {
+        dependencies = [
+          sources."ms-0.7.2"
+        ];
+      })
+      sources."serve-static-1.11.2"
       sources."type-is-1.6.14"
       sources."utils-merge-1.0.0"
       sources."statuses-1.3.1"
@@ -20332,10 +20328,10 @@ in
       sources."destroy-1.0.3"
       sources."mime-1.2.11"
       sources."bindings-1.2.1"
-      sources."nan-2.5.0"
+      sources."nan-2.5.1"
       sources."jsonparse-0.0.6"
       sources."es5class-2.3.1"
-      sources."faye-websocket-0.11.0"
+      sources."faye-websocket-0.11.1"
       sources."eventemitter3-0.1.6"
       sources."better-curry-1.6.0"
       sources."websocket-driver-0.6.5"
@@ -20740,10 +20736,10 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "3.13.1";
+    version = "3.14.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-3.13.1.tgz";
-      sha1 = "564d2646b5efded85df96985332edd91a23bff25";
+      url = "https://registry.npmjs.org/eslint/-/eslint-3.14.1.tgz";
+      sha1 = "8a62175f2255109494747a1b25128d97b8eb3d97";
     };
     dependencies = [
       sources."babel-code-frame-6.22.0"
@@ -20758,7 +20754,7 @@ in
       sources."file-entry-cache-2.0.0"
       sources."glob-7.1.1"
       sources."globals-9.14.0"
-      sources."ignore-3.2.0"
+      sources."ignore-3.2.2"
       sources."imurmurhash-0.1.4"
       sources."inquirer-0.12.0"
       sources."is-my-json-valid-2.15.0"
@@ -20785,7 +20781,7 @@ in
       })
       sources."text-table-0.2.0"
       sources."user-home-2.0.0"
-      sources."js-tokens-3.0.0"
+      sources."js-tokens-3.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
@@ -20885,8 +20881,8 @@ in
       sources."interpret-1.0.1"
       sources."rechoir-0.6.2"
       sources."resolve-1.2.0"
-      sources."ajv-4.10.4"
-      sources."ajv-keywords-1.5.0"
+      sources."ajv-4.11.2"
+      sources."ajv-keywords-1.5.1"
       sources."slice-ansi-0.0.4"
       sources."co-4.6.0"
       sources."os-homedir-1.0.2"
@@ -21057,7 +21053,7 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
-      sources."nan-2.5.0"
+      sources."nan-2.5.1"
       sources."node-pre-gyp-0.6.32"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
@@ -21279,7 +21275,7 @@ in
       sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c";
     };
     dependencies = [
-      sources."coffee-script-1.12.2"
+      sources."coffee-script-1.12.3"
       sources."jade-1.11.0"
       (sources."q-2.0.3" // {
         dependencies = [
@@ -21355,7 +21351,7 @@ in
       sources."sax-1.2.1"
       sources."xmlbuilder-4.2.1"
       sources."lodash-4.17.4"
-      sources."nan-2.5.0"
+      sources."nan-2.5.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -21669,6 +21665,22 @@ in
     };
     production = true;
   };
+  ios-deploy = nodeEnv.buildNodePackage {
+    name = "ios-deploy";
+    packageName = "ios-deploy";
+    version = "1.9.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/ios-deploy/-/ios-deploy-1.9.1.tgz";
+      sha1 = "e7dec9508bb464a1f2d546bb07fada41d2708e66";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "launch iOS apps iOS devices from the command line (Xcode 7)";
+      homepage = "https://github.com/phonegap/ios-deploy#readme";
+      license = "GPLv3";
+    };
+    production = true;
+  };
   istanbul = nodeEnv.buildNodePackage {
     name = "istanbul";
     packageName = "istanbul";
@@ -21885,10 +21897,10 @@ in
   karma = nodeEnv.buildNodePackage {
     name = "karma";
     packageName = "karma";
-    version = "1.4.0";
+    version = "1.4.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/karma/-/karma-1.4.0.tgz";
-      sha1 = "bf5edbccabb8579cb68ae699871f3e79608ec94b";
+      url = "https://registry.npmjs.org/karma/-/karma-1.4.1.tgz";
+      sha1 = "41981a71d54237606b0a3ea8c58c90773f41650e";
     };
     dependencies = [
       sources."bluebird-3.4.7"
@@ -22013,7 +22025,7 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
-      sources."nan-2.5.0"
+      sources."nan-2.5.1"
       sources."node-pre-gyp-0.6.32"
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
@@ -22912,7 +22924,7 @@ in
       sources."async-0.9.2"
       sources."biased-opener-0.2.8"
       sources."debug-2.6.0"
-      (sources."express-4.14.0" // {
+      (sources."express-4.14.1" // {
         dependencies = [
           sources."debug-2.2.0"
           sources."ms-0.7.1"
@@ -23008,7 +23020,7 @@ in
       sources."ms-0.7.2"
       sources."accepts-1.3.3"
       sources."array-flatten-1.1.1"
-      sources."content-disposition-0.5.1"
+      sources."content-disposition-0.5.2"
       sources."content-type-1.0.2"
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
@@ -23016,7 +23028,7 @@ in
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.7.0"
-      (sources."finalhandler-0.5.0" // {
+      (sources."finalhandler-0.5.1" // {
         dependencies = [
           sources."debug-2.2.0"
           sources."ms-0.7.1"
@@ -23031,13 +23043,16 @@ in
       sources."proxy-addr-1.1.3"
       sources."qs-6.2.0"
       sources."range-parser-1.2.0"
-      (sources."send-0.14.1" // {
+      (sources."send-0.14.2" // {
         dependencies = [
-          sources."debug-2.2.0"
-          sources."ms-0.7.1"
+          (sources."debug-2.2.0" // {
+            dependencies = [
+              sources."ms-0.7.1"
+            ];
+          })
         ];
       })
-      sources."serve-static-1.11.1"
+      sources."serve-static-1.11.2"
       sources."type-is-1.6.14"
       sources."utils-merge-1.0.0"
       sources."vary-1.1.0"
@@ -23066,7 +23081,7 @@ in
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
       sources."truncate-1.0.5"
-      sources."nan-2.5.0"
+      sources."nan-2.5.1"
       (sources."node-pre-gyp-0.6.32" // {
         dependencies = [
           sources."rimraf-2.5.4"
@@ -23435,7 +23450,7 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
-      sources."nan-2.5.0"
+      sources."nan-2.5.1"
       sources."node-pre-gyp-0.6.32"
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
@@ -23634,10 +23649,10 @@ in
   node-red = nodeEnv.buildNodePackage {
     name = "node-red";
     packageName = "node-red";
-    version = "0.16.1";
+    version = "0.16.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-red/-/node-red-0.16.1.tgz";
-      sha1 = "eff4162e6e08ef7e2ae9b17ad99571876f7d895d";
+      url = "https://registry.npmjs.org/node-red/-/node-red-0.16.2.tgz";
+      sha1 = "3f77d608f1b0e89907af3f31e2c3eb8844a2b17b";
     };
     dependencies = [
       sources."basic-auth-1.1.0"
@@ -23771,7 +23786,12 @@ in
       sources."proxy-addr-1.1.3"
       sources."range-parser-1.2.0"
       sources."send-0.14.1"
-      sources."serve-static-1.11.1"
+      (sources."serve-static-1.11.2" // {
+        dependencies = [
+          sources."send-0.14.2"
+          sources."ms-0.7.2"
+        ];
+      })
       sources."utils-merge-1.0.0"
       sources."negotiator-0.6.1"
       sources."forwarded-0.1.0"
@@ -23998,7 +24018,7 @@ in
       sources."punycode-1.4.1"
       sources."nodemailer-1.11.0"
       sources."poplib-0.1.7"
-      sources."mailparser-0.6.1"
+      sources."mailparser-0.6.2"
       (sources."imap-0.8.19" // {
         dependencies = [
           sources."readable-stream-1.1.14"
@@ -24029,9 +24049,9 @@ in
           sources."minimist-0.0.10"
         ];
       })
-      (sources."mimelib-0.2.19" // {
+      (sources."mimelib-0.3.0" // {
         dependencies = [
-          sources."addressparser-0.3.2"
+          sources."addressparser-1.0.1"
         ];
       })
       sources."encoding-0.1.12"
@@ -24167,7 +24187,7 @@ in
       sources."bytes-0.2.0"
       sources."pause-0.0.1"
       sources."mime-1.2.6"
-      sources."coffee-script-1.12.2"
+      sources."coffee-script-1.12.3"
       sources."vows-0.8.1"
       sources."eyes-0.1.8"
       sources."diff-1.0.8"
@@ -24232,13 +24252,13 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "4.1.1";
+    version = "4.1.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-4.1.1.tgz";
-      sha1 = "76d8f1f32a87619f000e0e25a0e6be90561484d4";
+      url = "https://registry.npmjs.org/npm/-/npm-4.1.2.tgz";
+      sha1 = "daaa77d631947135b36528c304573243f5cd2e07";
     };
     dependencies = [
-      sources."JSONStream-1.2.1"
+      sources."JSONStream-1.3.0"
       sources."abbrev-1.0.9"
       sources."ansicolors-0.3.2"
       sources."ansistyles-0.1.3"
@@ -24276,10 +24296,9 @@ in
       sources."lodash.without-4.4.0"
       sources."mississippi-1.2.0"
       sources."mkdirp-0.5.1"
-      (sources."node-gyp-3.4.0" // {
+      (sources."node-gyp-3.5.0" // {
         dependencies = [
           sources."nopt-3.0.6"
-          sources."npmlog-3.1.2"
         ];
       })
       sources."nopt-4.0.1"
@@ -24290,11 +24309,7 @@ in
       sources."npm-package-arg-4.2.0"
       sources."npm-registry-client-7.4.5"
       sources."npm-user-validate-0.1.5"
-      (sources."npmlog-4.0.2" // {
-        dependencies = [
-          sources."gauge-2.7.2"
-        ];
-      })
+      sources."npmlog-4.0.2"
       sources."once-1.4.0"
       sources."opener-1.4.2"
       sources."osenv-0.1.4"
@@ -24335,7 +24350,7 @@ in
       sources."validate-npm-package-name-2.2.2"
       sources."which-1.2.12"
       sources."wrappy-1.0.2"
-      sources."write-file-atomic-1.2.0"
+      sources."write-file-atomic-1.3.1"
       sources."ansi-regex-2.1.1"
       sources."debuglog-1.0.1"
       sources."imurmurhash-0.1.4"
@@ -24385,13 +24400,14 @@ in
       sources."stream-shift-1.0.0"
       sources."xtend-4.0.1"
       sources."minimist-0.0.8"
-      sources."path-array-1.0.1"
+      sources."is-builtin-module-1.0.0"
+      sources."builtin-modules-1.1.1"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.6.0"
+      sources."gauge-2.7.2"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."has-color-0.1.7"
+      sources."supports-color-0.2.0"
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
@@ -24399,16 +24415,6 @@ in
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      sources."array-index-1.0.0"
-      sources."debug-2.6.0"
-      sources."es6-symbol-3.1.0"
-      sources."ms-0.7.2"
-      sources."d-0.1.1"
-      sources."es5-ext-0.10.12"
-      sources."es6-iterator-2.0.0"
-      sources."is-builtin-module-1.0.0"
-      sources."builtin-modules-1.1.1"
-      sources."supports-color-0.2.0"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
       sources."mute-stream-0.0.7"
@@ -24545,7 +24551,7 @@ in
       })
       sources."fs.extra-1.3.2"
       sources."findit-1.2.0"
-      sources."coffee-script-1.12.2"
+      sources."coffee-script-1.12.3"
       sources."underscore-1.4.4"
       sources."underscore.string-2.3.3"
       sources."request-2.79.0"
@@ -25049,13 +25055,12 @@ in
       sources."content-type-git+https://github.com/wikimedia/content-type.git#master"
       sources."core-js-2.4.1"
       sources."diff-1.4.0"
-      sources."domino-1.0.27"
+      sources."domino-1.0.28"
       sources."entities-1.1.1"
-      (sources."express-4.14.0" // {
+      (sources."express-4.14.1" // {
         dependencies = [
           sources."content-type-1.0.2"
           sources."debug-2.2.0"
-          sources."finalhandler-0.5.0"
           sources."qs-6.2.0"
           sources."ms-0.7.1"
         ];
@@ -25131,7 +25136,7 @@ in
       sources."isarray-0.0.1"
       sources."string_decoder-0.10.31"
       sources."array-flatten-1.1.1"
-      sources."content-disposition-0.5.1"
+      sources."content-disposition-0.5.2"
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
       sources."encodeurl-1.0.1"
@@ -25144,13 +25149,16 @@ in
       sources."path-to-regexp-0.1.7"
       sources."proxy-addr-1.1.3"
       sources."range-parser-1.2.0"
-      (sources."send-0.14.1" // {
+      (sources."send-0.14.2" // {
         dependencies = [
-          sources."debug-2.2.0"
-          sources."ms-0.7.1"
+          (sources."debug-2.2.0" // {
+            dependencies = [
+              sources."ms-0.7.1"
+            ];
+          })
         ];
       })
-      sources."serve-static-1.11.1"
+      sources."serve-static-1.11.2"
       sources."utils-merge-1.0.0"
       sources."forwarded-0.1.0"
       sources."ipaddr.js-1.2.0"
@@ -25292,7 +25300,7 @@ in
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.3"
       sources."moment-2.17.1"
-      sources."nan-2.5.0"
+      sources."nan-2.5.1"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -25659,10 +25667,10 @@ in
   peerflix-server = nodeEnv.buildNodePackage {
     name = "peerflix-server";
     packageName = "peerflix-server";
-    version = "0.1.2";
+    version = "0.1.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.2.tgz";
-      sha1 = "92d39be205b36a0986001a1d9ea34e3927937ab6";
+      url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.3.tgz";
+      sha1 = "1f3c2b81188de82482f64cf89d015f5428e4c4e5";
     };
     dependencies = [
       sources."connect-multiparty-1.2.5"
@@ -26313,13 +26321,12 @@ in
       sha1 = "36bf5209356facbf6cef18fa32274d116043ed24";
     };
     dependencies = [
-      sources."express-5.0.0-alpha.2"
+      sources."express-5.0.0-alpha.3"
       sources."express-json5-0.1.0"
       (sources."body-parser-1.16.0" // {
         dependencies = [
           sources."bytes-2.4.0"
           sources."debug-2.6.0"
-          sources."depd-1.1.0"
           sources."iconv-lite-0.4.15"
           sources."qs-6.2.1"
           sources."raw-body-2.2.0"
@@ -26328,19 +26335,12 @@ in
       })
       (sources."compression-1.6.2" // {
         dependencies = [
-          sources."accepts-1.3.3"
           sources."bytes-2.3.0"
-          sources."vary-1.1.0"
-          sources."negotiator-0.6.1"
         ];
       })
       sources."commander-2.9.0"
       sources."js-yaml-3.7.0"
-      (sources."cookies-0.6.2" // {
-        dependencies = [
-          sources."depd-1.1.0"
-        ];
-      })
+      sources."cookies-0.6.2"
       (sources."request-2.79.0" // {
         dependencies = [
           sources."qs-6.3.0"
@@ -26359,12 +26359,7 @@ in
       sources."JSONStream-1.3.0"
       sources."mkdirp-0.5.1"
       sources."sinopia-htpasswd-0.4.5"
-      (sources."http-errors-1.5.1" // {
-        dependencies = [
-          sources."setprototypeof-1.0.2"
-          sources."statuses-1.3.1"
-        ];
-      })
+      sources."http-errors-1.5.1"
       (sources."readable-stream-1.1.14" // {
         dependencies = [
           sources."isarray-0.0.1"
@@ -26372,63 +26367,50 @@ in
       })
       sources."fs-ext-0.5.0"
       sources."crypt3-0.2.0"
-      sources."accepts-1.2.13"
-      sources."array-flatten-1.1.0"
-      sources."content-disposition-0.5.0"
+      sources."accepts-1.3.3"
+      sources."array-flatten-2.1.1"
+      sources."content-disposition-0.5.2"
       sources."content-type-1.0.2"
-      sources."cookie-0.1.3"
+      sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
       sources."debug-2.2.0"
-      sources."depd-1.0.1"
-      sources."escape-html-1.0.2"
+      sources."depd-1.1.0"
+      sources."encodeurl-1.0.1"
+      sources."escape-html-1.0.3"
       sources."etag-1.7.0"
-      sources."finalhandler-0.4.0"
+      sources."finalhandler-0.5.1"
       sources."fresh-0.3.0"
-      sources."merge-descriptors-1.0.0"
+      sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."on-finished-2.3.0"
       sources."parseurl-1.3.1"
-      sources."path-is-absolute-1.0.0"
-      sources."path-to-regexp-0.1.6"
-      sources."proxy-addr-1.0.10"
-      sources."qs-4.0.0"
-      sources."range-parser-1.0.3"
-      (sources."router-1.1.4" // {
+      sources."path-is-absolute-1.0.1"
+      sources."path-to-regexp-0.1.7"
+      sources."proxy-addr-1.1.3"
+      sources."qs-6.2.0"
+      sources."range-parser-1.2.0"
+      sources."router-1.1.5"
+      (sources."send-0.14.2" // {
         dependencies = [
-          sources."array-flatten-2.0.0"
-          sources."path-to-regexp-0.1.7"
-        ];
-      })
-      (sources."send-0.13.0" // {
-        dependencies = [
-          sources."http-errors-1.3.1"
-        ];
-      })
-      (sources."serve-static-1.10.3" // {
-        dependencies = [
-          sources."escape-html-1.0.3"
-          sources."send-0.13.2"
-          sources."depd-1.1.0"
-          sources."destroy-1.0.4"
-          sources."http-errors-1.3.1"
+          sources."ms-0.7.2"
         ];
       })
+      sources."serve-static-1.11.2"
       sources."type-is-1.6.14"
-      sources."vary-1.0.1"
       sources."utils-merge-1.0.0"
+      sources."vary-1.1.0"
       sources."mime-types-2.1.14"
-      sources."negotiator-0.5.3"
+      sources."negotiator-0.6.1"
       sources."mime-db-1.26.0"
       sources."ms-0.7.1"
+      sources."statuses-1.3.1"
       sources."unpipe-1.0.0"
       sources."ee-first-1.1.1"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.0.5"
-      sources."setprototypeof-1.0.0"
-      sources."destroy-1.0.3"
+      sources."ipaddr.js-1.2.0"
+      sources."setprototypeof-1.0.2"
+      sources."destroy-1.0.4"
       sources."mime-1.3.4"
-      sources."statuses-1.2.1"
-      sources."inherits-2.0.3"
       sources."media-typer-0.3.0"
       sources."raw-body-1.3.4"
       sources."bytes-1.0.0"
@@ -26512,7 +26494,7 @@ in
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.3"
       sources."moment-2.17.1"
-      sources."nan-2.5.0"
+      sources."nan-2.5.1"
       sources."ncp-2.0.0"
       sources."rimraf-2.4.5"
       (sources."glob-6.0.4" // {
@@ -26521,6 +26503,7 @@ in
         ];
       })
       sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
       sources."brace-expansion-1.1.6"
@@ -26579,16 +26562,17 @@ in
   sloc = nodeEnv.buildNodePackage {
     name = "sloc";
     packageName = "sloc";
-    version = "0.1.11";
+    version = "0.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/sloc/-/sloc-0.1.11.tgz";
-      sha1 = "341f94d44fe9b977c9e2109b134aa92f6394d411";
+      url = "https://registry.npmjs.org/sloc/-/sloc-0.2.0.tgz";
+      sha1 = "b42d3da1a442a489f454c32c628e8ebf0007875c";
     };
     dependencies = [
-      sources."async-1.5.2"
+      sources."async-2.1.4"
       sources."cli-table-0.3.1"
       sources."commander-2.9.0"
       sources."readdirp-2.1.0"
+      sources."lodash-4.17.4"
       sources."colors-1.0.3"
       sources."graceful-readlink-1.0.1"
       sources."graceful-fs-4.1.11"
@@ -26694,7 +26678,7 @@ in
       sources."dtrace-provider-0.6.0"
       sources."precond-0.2.3"
       sources."csv-generate-0.0.6"
-      sources."csv-parse-1.1.10"
+      sources."csv-parse-1.2.0"
       sources."stream-transform-0.1.1"
       sources."csv-stringify-0.0.8"
       sources."asn1-0.1.11"
@@ -26702,7 +26686,7 @@ in
       sources."wrappy-1.0.2"
       sources."extsprintf-1.2.0"
       sources."core-util-is-1.0.2"
-      sources."nan-2.5.0"
+      sources."nan-2.5.1"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.3"
       sources."mkdirp-0.5.1"
@@ -26794,19 +26778,19 @@ in
   svgo = nodeEnv.buildNodePackage {
     name = "svgo";
     packageName = "svgo";
-    version = "0.7.1";
+    version = "0.7.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/svgo/-/svgo-0.7.1.tgz";
-      sha1 = "287320fed972cb097e72c2bb1685f96fe08f8034";
+      url = "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz";
+      sha1 = "9f5772413952135c6fefbf40afe6a4faa88b4bb5";
     };
     dependencies = [
       sources."sax-1.2.1"
       sources."coa-1.0.1"
-      sources."js-yaml-3.6.1"
+      sources."js-yaml-3.7.0"
       sources."colors-1.1.2"
       sources."whet.extend-0.9.9"
       sources."mkdirp-0.5.1"
-      sources."csso-2.2.1"
+      sources."csso-2.3.1"
       sources."q-1.4.1"
       sources."argparse-1.0.9"
       sources."esprima-2.7.3"
@@ -27057,10 +27041,10 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.0.1";
+    version = "1.1.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.0.1.tgz";
-      sha1 = "83b852a8811f4c8f1446fd4f53b19a541c327418";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.3.tgz";
+      sha1 = "d07fd8486b5f82d65b3452671d30b16c59e13303";
     };
     dependencies = [
       sources."async-2.1.4"
@@ -27071,12 +27055,12 @@ in
       sources."cookie-parser-1.4.3"
       sources."crossroads-0.12.2"
       sources."diff2html-2.0.12"
-      sources."express-4.14.0"
+      sources."express-4.14.1"
       sources."express-session-1.14.2"
       sources."forever-monitor-1.1.0"
       sources."getmac-1.2.1"
       sources."hasher-1.2.0"
-      sources."ignore-3.2.0"
+      sources."ignore-3.2.2"
       sources."keen.io-0.1.3"
       sources."knockout-3.4.1"
       sources."lodash-4.17.4"
@@ -27141,7 +27125,7 @@ in
       })
       sources."rimraf-2.5.4"
       sources."semver-5.3.0"
-      sources."serve-static-1.11.1"
+      sources."serve-static-1.11.2"
       sources."signals-1.0.0"
       sources."snapsvg-0.4.0"
       (sources."socket.io-1.7.2" // {
@@ -27213,11 +27197,11 @@ in
       sources."abbrev-1.0.9"
       sources."accepts-1.3.3"
       sources."array-flatten-1.1.1"
-      sources."content-disposition-0.5.1"
+      sources."content-disposition-0.5.2"
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.7.0"
-      sources."finalhandler-0.5.0"
+      sources."finalhandler-0.5.1"
       sources."fresh-0.3.0"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
@@ -27225,7 +27209,11 @@ in
       sources."path-to-regexp-0.1.7"
       sources."proxy-addr-1.1.3"
       sources."range-parser-1.2.0"
-      sources."send-0.14.1"
+      (sources."send-0.14.2" // {
+        dependencies = [
+          sources."ms-0.7.2"
+        ];
+      })
       sources."utils-merge-1.0.0"
       sources."vary-1.1.0"
       sources."negotiator-0.6.1"
@@ -27811,48 +27799,51 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "1.14.0";
+    version = "2.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-1.14.0.tgz";
-      sha1 = "54f1ffb92051a328a5b2057d6ae33c289462c823";
+      url = "https://registry.npmjs.org/webpack/-/webpack-2.2.1.tgz";
+      sha1 = "7bb1d72ae2087dd1a4af526afec15eed17dda475";
     };
     dependencies = [
-      sources."acorn-3.3.0"
-      sources."async-1.5.2"
-      sources."clone-1.0.2"
-      (sources."enhanced-resolve-0.9.1" // {
-        dependencies = [
-          sources."memory-fs-0.2.0"
-        ];
-      })
-      sources."interpret-0.6.6"
+      sources."acorn-4.0.4"
+      sources."acorn-dynamic-import-2.0.1"
+      sources."ajv-4.11.2"
+      sources."ajv-keywords-1.5.1"
+      sources."async-2.1.4"
+      sources."enhanced-resolve-3.0.3"
+      sources."interpret-1.0.1"
+      sources."json-loader-0.5.4"
+      sources."loader-runner-2.3.0"
       sources."loader-utils-0.2.16"
-      sources."memory-fs-0.3.0"
+      sources."memory-fs-0.4.1"
       sources."mkdirp-0.5.1"
-      sources."node-libs-browser-0.7.0"
-      sources."optimist-0.6.1"
+      sources."node-libs-browser-2.0.0"
+      sources."source-map-0.5.6"
       sources."supports-color-3.2.3"
-      sources."tapable-0.1.10"
+      sources."tapable-0.2.6"
       (sources."uglify-js-2.7.5" // {
         dependencies = [
           sources."async-0.2.10"
+          sources."yargs-3.10.0"
         ];
       })
-      (sources."watchpack-0.2.9" // {
+      sources."watchpack-1.2.0"
+      sources."webpack-sources-0.1.4"
+      (sources."yargs-6.6.0" // {
         dependencies = [
-          sources."async-0.9.2"
-        ];
-      })
-      (sources."webpack-core-0.6.9" // {
-        dependencies = [
-          sources."source-map-0.4.4"
+          sources."camelcase-3.0.0"
+          sources."cliui-3.2.0"
         ];
       })
+      sources."co-4.6.0"
+      sources."json-stable-stringify-1.0.1"
+      sources."jsonify-0.0.0"
+      sources."lodash-4.17.4"
       sources."graceful-fs-4.1.11"
+      sources."object-assign-4.1.1"
       sources."big.js-3.1.3"
       sources."emojis-list-2.1.0"
       sources."json5-0.5.1"
-      sources."object-assign-4.1.1"
       sources."errno-0.1.4"
       sources."readable-stream-2.2.2"
       sources."prr-0.0.0"
@@ -27869,7 +27860,7 @@ in
       sources."buffer-4.9.1"
       sources."console-browserify-1.1.0"
       sources."constants-browserify-1.0.0"
-      sources."crypto-browserify-3.3.0"
+      sources."crypto-browserify-3.11.0"
       sources."domain-browser-1.1.7"
       sources."events-1.1.1"
       sources."https-browserify-0.0.1"
@@ -27897,31 +27888,47 @@ in
       sources."base64-js-1.2.0"
       sources."ieee754-1.1.8"
       sources."date-now-0.1.4"
-      sources."pbkdf2-compat-2.0.1"
-      sources."ripemd160-0.2.0"
-      sources."sha.js-2.2.6"
-      sources."browserify-aes-0.4.0"
+      sources."browserify-cipher-1.0.0"
+      sources."browserify-sign-4.0.0"
+      sources."create-ecdh-4.0.0"
+      sources."create-hash-1.1.2"
+      sources."create-hmac-1.1.4"
+      sources."diffie-hellman-5.0.2"
+      sources."pbkdf2-3.0.9"
+      sources."public-encrypt-4.0.0"
+      sources."randombytes-2.0.3"
+      sources."browserify-aes-1.0.6"
+      sources."browserify-des-1.0.0"
+      sources."evp_bytestokey-1.0.0"
+      sources."buffer-xor-1.0.3"
+      sources."cipher-base-1.0.3"
+      sources."des.js-1.0.0"
+      sources."minimalistic-assert-1.0.0"
+      sources."bn.js-4.11.6"
+      sources."browserify-rsa-4.0.1"
+      sources."elliptic-6.3.2"
+      sources."parse-asn1-5.0.0"
+      sources."brorand-1.0.6"
+      sources."hash.js-1.0.3"
+      sources."asn1.js-4.9.1"
+      sources."ripemd160-1.0.1"
+      sources."sha.js-2.4.8"
+      sources."miller-rabin-4.0.0"
       sources."builtin-status-codes-3.0.0"
       sources."to-arraybuffer-1.0.1"
       sources."xtend-4.0.1"
       sources."setimmediate-1.0.5"
       sources."querystring-0.2.0"
       sources."indexof-0.0.1"
-      sources."wordwrap-0.0.3"
       sources."has-flag-1.0.0"
-      sources."source-map-0.5.6"
       sources."uglify-to-browserify-1.0.2"
-      sources."yargs-3.10.0"
       sources."camelcase-1.2.1"
-      (sources."cliui-2.1.0" // {
-        dependencies = [
-          sources."wordwrap-0.0.2"
-        ];
-      })
+      sources."cliui-2.1.0"
       sources."decamelize-1.2.0"
       sources."window-size-0.1.0"
       sources."center-align-0.1.3"
       sources."right-align-0.1.3"
+      sources."wordwrap-0.0.2"
       sources."align-text-0.1.4"
       sources."lazy-cache-1.0.4"
       sources."kind-of-3.1.0"
@@ -27972,7 +27979,7 @@ in
       sources."brace-expansion-1.1.6"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
-      sources."nan-2.5.0"
+      sources."nan-2.5.1"
       sources."node-pre-gyp-0.6.32"
       sources."nopt-3.0.6"
       sources."npmlog-4.0.2"
@@ -28096,11 +28103,44 @@ in
       sources."uid-number-0.0.6"
       sources."ms-0.7.1"
       sources."source-list-map-0.1.8"
-      sources."amdefine-1.0.1"
+      sources."get-caller-file-1.0.2"
+      sources."os-locale-1.4.0"
+      sources."read-pkg-up-1.0.1"
+      sources."require-directory-2.1.1"
+      sources."require-main-filename-1.0.1"
+      sources."which-module-1.0.0"
+      sources."y18n-3.2.1"
+      (sources."yargs-parser-4.2.1" // {
+        dependencies = [
+          sources."camelcase-3.0.0"
+        ];
+      })
+      sources."wrap-ansi-2.1.0"
+      sources."lcid-1.0.0"
+      sources."invert-kv-1.0.0"
+      sources."find-up-1.1.2"
+      sources."read-pkg-1.1.0"
+      sources."path-exists-2.1.0"
+      sources."load-json-file-1.1.0"
+      sources."normalize-package-data-2.3.5"
+      sources."path-type-1.1.0"
+      sources."parse-json-2.2.0"
+      sources."pify-2.3.0"
+      sources."strip-bom-2.0.0"
+      sources."error-ex-1.3.0"
+      sources."is-arrayish-0.2.1"
+      sources."is-utf8-0.2.1"
+      sources."hosted-git-info-2.1.5"
+      sources."is-builtin-module-1.0.0"
+      sources."validate-npm-package-license-3.0.1"
+      sources."builtin-modules-1.1.1"
+      sources."spdx-correct-1.0.2"
+      sources."spdx-expression-parse-1.0.4"
+      sources."spdx-license-ids-1.2.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
-      description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jade, coffee, css, less, ... and your custom stuff.";
+      description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.";
       homepage = https://github.com/webpack/webpack;
       license = "MIT";
     };
@@ -28216,7 +28256,7 @@ in
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."loose-envify-1.3.1"
-      sources."js-tokens-3.0.0"
+      sources."js-tokens-3.0.1"
       sources."builtin-modules-1.1.1"
       sources."ci-info-1.0.0"
       sources."currently-unhandled-0.4.1"
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 8c1c9515926..999582950ea 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -22,6 +22,7 @@
 , "gulp"
 , "hipache"
 , "htmlhint"
+, "ios-deploy"
 , "istanbul"
 , "jayschema"
 , "jshint"

From c1250e96f3cc889201b2493fd56ba772b5b5e929 Mon Sep 17 00:00:00 2001
From: Rongcui Dong <rongcuid@outlook.com>
Date: Tue, 31 Jan 2017 10:12:15 -0800
Subject: [PATCH 185/899] kmix: init at 16.12.1

Signed-off-by: Rongcui Dong <rongcuid@outlook.com>
---
 lib/maintainers.nix                          |  1 +
 pkgs/desktops/kde-5/applications/default.nix |  1 +
 pkgs/desktops/kde-5/applications/kmix.nix    | 30 ++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 pkgs/desktops/kde-5/applications/kmix.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index cd9ced5832f..f270ab059bb 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -414,6 +414,7 @@
   roblabla = "Robin Lambertz <robinlambertz+dev@gmail.com>";
   roconnor = "Russell O'Connor <roconnor@theorem.ca>";
   romildo = "José Romildo Malaquias <malaquias@gmail.com>";
+  rongcuid = "Rongcui Dong <rongcuid@outlook.com>";
   ronny = "Ronny Pfannschmidt <nixos@ronnypfannschmidt.de>";
   rszibele = "Richard Szibele <richard_szibele@hotmail.com>";
   rushmorem = "Rushmore Mushambi <rushmore@webenchanter.com>";
diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix
index db255a1d5b7..25e1534609e 100644
--- a/pkgs/desktops/kde-5/applications/default.nix
+++ b/pkgs/desktops/kde-5/applications/default.nix
@@ -56,6 +56,7 @@ let
     khelpcenter = callPackage ./khelpcenter.nix {};
     kio-extras = callPackage ./kio-extras.nix {};
     kmime = callPackage ./kmime.nix {};
+    kmix = callPackage ./kmix.nix {};
     kompare = callPackage ./kompare.nix {};
     konsole = callPackage ./konsole.nix {};
     kwalletmanager = callPackage ./kwalletmanager.nix {};
diff --git a/pkgs/desktops/kde-5/applications/kmix.nix b/pkgs/desktops/kde-5/applications/kmix.nix
new file mode 100644
index 00000000000..46a67e06ee0
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications/kmix.nix
@@ -0,0 +1,30 @@
+{
+  kdeApp, lib, kdeWrapper,
+  ecm, kdoctools,
+  kglobalaccel, kxmlgui, kcoreaddons, kdelibs4support,
+  plasma-framework, libpulseaudio, alsaLib, libcanberra_kde
+}:
+
+let
+  unwrapped =
+    kdeApp {
+      name = "kmix";
+      meta = {
+        license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+        maintainers = [ lib.maintainers.rongcuid ];
+      };
+      nativeBuildInputs = [ ecm kdoctools ];
+      buildInputs = [ libpulseaudio alsaLib libcanberra_kde ];
+      propagatedBuildInputs = [
+        kglobalaccel kxmlgui kcoreaddons kdelibs4support
+        plasma-framework
+      ];
+      cmakeFlags = [
+        "-DKMIX_KF5_BUILD=1"
+      ];
+    };
+in
+kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/kmix" ];
+}

From 8ba82f28bc00722d211b3c2990bd71d195d65386 Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@blockstream.io>
Date: Tue, 31 Jan 2017 19:03:12 -0500
Subject: [PATCH 186/899] compcert: adding clightgen to the build

clightgen is a tool for coverting C to C-light.
This patch enable the build of this tool which is added to $out/bin/.
---
 pkgs/development/compilers/compcert/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix
index f5554ee0ce3..20d4a430ac4 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/pkgs/development/compilers/compcert/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   configurePhase = ''
     substituteInPlace ./configure --replace pl2 pl3
     substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc'
-    ./configure -prefix $out -toolprefix ${tools}/bin/ '' +
+    ./configure -clightgen -prefix $out -toolprefix ${tools}/bin/ '' +
     (if stdenv.isDarwin then "ia32-macosx" else "ia32-linux");
 
   installTargets = "documentation install";

From 0860b8d5d1aa5058d5059c1d3e09141d1f5b7ef8 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 31 Jan 2017 03:00:11 +0000
Subject: [PATCH 187/899] luaPackages.luazlib: fix on darwin

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

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index ecf6d11547d..7d4c5718343 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -251,20 +251,22 @@ let
 
     buildInputs = [ zlib ];
 
+    preConfigure = "substituteInPlace Makefile --replace gcc cc --replace '-llua' ''";
+
     preBuild = ''
       makeFlagsArray=(
         ${platformString}
         LUAPATH="$out/share/lua/${lua.luaversion}"
         LUACPATH="$out/lib/lua/${lua.luaversion}"
         INCDIR="-I${lua}/include"
-        LIBDIR="-L$out/lib");
+        LIBDIR="-L${lua}/lib");
     '';
 
     preInstall = "mkdir -p $out/lib/lua/${lua.luaversion}";
 
     meta = with stdenv.lib; {
       homepage = https://github.com/brimworks/lua-zlib;
-      hydraPlatforms = platforms.linux;
+      hydraPlatforms = platforms.unix;
       license = licenses.mit;
       maintainers = [ maintainers.koral ];
     };

From 7ace1b1ced7d160b8c6a8f44b154e30b3affb300 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 31 Jan 2017 20:13:24 +0000
Subject: [PATCH 188/899] luaPackages.luazlib: 0.4 -> 1.1

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

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 7d4c5718343..badbeaafed9 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -242,11 +242,11 @@ let
 
   luazlib = buildLuaPackage rec {
     name = "zlib-${version}";
-    version = "0.4";
+    version = "1.1";
 
     src = fetchzip {
       url = "https://github.com/brimworks/lua-zlib/archive/v${version}.tar.gz";
-      sha256 = "1pgxnjc0gvk25wsr69nsm60y5ad86z1nlq7mzj3ckygzkgi782dd";
+      sha256 = "1520lk4xpf094xn2zallqgqhs0zb4w61l49knv9y8pmhkdkxzzgy";
     };
 
     buildInputs = [ zlib ];

From 6a04086683c0e5d7c4e372c0c62dd32fd7f64eea Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 1 Feb 2017 07:38:28 +0000
Subject: [PATCH 189/899] ocamlPackages.menhir: 20161115 -> 20170101

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

diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix
index 9592e9a68d8..e7e29c73a6b 100644
--- a/pkgs/development/ocaml-modules/menhir/default.nix
+++ b/pkgs/development/ocaml-modules/menhir/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ocaml, findlib, ocamlbuild
-, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20161115" else "20140422"
+, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20170101" else "20140422"
 }@args:
 
 let
   sha256 =
   if version == "20140422" then "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d"
-  else if version == "20161115" then "1j8nmcj2gq6hyyi16z27amiahplgrnk4ppchpm0v4qy80kwkf47k"
+  else if version == "20170101" then "0ika46i9gn3sjvspa62fb5dnr20k783vg5fj30649q0ialv6yscr"
   else throw ("menhir: unknown version " ++ version);
 in
 

From f4e67389ccf51c0d3a240f571724516ea9608926 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 1 Feb 2017 10:45:17 +0100
Subject: [PATCH 190/899] buildStackProject: set GIT_SSL_CAINFO and LANG

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

diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix
index 13a939fcce9..cf1e189a38d 100644
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/pkgs/development/haskell-modules/generic-stack-builder.nix
@@ -27,6 +27,12 @@ stdenv.mkDerivation (args // {
   LD_LIBRARY_PATH = makeLibraryPath (LD_LIBRARY_PATH ++ buildInputs);
                     # ^^^ Internally uses `getOutput "lib"` (equiv. to getLib)
 
+  # Non-NixOS git needs cert
+  GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+
+  # Fixes https://github.com/commercialhaskell/stack/issues/2358
+  LANG = "en_US.UTF-8";
+
   preferLocalBuild = true;
 
   configurePhase = args.configurePhase or ''

From d1ca0ade538e2f1cf33d902a9e2df2c2de6df998 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Wed, 1 Feb 2017 11:00:20 +0100
Subject: [PATCH 191/899] docker-machine: 0.8.1 -> 0.9.0

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 .../networking/cluster/docker-machine/default.nix             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix
index d714033e412..0985c86949a 100644
--- a/pkgs/applications/networking/cluster/docker-machine/default.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/default.nix
@@ -3,7 +3,7 @@
 
 buildGoPackage rec {
   name = "machine-${version}";
-  version = "0.8.1";
+  version = "0.9.0";
 
   goPackagePath = "github.com/docker/machine";
 
@@ -11,7 +11,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "docker";
     repo = "machine";
-    sha256 = "0l4a5bqfw8i8wrl5yzkqy848r7vdx6hw8p5m3z3vzabvsmsjjwy7";
+    sha256 = "1kl30ylgdsyr9vkdms6caypnixxjv9a322wx416x6266c8lal6k4";
   };
 
   postInstall = ''

From fda3edda4b538ee5fc7d9b5c392c9863fa0d5ab5 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 1 Feb 2017 18:39:43 +0800
Subject: [PATCH 192/899] heroku: 3.43.12 -> 3.43.16

This is the last version of the deprecated client but using the latest CLI.
---
 pkgs/development/tools/heroku/default.nix | 106 +++++++++-------------
 1 file changed, 44 insertions(+), 62 deletions(-)

diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix
index e78c7a7ff9a..f9c43ee841b 100644
--- a/pkgs/development/tools/heroku/default.nix
+++ b/pkgs/development/tools/heroku/default.nix
@@ -1,74 +1,56 @@
-{ stdenv, fetchurl, bash, buildFHSUserEnv, makeWrapper, writeTextFile
+{ stdenv, lib, fetchurl, makeWrapper, buildGoPackage, fetchFromGitHub
 , nodejs-6_x, postgresql, ruby }:
 
 with stdenv.lib;
 
 let
-  version = "3.43.12";
-  bin_ver = "5.4.7-8dc2c80";
+  cli = buildGoPackage rec {
+    name = "cli-${version}";
+    version = "5.6.14";
 
-  arch = {
-    "x86_64-linux" = "linux-amd64";
-  }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
+    goPackagePath = "github.com/heroku/cli";
 
-  sha256 = {
-    "x86_64-linux" = "0iqjxkdw53dvy54ahmr9yijlxrp5nbikh9z7iss93z753cgxdl06";
-  }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
-
-  fhsEnv = buildFHSUserEnv {
-    name = "heroku-fhs-env";
+    src = fetchFromGitHub {
+      owner  = "heroku";
+      repo   = "cli";
+      rev    = "v${version}";
+      sha256 = "11jccham1vkmh5284l6i30na4a4y7b1jhi2ci2z2wwx8m3gkypq9";
+    };
   };
 
-  heroku = stdenv.mkDerivation rec {
-    inherit version;
-    name = "heroku";
-
-    meta = {
-      homepage = "https://toolbelt.heroku.com";
-      description = "Everything you need to get started using Heroku";
-      maintainers = with maintainers; [ aflatter mirdhyn ];
-      license = licenses.mit;
-      platforms = with platforms; unix;
-    };
-
-    src = fetchurl {
-      url = "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-${version}.tgz";
-      sha256 = "1z7z8sl2hkrc8rdvx3h00fbcrxs827xlfp6fji0ap97a6jc0v9x4";
-    };
-
-    bin = fetchurl {
-      url = "https://cli-assets.heroku.com/branches/stable/${bin_ver}/heroku-v${bin_ver}-${arch}.tar.gz";
-      inherit sha256;
-    };
-
-    installPhase = ''
-      cli=$out/share/heroku/cli
-      mkdir -p $cli
-
-      tar xzf $src -C $out --strip-components=1
-      tar xzf $bin -C $cli --strip-components=1
-
-      wrapProgram $out/bin/heroku \
-        --set HEROKU_NODE_PATH ${nodejs-6_x}/bin/node \
-        --set XDG_DATA_HOME    $out/share \
-        --set XDG_DATA_DIRS    $out/share
-
-      # When https://github.com/NixOS/patchelf/issues/66 is fixed, reinstate this and dump the fhsuserenv
-      #patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-      #  $cli/bin/heroku
-    '';
-
-    buildInputs = [ fhsEnv ruby postgresql makeWrapper ];
-
-    doUnpack = false;
-  };
-
-in writeTextFile {
+in stdenv.mkDerivation rec {
   name = "heroku-${version}";
-  destination = "/bin/heroku";
-  executable = true;
-  text = ''
-    #!${bash}/bin/bash -e
-    ${fhsEnv}/bin/heroku-fhs-env ${heroku}/bin/heroku
+  version = "3.43.16";
+
+  meta = {
+    homepage = "https://toolbelt.heroku.com";
+    description = "Everything you need to get started using Heroku";
+    maintainers = with maintainers; [ aflatter mirdhyn peterhoeg ];
+    license = licenses.mit;
+    platforms = with platforms; unix;
+  };
+
+  binPath = lib.makeBinPath [ postgresql ruby ];
+
+  buildInputs = [ makeWrapper ];
+
+  doUnpack = false;
+
+  src = fetchurl {
+    url = "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-${version}.tgz";
+    sha256 = "08pai3cjaj7wshhyjcmkvyr1qxv5ab980whcm406798ng8f91hn7";
+  };
+
+  installPhase = ''
+    mkdir -p $out
+
+    tar xzf $src -C $out --strip-components=1
+    install -Dm755 ${cli}/bin/cli $out/share/heroku/cli/bin/heroku
+
+    wrapProgram $out/bin/heroku \
+      --set HEROKU_NODE_PATH ${nodejs-6_x}/bin/node \
+      --set XDG_DATA_HOME    $out/share \
+      --set XDG_DATA_DIRS    $out/share \
+      --prefix PATH : ${binPath}
   '';
 }

From 39344a36d318553001f9d738732c9785e8ce054b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 31 Jan 2017 01:59:20 +0300
Subject: [PATCH 193/899] dbus service: use /etc/dbus-1 for configuration

Also use upstream systemd units.
---
 nixos/modules/services/system/dbus.nix | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index bc91d1284a9..6e050fd174e 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -20,8 +20,6 @@ let
     "<includedir>${d}/etc/dbus-1/session.d</includedir>"
   ]));
 
-  daemonArgs = "--address=systemd: --nofork --nopidfile --systemd-activation";
-
   configDir = pkgs.runCommand "dbus-conf"
     { preferLocalBuild = true;
       allowSubstitutes = false;
@@ -31,6 +29,9 @@ let
 
       cp ${pkgs.dbus.out}/share/dbus-1/{system,session}.conf $out
 
+      # avoid circular includes
+      sed -ri 's@(<include ignore_missing="yes">/etc/dbus-1/(system|session)\.conf</include>)@<!-- \1 -->@g' $out/{system,session}.conf
+
       # include by full path
       sed -ri "s@/etc/dbus-1/(system|session)-@$out/\1-@" $out/{system,session}.conf
 
@@ -95,6 +96,11 @@ in
 
     environment.systemPackages = [ pkgs.dbus.daemon pkgs.dbus ];
 
+    environment.etc = singleton
+      { source = configDir;
+        target = "dbus-1";
+      };
+
     users.extraUsers.messagebus = {
       uid = config.ids.uids.messagebus;
       description = "D-Bus system message bus daemon user";
@@ -125,10 +131,6 @@ in
       # Don't restart dbus-daemon. Bad things tend to happen if we do.
       reloadIfChanged = true;
       restartTriggers = [ configDir ];
-      serviceConfig.ExecStart = [
-        "" # Default dbus.service has two entries, we need to override both.
-        "${lib.getBin pkgs.dbus}/bin/dbus-daemon --config-file=/run/current-system/dbus/system.conf ${daemonArgs}"
-      ];
     };
 
     systemd.user = {
@@ -136,18 +138,10 @@ in
         # Don't restart dbus-daemon. Bad things tend to happen if we do.
         reloadIfChanged = true;
         restartTriggers = [ configDir ];
-        serviceConfig.ExecStart = [
-          "" # Default dbus.service has two entries, we need to override both.
-          "${lib.getBin pkgs.dbus}/bin/dbus-daemon --config-file=/run/current-system/dbus/session.conf ${daemonArgs}"
-        ];
       };
       sockets.dbus.wantedBy = mkIf cfg.socketActivated [ "sockets.target" ];
     };
 
     environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ];
-
-    system.extraSystemBuilderCmds = ''
-      ln -s ${configDir} $out/dbus
-    '';
   };
 }

From 72b37462668e3a7568d94632994a9df5d7fd37eb Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 1 Feb 2017 15:37:20 +0300
Subject: [PATCH 194/899] dbus service: remove {system,session}.conf from
 config dir

They are already included by dbus from /run/current-system/sw/share/dbus-1.
---
 nixos/modules/services/system/dbus.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index 6e050fd174e..aeb5bf9c7a3 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -27,14 +27,6 @@ let
     ''
       mkdir -p $out
 
-      cp ${pkgs.dbus.out}/share/dbus-1/{system,session}.conf $out
-
-      # avoid circular includes
-      sed -ri 's@(<include ignore_missing="yes">/etc/dbus-1/(system|session)\.conf</include>)@<!-- \1 -->@g' $out/{system,session}.conf
-
-      # include by full path
-      sed -ri "s@/etc/dbus-1/(system|session)-@$out/\1-@" $out/{system,session}.conf
-
       sed '${./dbus-system-local.conf.in}' \
         -e 's,@servicehelper@,${config.security.wrapperDir}/dbus-daemon-launch-helper,g' \
         -e 's,@extra@,${systemExtraxml},' \

From 19f70f03b2b2ad09987494cc5fcc261599a201ee Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 1 Feb 2017 03:55:05 -0600
Subject: [PATCH 195/899] julia: fix build and execution on PaX.

Alpine and Gentoo set the same flags here, FWIW.
---
 pkgs/development/compilers/julia/0.5.nix      |  6 +++--
 .../compilers/julia/0004-hardened-0.4.7.patch | 25 +++++++++++++++++++
 .../compilers/julia/0004-hardened.patch       | 25 +++++++++++++++++++
 pkgs/development/compilers/julia/default.nix  |  7 +++---
 pkgs/development/compilers/julia/git.nix      |  7 +++---
 5 files changed, 62 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/compilers/julia/0004-hardened-0.4.7.patch
 create mode 100644 pkgs/development/compilers/julia/0004-hardened.patch

diff --git a/pkgs/development/compilers/julia/0.5.nix b/pkgs/development/compilers/julia/0.5.nix
index 04ef7b86c48..32d98b1ce13 100644
--- a/pkgs/development/compilers/julia/0.5.nix
+++ b/pkgs/development/compilers/julia/0.5.nix
@@ -2,6 +2,7 @@
 # build tools
 , gfortran, m4, makeWrapper, patchelf, perl, which, python2
 , runCommand
+, paxctl
 # libjulia dependencies
 , libunwind, readline, utf8proc, zlib
 , llvm, libffi, ncurses
@@ -71,7 +72,7 @@ stdenv.mkDerivation rec {
   patches = [
     ./0001.1-use-system-utf8proc.patch
     ./0002-use-system-suitesparse.patch
-  ];
+  ] ++ stdenv.lib.optional stdenv.needsPax ./0004-hardened.patch;
 
   postPatch = ''
     patchShebangs . contrib
@@ -89,7 +90,8 @@ stdenv.mkDerivation rec {
   ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
   ;
 
-  nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ];
+  nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]
+    ++ stdenv.lib.optional stdenv.needsPax paxctl;
 
   makeFlags =
     let
diff --git a/pkgs/development/compilers/julia/0004-hardened-0.4.7.patch b/pkgs/development/compilers/julia/0004-hardened-0.4.7.patch
new file mode 100644
index 00000000000..1950cd7836a
--- /dev/null
+++ b/pkgs/development/compilers/julia/0004-hardened-0.4.7.patch
@@ -0,0 +1,25 @@
+From 0bdbe60325a22202f8e250a9578407648a0d29b9 Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Wed, 1 Feb 2017 06:09:49 -0600
+Subject: [PATCH] Set pax flags on julia binaries to disable memory protection.
+
+---
+ Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index 8d45a1baa..91ea33b21 100644
+--- a/Makefile
++++ b/Makefile
+@@ -61,6 +61,8 @@ julia-src-release julia-src-debug : julia-src-% : julia-deps
+ 
+ julia-ui-release julia-ui-debug : julia-ui-% : julia-src-%
+ 	@$(MAKE) $(QUIET_MAKE) -C ui julia-$*
++	@echo "setting PaX flags on $(JULIA_EXECUTABLE_$*)"
++	@paxctl -czexm $(JULIA_EXECUTABLE_$*)
+ 
+ julia-inference : julia-base julia-ui-$(JULIA_BUILD_MODE) $(build_prefix)/.examples
+ 	@$(MAKE) $(QUIET_MAKE) $(build_private_libdir)/inference.ji JULIA_BUILD_MODE=$(JULIA_BUILD_MODE)
+-- 
+2.11.0
+
diff --git a/pkgs/development/compilers/julia/0004-hardened.patch b/pkgs/development/compilers/julia/0004-hardened.patch
new file mode 100644
index 00000000000..901f967c9d5
--- /dev/null
+++ b/pkgs/development/compilers/julia/0004-hardened.patch
@@ -0,0 +1,25 @@
+From eddb251a00ace6e63e32e7dcb9e1ec632cac14e0 Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Wed, 1 Feb 2017 06:09:49 -0600
+Subject: [PATCH] Set pax flags on julia binaries to disable memory protection.
+
+---
+ Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index 0e28cc87b..aab8cfa8d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -91,6 +91,8 @@ julia-src-release julia-src-debug : julia-src-% : julia-deps julia_flisp.boot.in
+ 
+ julia-ui-release julia-ui-debug : julia-ui-% : julia-src-%
+ 	@$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT)/ui julia-$*
++	@echo "setting PaX flags on $(JULIA_EXECUTABLE_$*)"
++	@paxctl -czexm $(JULIA_EXECUTABLE_$*)
+ 
+ julia-inference : julia-base julia-ui-$(JULIA_BUILD_MODE) $(build_prefix)/.examples
+ 	@$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT) $(build_private_libdir)/inference.ji JULIA_BUILD_MODE=$(JULIA_BUILD_MODE)
+-- 
+2.11.0
+
diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index 214b3153481..ebdd4c760d1 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, fetchurl
 # build tools
-, gfortran, m4, makeWrapper, patchelf, perl, which, python2
+, gfortran, m4, makeWrapper, patchelf, perl, which, python2, paxctl
 # libjulia dependencies
 , libunwind, llvm, readline, utf8proc, zlib
 # standard library dependencies
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
     ./0001-use-system-utf8proc.patch
     ./0002-use-system-suitesparse.patch
     ./0003-no-ldconfig.patch
-  ];
+  ] ++ stdenv.lib.optional stdenv.needsPax ./0004-hardened-0.4.7.patch;
 
   postPatch = ''
     patchShebangs . contrib
@@ -79,7 +79,8 @@ stdenv.mkDerivation rec {
   ] ++
     stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] ;
 
-  nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ];
+  nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]
+    ++ stdenv.lib.optional stdenv.needsPax paxctl;
 
   makeFlags =
     let
diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix
index 73f0e67baa5..9cfa8895f74 100644
--- a/pkgs/development/compilers/julia/git.nix
+++ b/pkgs/development/compilers/julia/git.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, fetchurl
 # build tools
-, gfortran, m4, makeWrapper, patchelf, perl, which, python2
+, gfortran, m4, makeWrapper, patchelf, perl, which, python2, paxctl
 # libjulia dependencies
 , libunwind, readline, utf8proc, zlib
 , llvm
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
   patches = [
     ./0001.1-use-system-utf8proc.patch
     ./0002-use-system-suitesparse.patch
-  ];
+  ] ++ stdenv.lib.optional stdenv.needsPax ./0004-hardened.patch;
 
   postPatch = ''
     patchShebangs . contrib
@@ -86,7 +86,8 @@ stdenv.mkDerivation rec {
   ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
   ;
 
-  nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ];
+  nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]
+    ++ stdenv.lib.optional stdenv.needsPax paxctl;
 
   makeFlags =
     let

From 98b602fe3c3d5f3a29bff72e0fe33cdb31722d94 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 1 Feb 2017 14:04:57 +0100
Subject: [PATCH 196/899] pythonPackages.netcdf4: 1.2.4 -> 1.2.7

---
 pkgs/development/python-modules/netcdf4.nix | 36 +++++++++++++++++++++
 pkgs/top-level/python-packages.nix          | 34 +------------------
 2 files changed, 37 insertions(+), 33 deletions(-)
 create mode 100644 pkgs/development/python-modules/netcdf4.nix

diff --git a/pkgs/development/python-modules/netcdf4.nix b/pkgs/development/python-modules/netcdf4.nix
new file mode 100644
index 00000000000..979a741e1ab
--- /dev/null
+++ b/pkgs/development/python-modules/netcdf4.nix
@@ -0,0 +1,36 @@
+{ stdenv, buildPythonPackage, fetchurl, isPyPy
+, numpy, zlib, netcdf, hdf5, curl, libjpeg
+}:
+buildPythonPackage rec {
+  name = "netCDF4-${version}";
+  version = "1.2.7";
+
+  disabled = isPyPy;
+
+  src = fetchurl {
+    url = "mirror://pypi/n/netCDF4/${name}.tar.gz";
+    sha256 = "1fllizmnpw0zkzzm4j9pgamarlzfn3kmv9zrm0w65q1y31h9ni0c";
+  };
+
+  propagatedBuildInputs = [
+    numpy
+    zlib
+    netcdf
+    hdf5
+    curl
+    libjpeg
+  ];
+
+  # Variables used to configure the build process
+  USE_NCCONFIG="0";
+  HDF5_DIR="${hdf5}";
+  NETCDF4_DIR="${netcdf}";
+  CURL_DIR="${curl.dev}";
+  JPEG_DIR="${libjpeg.dev}";
+
+  meta = with stdenv.lib; {
+    description = "Interface to netCDF library (versions 3 and 4)";
+    homepage = https://pypi.python.org/pypi/netCDF4;
+    license = licenses.free;  # Mix of license (all MIT* like)
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 081448e0d82..67e44810364 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8369,39 +8369,7 @@ in {
     };
   };
 
-  netcdf4 = buildPythonPackage rec {
-    name = "netCDF4-${version}";
-    version = "1.2.4";
-
-    disabled = isPyPy;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/n/netCDF4/${name}.tar.gz";
-      sha256 = "0lakjix9dhc26f33f03c13ffwspqcrk5j3mnnjczwxbb23ppwwx6";
-    };
-
-    propagatedBuildInputs = with self ; [
-      numpy
-      pkgs.zlib
-      pkgs.netcdf
-      pkgs.hdf5
-      pkgs.curl
-      pkgs.libjpeg
-    ];
-
-    # Variables used to configure the build process
-    USE_NCCONFIG="0";
-    HDF5_DIR="${pkgs.hdf5}";
-    NETCDF4_DIR="${pkgs.netcdf}";
-    CURL_DIR="${pkgs.curl.dev}";
-    JPEG_DIR="${pkgs.libjpeg.dev}";
-
-    meta = {
-      description = "Interface to netCDF library (versions 3 and 4)";
-      homepage = https://pypi.python.org/pypi/netCDF4;
-      license = licenses.free;  # Mix of license (all MIT* like)
-    };
-  };
+  netcdf4 = callPackage ../development/python-modules/netcdf4.nix { };
 
   nxt-python = buildPythonPackage rec {
     version = "unstable-20160819";

From 7b6b7f6b78fbb47812eef116b85e58f4c4ceb70a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 1 Feb 2017 14:26:27 +0100
Subject: [PATCH 197/899] Python Flit: run tests by default

---
 .../python/build-python-package-flit.nix            | 13 ++++++++-----
 .../interpreters/python/build-python-package.nix    |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/interpreters/python/build-python-package-flit.nix b/pkgs/development/interpreters/python/build-python-package-flit.nix
index 8628c3df769..1beff0ebd83 100644
--- a/pkgs/development/interpreters/python/build-python-package-flit.nix
+++ b/pkgs/development/interpreters/python/build-python-package-flit.nix
@@ -1,6 +1,7 @@
 # This function provides specific bits for building a flit-based Python package.
 
-{ flit
+{ python
+, flit
 }:
 
 { ... } @ attrs:
@@ -13,7 +14,9 @@ attrs // {
     runHook postBuild
   '';
 
-  # Flit packages do not come with tests.
-  installCheckPhase = attrs.checkPhase or ":";
-  doCheck = attrs.doCheck or false;
-}
\ No newline at end of file
+  # Flit packages, like setuptools packages, might have tests.
+  installCheckPhase = attrs.checkPhase or ''
+    ${python.interpreter} -m unittest discover
+  '';
+  doCheck = attrs.doCheck or true;
+}
diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix
index e15405e2981..b26bf1539cd 100644
--- a/pkgs/development/interpreters/python/build-python-package.nix
+++ b/pkgs/development/interpreters/python/build-python-package.nix
@@ -12,7 +12,7 @@
 
 let
   setuptools-specific = import ./build-python-package-setuptools.nix { inherit lib python bootstrapped-pip; };
-  flit-specific = import ./build-python-package-flit.nix { inherit flit; };
+  flit-specific = import ./build-python-package-flit.nix { inherit python flit; };
   wheel-specific = import ./build-python-package-wheel.nix { };
   common = import ./build-python-package-common.nix { inherit python bootstrapped-pip; };
 in
@@ -34,4 +34,4 @@ let
     else if format == "other" then {}
     else throw "Unsupported format ${format}";
 
-in mkPythonDerivation ( attrs // formatspecific )
\ No newline at end of file
+in mkPythonDerivation ( attrs // formatspecific )

From 695ff0dc09b304f2e0575081c52189893c2f38bc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 1 Feb 2017 14:38:58 +0100
Subject: [PATCH 198/899] pythonPackages: new fetchers

Inspired by https://github.com/NixOS/nixpkgs/pull/22257.
It is recommend to use fetchpypi and, when fetching a wheel, to pass
`format = "wheel"` (typically you can just `inherit format;`).

The hash type is fixed (for now) because this is the hash type PyPI
uses.
---
 pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 60d9a1334dc..471323c179a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -37,9 +37,30 @@ let
 
   graphiteVersion = "0.9.15";
 
+  fetchwheel = {pname, version, sha256, python ? "py2.py3", abi ? "none", platform ? "any"}:
+  # Fetch a wheel. By default we fetch an universal wheel.
+  # See https://www.python.org/dev/peps/pep-0427/#file-name-convention for details regarding the optional arguments.
+    let
+      url = "https://files.pythonhosted.org/packages/${python}/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}-${python}-${abi}-${platform}.whl";
+    in pkgs.fetchurl {inherit url sha256;};
+
+  fetchtarball = {pname, version, sha256}:
+  # Fetch a tarball.
+    let
+      url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz";
+    in pkgs.fetchurl {inherit url sha256;};
+
+  fetchpypi = {format ? "setuptools", ... } @attrs:
+    let
+      fetcher = (if format == "wheel" then fetchwheel
+        else if format == "setuptools" then fetchtarball
+        else throw "Unsupported kind ${kind}");
+    in fetcher (builtins.removeAttrs attrs ["format"]);
+
 in {
 
   inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k mkPythonDerivation buildPythonPackage buildPythonApplication;
+  inherit fetchwheel fetchtarball fetchpypi;
 
   # helpers
 

From 4d57cd49c2a20da4095b67f4dce1775211c21c8b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 1 Feb 2017 14:39:57 +0100
Subject: [PATCH 199/899] pythonPackages.configparser: 3.3.0r2 -> 3.5.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 471323c179a..c1feea1b6a9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4103,7 +4103,7 @@ in {
   # Backported version of the ConfigParser library of Python 3.3
   configparser = if isPy3k then null else buildPythonPackage rec {
     name = "configparser-${version}";
-    version = "3.3.0r2";
+    version = "3.5.0";
 
     # running install_egg_info
     # error: [Errno 9] Bad file descriptor: '<stdout>'
@@ -4111,9 +4111,12 @@ in {
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/c/configparser/${name}.tar.gz";
-      sha256 = "6a2318590dfc4013fc5bf53c2bec14a8cb455a232295eb282a13f94786c4b0b2";
+      sha256 = "5308b47021bc2340965c371f0f058cc6971a04502638d4244225c49d80db273a";
     };
 
+    # No tests available
+    doCheck = false;
+
     meta = {
       maintainers = [ ];
       platforms = platforms.all;

From 1658e7a80cb8aaf1e3cf4efacc2b028ee98ccfcb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 1 Feb 2017 14:40:11 +0100
Subject: [PATCH 200/899] pythonPackages.cytoolz: 0.8.0 -> 0.8.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c1feea1b6a9..62c0733e4f3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4410,11 +4410,11 @@ in {
 
   cytoolz = buildPythonPackage rec {
     name = "cytoolz-${version}";
-    version = "0.8.0";
+    version = "0.8.2";
 
     src = pkgs.fetchurl{
       url = "mirror://pypi/c/cytoolz/cytoolz-${version}.tar.gz";
-      sha256 = "2239890c8fe2da3eba82947c6a68cfa406e5a5045911c9ab3de8113462372629";
+      sha256 = "476a2ad176de5eaef80499b7b43d4f72ba6d23df33d349088dae315e9b31c552";
     };
 
     # Extension types

From 9e4271551ed368eb70b295cc14d89c23946d82f0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 1 Feb 2017 14:40:31 +0100
Subject: [PATCH 201/899] pythonPackages.entrypoints: 0.2.1 -> 0.2.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 62c0733e4f3..8f928332de3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6655,13 +6655,14 @@ in {
   });
 
   entrypoints = buildPythonPackage rec {
-    name = "entrypoints";
-    version = "0.2.1";
+    pname = "entrypoints";
+    version = "0.2.2";
+    name = "${pname}-${version}";
     format = "wheel";
 
-    src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/a5/2d/26548d66d58f7775cb332fcf3f864987c05f5e3f800b0b22b9919dacf653/entrypoints-0.2.1-py2.py3-none-any.whl";
-      sha256 = "112n36dllmls19j5k6bwcnsm6y2789lxzkjl1n9yir7gkm0dmzzw";
+    src = fetchpypi {
+      inherit pname version format;
+      sha256 = "0a0685962ee5ac303f470acbb659f0f97aef5b9deb6b85d059691c706ef6e45e";
     };
 
     propagatedBuildInputs = with self; [ configparser ];

From 27d4cd47e3565f4ff11f0067bd0ebb8b5a3fba61 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 1 Feb 2017 14:40:49 +0100
Subject: [PATCH 202/899] pythonPackages.ipykernel: 4.5.1 -> 4.5.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8f928332de3..3437798cf0e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12966,12 +12966,12 @@ in {
   };
 
   ipykernel = buildPythonPackage rec {
-    version = "4.5.1";
+    version = "4.5.2";
     name = "ipykernel-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/i/ipykernel/${name}.tar.gz";
-      sha256 = "520c855c6652651c6796a3dd8bc89d533023ac65c5ccf812908187d6f0e461da";
+      sha256 = "5a54f25f0e6c8ee74c362c23f9a95e10e74c6b7f5ef42059c861ff6f26d89462";
     };
 
     buildInputs = with self; [ nose ] ++ optionals isPy27 [mock];

From f677eb6bae5955963e78b555ca964b83838024cf Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 1 Feb 2017 14:41:57 +0100
Subject: [PATCH 203/899] pythonPackages.ipyparallel: 5.2.0 -> 6.0.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 3437798cf0e..d2b3cb83f38 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12996,17 +12996,17 @@ in {
   };
 
   ipyparallel = buildPythonPackage rec {
-    version = "5.2.0";
+    version = "6.0.0";
     name = "ipyparallel-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/i/ipyparallel/${name}.tar.gz";
-      sha256 = "d99e760f1a136b1c402755a4ab51a8d7cb87c892cccadf641948a5e886c8a455";
+      sha256 = "9bb5032e98a8c73ddb3da5fb8eecd93c676a5278b68799ab19257b348a0a27f6";
     };
 
     buildInputs = with self; [ nose ];
 
-    propagatedBuildInputs = with self; [ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado
+    propagatedBuildInputs = with self; [ dateutil ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado
     ] ++ optionals (!isPy3k) [ futures ];
 
     # Requires access to cluster

From 2a6901dc28d36454b3b124cc85f5c3166b823368 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 1 Feb 2017 14:42:10 +0100
Subject: [PATCH 204/899] pythonPackages.ipython: 5.2.0 -> 5.2.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d2b3cb83f38..e8ac9dfebf6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13022,12 +13022,12 @@ in {
   };
 
   ipython = buildPythonPackage rec {
-    version = "5.1.0";
+    version = "5.2.1";
     name = "ipython-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/i/ipython/${name}.tar.gz";
-      sha256 = "7ef4694e1345913182126b219aaa4a0047e191af414256da6772cf249571b961";
+      sha256 = "04dafc37c8876e10e797264302e4333dbcd2854ef6d16bb57cc12ce26515bfdb";
     };
 
     prePatch = stdenv.lib.optionalString stdenv.isDarwin ''

From f3d91ee84ae6a37cc180ea5bafaa4894c8971002 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 1 Feb 2017 14:42:31 +0100
Subject: [PATCH 205/899] pythonPackages.jinja2: 2.8 -> 2.9.5

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e8ac9dfebf6..94226cf310e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13298,11 +13298,13 @@ in {
   };
 
   jinja2 = buildPythonPackage rec {
-    name = "Jinja2-2.8";
+    pname = "Jinja2";
+    version = "2.9.5";
+    name = "${pname}-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/J/Jinja2/${name}.tar.gz";
-      sha256 = "1x0v41lp5m1pjix3l46zx02b7lqp2hflgpnxwkywxynvi3zz47xw";
+      sha256 = "702a24d992f856fa8d5a7a36db6128198d0c21e1da34448ca236c42e92384825";
     };
 
     propagatedBuildInputs = with self; [ markupsafe ];

From c39c463e7aae54eee1ac64398866e1182157f87a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 1 Feb 2017 14:42:46 +0100
Subject: [PATCH 206/899] pythonPackages.jupyter_core: 4.2.0 -> 4.2.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 94226cf310e..355c0bff84a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13416,12 +13416,12 @@ in {
   };
 
   jupyter_core = buildPythonPackage rec {
-    version = "4.2.0";
+    version = "4.2.1";
     name = "jupyter_core-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/j/jupyter_core/${name}.tar.gz";
-      sha256 = "44ec837a53bebf4e937112d3f9ccf31fee4f8db3e406dd0dd4f0378a354bed9c";
+      sha256 = "89c55399c8437f777197c2c82c1ff5639c7f71d4eb2f172a81afa120b68dc7b3";
     };
 
     buildInputs = with self; [ pytest mock ];

From 8fa286ecc1e8f4aefcd354b77c59966333510e47 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 1 Feb 2017 14:43:03 +0100
Subject: [PATCH 207/899] pythonPackages.multipledispatch: 0.4.8 -> 0.4.9

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 355c0bff84a..8561d8d0b4b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15021,11 +15021,11 @@ in {
 
   multipledispatch = buildPythonPackage rec {
     name = "multipledispatch-${version}";
-    version = "0.4.8";
+    version = "0.4.9";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/m/multipledispatch/${name}.tar.gz";
-      sha256 = "07d41fb3ed25e8424536e48a8566f88a0f9926ca4b6174bff6aa16c98251b92e";
+      sha256 = "bda6abb8188d9abb429bd17ed15bc7433f77f1b05a78cfff761711ed81daa7a2";
     };
 
     meta = {

From 286a7eb59b4a9b8557bcf5e258d80cd75bd5bfc2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 1 Feb 2017 14:43:20 +0100
Subject: [PATCH 208/899] pythonPackages.nbconvert: 4.2.0 -> 5.1.1

---
 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 8561d8d0b4b..892ddf17c57 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15481,17 +15481,17 @@ in {
   };
 
   nbconvert = buildPythonPackage rec {
-    version = "4.2.0";
+    version = "5.1.1";
     name = "nbconvert-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/n/nbconvert/${name}.tar.gz";
-      sha256 = "1ik3k1s8dnqcc6hcrzi1wwy6f5kxfz8rnyahvpy984kl49snv52m";
+      sha256 = "847731bc39829d0eb1e15a450ac98c71730e3598e53683d4d76a3f3b3fc5017d";
     };
 
     buildInputs = with self; [nose ipykernel ];
 
-    propagatedBuildInputs = with self; [ entrypoints mistune jinja2 pygments traitlets jupyter_core nbformat ipykernel tornado jupyter_client];
+    propagatedBuildInputs = with self; [ entrypoints bleach mistune jinja2 pygments traitlets testpath jupyter_core nbformat ipykernel pandocfilters tornado jupyter_client];
 
     checkPhase = ''
       nosetests -v

From ac5df23fcf4af6c52c5dd24a37488f9b1cf00023 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 1 Feb 2017 14:43:36 +0100
Subject: [PATCH 209/899] pythonPackages.nbformat: 4.0.1 -> 4.2.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 892ddf17c57..e031b90f67c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15509,16 +15509,19 @@ in {
   };
 
   nbformat = buildPythonPackage rec {
-    version = "4.0.1";
+    version = "4.2.0";
     name = "nbformat-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/n/nbformat/${name}.tar.gz";
-      sha256 = "5261c957589b9dfcd387c338d59375162ba9ca82c69e378961a1f4e641285db5";
+      sha256 = "389a5b630a30539074f238a48fb9864592f63d611baccfa2ffaf14ffe239de06";
     };
+    LC_ALL="en_US.UTF-8";
+    buildInputs = with self; [ pytest pkgs.glibcLocales ];
+    propagatedBuildInputs = with self; [ipython_genutils traitlets testpath jsonschema jupyter_core];
 
-    buildInputs = with self; [ nose ];
-    propagatedBuildInputs = with self; [ipython_genutils traitlets jsonschema jupyter_core];
+    # Failing tests and permission issues
+    doCheck = false;
 
     meta = {
       description = "The Jupyter Notebook format";

From 68bb54a89b71a378f940f8a12a1ee22cd219078e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 1 Feb 2017 14:43:49 +0100
Subject: [PATCH 210/899] pythonPackages.nose-exclude: 0.4.1 -> 0.5.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e031b90f67c..69df6665051 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15837,11 +15837,11 @@ in {
 
   nose-exclude = buildPythonPackage rec {
     name = "nose-exclude-${version}";
-    version = "0.4.1";
+    version = "0.5.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/n/nose-exclude/${name}.tar.gz";
-      sha256 = "44466a9bcb56d2e568750f91504d1278c74eabb259a305b06e975b87b51635da";
+      sha256 = "f78fa8b41eeb815f0486414f710f1eea0949e346cfb11d59ba6295ed69e84304";
     };
 
     propagatedBuildInputs = with self; [ nose ];

From 4677b6cf84011ca8e61455d6099dfcb6228ead1c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 1 Feb 2017 14:44:05 +0100
Subject: [PATCH 211/899] pythonPackages.notebook: 4.2.3 -> 4.3.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 69df6665051..551cc044125 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15957,12 +15957,12 @@ in {
   };
 
   notebook = buildPythonPackage rec {
-    version = "4.2.3";
+    version = "4.3.2";
     name = "notebook-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/n/notebook/${name}.tar.gz";
-      sha256 = "39a9603d3fe88b60de2903680c965cf643acf2c16fb2c6bac1d905e1042b5851";
+      sha256 = "fc77edf4ec295542172aa66a3e9d527e75038fcaadd3ed20afbf8596e5629aa9";
     };
 
     LC_ALL = "en_US.UTF-8";

From a75aa2cddb662c1c66c06ea7572ca6d450dd4ff5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 1 Feb 2017 14:44:20 +0100
Subject: [PATCH 212/899] pythonPackages.bottleneck: 1.0.0 -> 1.2.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 551cc044125..09c87ea9185 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18021,10 +18021,10 @@ in {
 
   bottleneck = buildPythonPackage rec {
     name = "Bottleneck-${version}";
-    version = "1.0.0";
+    version = "1.2.0";
     src = pkgs.fetchurl {
       url = "mirror://pypi/B/Bottleneck/Bottleneck-${version}.tar.gz";
-      sha256 = "15dl0ll5xmfzj2fsvajzwxsb9dbw5i9fx9i4r6n4i5nzzba7m6wd";
+      sha256 = "3bec84564a4adbe97c24e875749b949a19cfba4e4588be495cc441db7c6b05e8";
     };
 
     buildInputs = with self; [ nose ];

From 400da715514dea526527b1317e1f62d61f6f8256 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 1 Feb 2017 14:44:37 +0100
Subject: [PATCH 213/899] pythonPackages.pexpect: 3.3 -> 4.2.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 09c87ea9185..845ae6500c0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18542,17 +18542,19 @@ in {
 
 
   pexpect = buildPythonPackage rec {
-    version = "3.3";
+    version = "4.2.1";
     name = "pexpect-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/pexpect/${name}.tar.gz";
-      sha256 = "dfea618d43e83cfff21504f18f98019ba520f330e4142e5185ef7c73527de5ba";
+      sha256 = "3d132465a75b57aa818341c6521392a06cc660feb3988d7f1074f39bd23c9a92";
     };
 
-    # Wants to run python in a subprocess
+    # Wants to run pythonin a subprocess
     doCheck = false;
 
+    propagatedBuildInputs = with self; [ ptyprocess ];
+
     meta = {
       homepage = http://www.noah.org/wiki/Pexpect;
       description = "Automate interactive console applications such as ssh, ftp, etc";

From cd7e95ac9a1a0b6013930a65db595f899e2e3bce Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 1 Feb 2017 14:44:54 +0100
Subject: [PATCH 214/899] pythonPackages.requests2: 2.11.1 -> 2.13.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 845ae6500c0..41a33fdb9df 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22112,11 +22112,11 @@ in {
 
   requests2 = buildPythonPackage rec {
     name = "requests-${version}";
-    version = "2.11.1";
+    version = "2.13.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/r/requests/${name}.tar.gz";
-      sha256 = "5acf980358283faba0b897c73959cecf8b841205bb4b2ad3ef545f46eae1a133";
+      sha256 = "5722cd09762faa01276230270ff16af7acf7c5c45d623868d9ba116f15791ce8";
     };
 
     nativeBuildInputs = [ self.pytest ];

From 4188e6cbf6c63d1612203898a24bbff02f6b52e6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 1 Feb 2017 14:45:08 +0100
Subject: [PATCH 215/899] pythonPackages.tabulate: 0.7.5 -> 0.7.7

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 41a33fdb9df..0f79045c007 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25267,12 +25267,12 @@ in {
   };
 
   tabulate = buildPythonPackage rec {
-    version = "0.7.5";
+    version = "0.7.7";
     name = "tabulate-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/t/tabulate/${name}.tar.gz";
-      sha256 = "9071aacbd97a9a915096c1aaf0dc684ac2672904cd876db5904085d6dac9810e";
+      sha256 = "83a0b8e17c09f012090a50e1e97ae897300a72b35e0c86c0b53d3bd2ae86d8c6";
     };
 
     buildInputs = with self; [ nose ];

From 05ee54782ea783d876b7661838b1ed78fa1257e7 Mon Sep 17 00:00:00 2001
From: 3noch <eacameron@gmail.com>
Date: Thu, 26 Jan 2017 21:22:06 -0500
Subject: [PATCH 216/899] Add callCabal2nix to haskell packages

Closes https://github.com/NixOS/nixpkgs/pull/22191.
---
 pkgs/development/haskell-modules/default.nix | 38 +++++++++++++-------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index ef73e47f537..cf30a7699ed 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -55,18 +55,26 @@ let
         inherit packages;
       };
 
-      hackage2nix = name: version: pkgs.stdenv.mkDerivation {
-        name = "cabal2nix-${name}-${version}";
-        buildInputs = [ pkgs.cabal2nix ];
-        phases = ["installPhase"];
-        LANG = "en_US.UTF-8";
-        LOCALE_ARCHIVE = pkgs.lib.optionalString pkgs.stdenv.isLinux "${pkgs.glibcLocales}/lib/locale/locale-archive";
-        installPhase = ''
-          export HOME="$TMP"
-          mkdir $out
-          hash=$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' ${all-cabal-hashes}/${name}/${version}/${name}.json)
-          cabal2nix --compiler=${self.ghc.name} --system=${stdenv.system} --sha256=$hash ${all-cabal-hashes}/${name}/${version}/${name}.cabal >$out/default.nix
-        '';
+      haskellSrc2nix = { name, src, sha256 ? null }:
+        let
+          sha256Arg = if isNull sha256 then "" else ''--sha256="${sha256}"'';
+        in pkgs.stdenv.mkDerivation {
+          name = "cabal2nix-${name}";
+          buildInputs = [ pkgs.cabal2nix ];
+          phases = ["installPhase"];
+          LANG = "en_US.UTF-8";
+          LOCALE_ARCHIVE = pkgs.lib.optionalString pkgs.stdenv.isLinux "${pkgs.glibcLocales}/lib/locale/locale-archive";
+          installPhase = ''
+            export HOME="$TMP"
+            mkdir -p "$out"
+            cabal2nix --compiler=${self.ghc.name} --system=${stdenv.system} ${sha256Arg} "${src}" > "$out/default.nix"
+          '';
+      };
+
+      hackage2nix = name: version: haskellSrc2nix {
+        name   = "${name}-${version}";
+        sha256 = ''$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' "${all-cabal-hashes}/${name}/${version}/${name}.json")'';
+        src    = "${all-cabal-hashes}/${name}/${version}/${name}.cabal";
       };
 
     in
@@ -76,6 +84,12 @@ let
 
         callHackage = name: version: self.callPackage (hackage2nix name version);
 
+        # Creates a Haskell package from a source package by calling cabal2nix on the source.
+        callCabal2nix = src: self.callPackage (haskellSrc2nix {
+          inherit src;
+          name = src.name;
+        });
+
         ghcWithPackages = selectFrom: withPackages (selectFrom self);
 
         ghcWithHoogle = selectFrom:

From 93392fb6663218b1359d040fd6e63c991baa8681 Mon Sep 17 00:00:00 2001
From: Pradeep Chhetri <pradeep.chhetri89@gmail.com>
Date: Wed, 1 Feb 2017 08:32:29 +0530
Subject: [PATCH 217/899] nomad: 0.5.3 -> 0.5.4

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

diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index b5137c47845..ae3415adef9 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "nomad-${version}";
-  version = "0.5.3";
+  version = "0.5.4";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/nomad";
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "hashicorp";
     repo = "nomad";
     inherit rev;
-    sha256 = "06s4irjz7k5qp895hvwv68xmr6mdq8bv91vhgh6rmx58my8jb68b";
+    sha256 = "0x7bi6wq7kpqv3wfhk5mqikj4hsb0f6lx867xz5l9cq3i39b5gj3";
   };
 
   meta = with stdenv.lib; {
@@ -20,6 +20,6 @@ buildGoPackage rec {
     description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";
     platforms = platforms.linux;
     license = licenses.mpl20;
-    maintainers = with maintainers; [ rushmorem ];
+    maintainers = with maintainers; [ rushmorem pradeepchhetri ];
   };
 }

From 9d1e203501898868c9e588fc8e567ac902564f47 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 31 Jan 2017 22:19:01 +0100
Subject: [PATCH 218/899] pythonPackages.pytest-pep257: 0.0.1 -> 0.0.5

---
 .../python-modules/pytest-pep257.nix          | 19 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 19 +------------------
 2 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/pytest-pep257.nix

diff --git a/pkgs/development/python-modules/pytest-pep257.nix b/pkgs/development/python-modules/pytest-pep257.nix
new file mode 100644
index 00000000000..7ce63ebc7a6
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-pep257.nix
@@ -0,0 +1,19 @@
+{ stdenv, buildPythonPackage, fetchurl, pytest, pep257 }:
+buildPythonPackage rec {
+   name = "pytest-pep257-${version}";
+   version = "0.0.5";
+
+   src = fetchurl {
+     url = "mirror://pypi/p/pytest-pep257/${name}.tar.gz";
+     sha256 = "082v3d5k4331x53za51kl8zxsndsw1pcyf1xdfpb2gjdjrhixb8w";
+   };
+
+   buildInputs = [ pytest ];
+   propagatedBuildInputs = [ pep257 ];
+
+   meta = with stdenv.lib; {
+     homepage = https://github.com/anderslime/pytest-pep257;
+     description = "py.test plugin for PEP257";
+     license = licenses.mit;
+   };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f25937f4b23..2746e1eb33e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5126,24 +5126,7 @@ in {
     };
   };
 
-  pytestpep257 = buildPythonPackage rec {
-     name = "pytest-pep257-${version}";
-     version = "0.0.1";
-
-     src = pkgs.fetchurl {
-       url = "mirror://pypi/p/pytest-pep257/${name}.tar.gz";
-       sha256 = "003vdkxpx37n0kjqpwgj3314hwk2jfz3nz58db7xh68bf8xy75lk";
-     };
-
-     buildInputs = with self; [ pytest ];
-     propagatedBuildInputs = with self ; [ pep257 ];
-
-     meta = {
-       homepage = https://github.com/anderslime/pytest-pep257;
-       description = "py.test plugin for PEP257";
-       license = licenses.mit;
-     };
-  };
+  pytest-pep257 = callPackage ../development/python-modules/pytest-pep257.nix { };
 
   pytest-raisesregexp = buildPythonPackage rec {
     name = "pytest-raisesregexp-${version}";

From 86fe7a40acc0e68e60905798b2d692c2e9a6c33e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 31 Jan 2017 15:20:28 +0100
Subject: [PATCH 219/899] Only read overlays ending in .nix

For example, this prevents Nix from barfing on editor backup files in
~/.nixpkgs/overlays.
---
 pkgs/top-level/impure.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix
index 60a55c657c0..d8201a3569f 100644
--- a/pkgs/top-level/impure.nix
+++ b/pkgs/top-level/impure.nix
@@ -29,7 +29,9 @@
       dirCheck = dir: dir != "" && pathExists (dir + "/.");
       overlays = dir:
         let content = readDir dir; in
-        map (n: import "${dir}/${n}") (sort lessThan (attrNames content));
+        map (n: import "${dir}/${n}")
+          (builtins.filter (n: builtins.match ".*\.nix" n != null)
+            (sort lessThan (attrNames content)));
     in
       if dirEnv != "" then
         if dirCheck dirEnv then overlays dirEnv

From 7dacca324d9e86fe7f7fad450ec833c746f21415 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 1 Feb 2017 15:56:02 +0100
Subject: [PATCH 220/899] $NIXPKGS_OVERLAYS -> <nixpkgs-overlays>

The Nix search path is the established mechanism for specifying the
location of Nix expressions, so let's use it instead of adding another
environment variable.
---
 doc/overlays.xml          |  4 ++--
 pkgs/top-level/impure.nix | 27 ++++++++++++++++-----------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/doc/overlays.xml b/doc/overlays.xml
index cb54c33cf65..540c83e0a39 100644
--- a/doc/overlays.xml
+++ b/doc/overlays.xml
@@ -28,8 +28,8 @@ first one present is considered, and all the rest are ignored:
 
   <listitem>
 
-    <para>In the directory pointed by the environment variable
-    <varname>NIXPKGS_OVERLAYS</varname>.</para>
+    <para>In the directory pointed to by the Nix search path entry
+    <literal>&lt;nixpkgs-overlays></literal>.</para>
   </listitem>
 
   <listitem>
diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix
index d8201a3569f..d1a28b9b15e 100644
--- a/pkgs/top-level/impure.nix
+++ b/pkgs/top-level/impure.nix
@@ -1,6 +1,17 @@
 /* Impure default args for `pkgs/top-level/default.nix`. See that file
    for the meaning of each argument. */
 
+with builtins;
+
+let
+
+  homeDir = builtins.getEnv "HOME";
+
+  # Return ‘x’ if it evaluates, or ‘def’ if it throws an exception.
+  try = x: def: let res = tryEval x; in if res.success then res.value else def;
+
+in
+
 { # Fallback: Assume we are building packages for the current (host, in GNU
   # Autotools parlance) system.
   system ? builtins.currentSystem
@@ -8,10 +19,7 @@
 , # Fallback: The contents of the configuration file found at $NIXPKGS_CONFIG or
   # $HOME/.nixpkgs/config.nix.
   config ? let
-      inherit (builtins) getEnv pathExists;
-
       configFile = getEnv "NIXPKGS_CONFIG";
-      homeDir = getEnv "HOME";
       configFile2 = homeDir + "/.nixpkgs/config.nix";
     in
       if configFile != "" && pathExists configFile then import configFile
@@ -22,20 +30,17 @@
   # collections of packages.  These collection of packages are part of the
   # fix-point made by Nixpkgs.
   overlays ? let
-      inherit (builtins) getEnv pathExists readDir attrNames map sort
-        lessThan;
-      dirEnv = getEnv "NIXPKGS_OVERLAYS";
-      dirHome = (getEnv "HOME") + "/.nixpkgs/overlays";
+      dirPath = try (if pathExists <nixpkgs-overlays> then <nixpkgs-overlays> else "") "";
+      dirHome = homeDir + "/.nixpkgs/overlays";
       dirCheck = dir: dir != "" && pathExists (dir + "/.");
       overlays = dir:
         let content = readDir dir; in
-        map (n: import "${dir}/${n}")
+        map (n: import (dir + ("/" + n)))
           (builtins.filter (n: builtins.match ".*\.nix" n != null)
             (sort lessThan (attrNames content)));
     in
-      if dirEnv != "" then
-        if dirCheck dirEnv then overlays dirEnv
-        else throw "The environment variable NIXPKGS_OVERLAYS does not name a valid directory."
+      if dirPath != "" then
+        overlays dirPath
       else if dirCheck dirHome then overlays dirHome
       else []
 

From 9d6a55aefd771f047d2aa3085c9a3f8a2f452333 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 1 Feb 2017 16:03:42 +0100
Subject: [PATCH 221/899] ~/.nixpkgs -> ~/.config/nixpkgs

The former is still respected as a fallback for config.nix for
backwards compatibility (but not for overlays because they're a new
feature).
---
 doc/configuration.xml                        | 6 +++---
 doc/functions.xml                            | 2 +-
 doc/languages-frameworks/haskell.md          | 8 ++++----
 doc/package-notes.xml                        | 2 +-
 lib/customisation.nix                        | 8 ++++----
 nixos/modules/services/editors/emacs.xml     | 4 ++--
 pkgs/development/r-modules/README.md         | 2 +-
 pkgs/games/planetaryannihilation/default.nix | 2 +-
 pkgs/stdenv/adapters.nix                     | 2 +-
 pkgs/stdenv/generic/default.nix              | 2 +-
 pkgs/top-level/impure.nix                    | 8 +++++---
 11 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/doc/configuration.xml b/doc/configuration.xml
index caff1e510cd..12e3b8ae851 100644
--- a/doc/configuration.xml
+++ b/doc/configuration.xml
@@ -2,12 +2,12 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="chap-packageconfig">
 
-<title><filename>~/.nixpkgs/config.nix</filename>: global configuration</title>
+<title>Global configuration</title>
 
 <para>Nix packages can be configured to allow or deny certain options.</para>
 
 <para>To apply the configuration edit
-<filename>~/.nixpkgs/config.nix</filename> and set it like
+<filename>~/.config/nixpkgs/config.nix</filename> and set it like
 
 <programlisting>
 {
@@ -89,7 +89,7 @@ packages via <literal>packageOverrides</literal></title>
 
 <para>You can define a function called
 <varname>packageOverrides</varname> in your local
-<filename>~/.nixpkgs/config.nix</filename> to overide nix packages.  It
+<filename>~/.config/nixpkgs/config.nix</filename> to overide nix packages.  It
 must be a function that takes pkgs as an argument and return modified
 set of packages.
 
diff --git a/doc/functions.xml b/doc/functions.xml
index 6374c15ddf2..5c654ffb956 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -119,7 +119,7 @@
       evaluation-per-function application incurs a performance penalty,
       which can become a problem if many overrides are used.
       It is only intended for ad-hoc customisation, such as in
-      <filename>~/.nixpkgs/config.nix</filename>.
+      <filename>~/.config/nixpkgs/config.nix</filename>.
     </para>
     </warning>
 
diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md
index 6728f4abba0..f16077cced4 100644
--- a/doc/languages-frameworks/haskell.md
+++ b/doc/languages-frameworks/haskell.md
@@ -195,7 +195,7 @@ its normal core packages:
         mtl-2.2.1
 
 This function allows users to define their own development environment by means
-of an override. After adding the following snippet to `~/.nixpkgs/config.nix`,
+of an override. After adding the following snippet to `~/.config/nixpkgs/config.nix`,
 
     {
       packageOverrides = super: let self = super.pkgs; in
@@ -522,7 +522,7 @@ file with `cabal2nix`:
     $ cd ~/src/foo && cabal2nix . >default.nix
     $ cd ~/src/bar && cabal2nix . >default.nix
 
-Then edit your `~/.nixpkgs/config.nix` file to register those builds in the
+Then edit your `~/.config/nixpkgs/config.nix` file to register those builds in the
 default Haskell package set:
 
       {
@@ -554,7 +554,7 @@ Every Haskell package set takes a function called `overrides` that you can use
 to manipulate the package as much as you please. One useful application of this
 feature is to replace the default `mkDerivation` function with one that enables
 library profiling for all packages. To accomplish that, add configure the
-following snippet in your `~/.nixpkgs/config.nix` file:
+following snippet in your `~/.config/nixpkgs/config.nix` file:
 
     {
       packageOverrides = super: let self = super.pkgs; in
@@ -583,7 +583,7 @@ The first step is to generate Nix build instructions with `cabal2nix`:
 
     $ cabal2nix cabal://ghc-events-0.4.3.0 >~/.nixpkgs/ghc-events-0.4.3.0.nix
 
-Then add the override in `~/.nixpkgs/config.nix`:
+Then add the override in `~/.config/nixpkgs/config.nix`:
 
     {
       packageOverrides = super: let self = super.pkgs; in
diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index 0ba7ec4c44d..0f148f5c898 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -278,7 +278,7 @@ packageOverrides = pkgs: {
 </screen>
 
     to your Nixpkgs configuration
-    (<filename>~/.nixpkgs/config.nix</filename>) and install it by
+    (<filename>~/.config/nixpkgs/config.nix</filename>) and install it by
     running <command>nix-env -f '&lt;nixpkgs&gt;' -iA
     myEclipse</command> and afterward run Eclipse as usual. It is
     possible to find out which plugins are available for installation
diff --git a/lib/customisation.nix b/lib/customisation.nix
index 3e6e279824b..41fe07fbd0a 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -15,10 +15,10 @@ rec {
      the original derivation attributes.
 
      `overrideDerivation' allows certain "ad-hoc" customisation
-     scenarios (e.g. in ~/.nixpkgs/config.nix).  For instance, if you
-     want to "patch" the derivation returned by a package function in
-     Nixpkgs to build another version than what the function itself
-     provides, you can do something like this:
+     scenarios (e.g. in ~/.config/nixpkgs/config.nix).  For instance,
+     if you want to "patch" the derivation returned by a package
+     function in Nixpkgs to build another version than what the
+     function itself provides, you can do something like this:
 
        mySed = overrideDerivation pkgs.gnused (oldAttrs: {
          name = "sed-4.2.2-pre";
diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml
index e03f6046de8..89f09ed0844 100644
--- a/nixos/modules/services/editors/emacs.xml
+++ b/nixos/modules/services/editors/emacs.xml
@@ -316,10 +316,10 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides
       <para>
         If you are not on NixOS or want to install this particular
         Emacs only for yourself, you can do so by adding it to your
-        <filename>~/.nixpkgs/config.nix</filename>
+        <filename>~/.config/nixpkgs/config.nix</filename>
         (see <link xlink:href="http://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides">Nixpkgs manual</link>):
         <example>
-          <title>Custom Emacs in <filename>~/.nixpkgs/system.nix</filename></title>
+          <title>Custom Emacs in <filename>~/.config/nixpkgs/config.nix</filename></title>
           <programlisting><![CDATA[
 {
   packageOverrides = super: let self = super.pkgs; in {
diff --git a/pkgs/development/r-modules/README.md b/pkgs/development/r-modules/README.md
index 9a7ccc55ac9..cb962e138c5 100644
--- a/pkgs/development/r-modules/README.md
+++ b/pkgs/development/r-modules/README.md
@@ -4,7 +4,7 @@ R packages
 ## Installation
 
 Define an environment for R that contains all the libraries that you'd like to
-use by adding the following snippet to your $HOME/.nixpkgs/config.nix file:
+use by adding the following snippet to your $HOME/.config/nixpkgs/config.nix file:
 
 ```nix
 {
diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix
index bd7e1188928..451d4b71296 100644
--- a/pkgs/games/planetaryannihilation/default.nix
+++ b/pkgs/games/planetaryannihilation/default.nix
@@ -6,7 +6,7 @@ assert ((config.planetary_annihilation or null).url or null) != null;
 assert ((config.planetary_annihilation or null).sha256 or null) != null;
 
 /* to setup:
- $ cat ~/.nixpkgs/config.nix
+ $ cat ~/.config/nixpkgs/config.nix
  {
   planetary_annihilation = {
     url = "file:///home/user/PA_Linux_62857.tar.bz2";
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 90a55188f09..3ffe1ab15d9 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -183,7 +183,7 @@ rec {
 
      This adapter can be defined on the defaultStdenv definition.  You can
      use it by patching the all-packages.nix file or by using the override
-     feature of ~/.nixpkgs/config.nix .
+     feature of ~/.config/nixpkgs/config.nix .
   */
   validateLicenses = licensePred: stdenv: stdenv //
     { mkDerivation = args:
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index c61d0e2d641..34ba2fd8dd9 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -153,7 +153,7 @@ let
 
           b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
             { allow${up reason} = true; }
-          to ~/.nixpkgs/config.nix.
+          to ~/.config/nixpkgs/config.nix.
         ''));
 
       # Check if a derivation is valid, that is whether it passes checks for
diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix
index d1a28b9b15e..63112034d29 100644
--- a/pkgs/top-level/impure.nix
+++ b/pkgs/top-level/impure.nix
@@ -17,13 +17,15 @@ in
   system ? builtins.currentSystem
 
 , # Fallback: The contents of the configuration file found at $NIXPKGS_CONFIG or
-  # $HOME/.nixpkgs/config.nix.
+  # $HOME/.config/nixpkgs/config.nix.
   config ? let
       configFile = getEnv "NIXPKGS_CONFIG";
-      configFile2 = homeDir + "/.nixpkgs/config.nix";
+      configFile2 = homeDir + "/.config/nixpkgs/config.nix";
+      configFile3 = homeDir + "/.nixpkgs/config.nix"; # obsolete
     in
       if configFile != "" && pathExists configFile then import configFile
       else if homeDir != "" && pathExists configFile2 then import configFile2
+      else if homeDir != "" && pathExists configFile3 then import configFile3
       else {}
 
 , # Overlays are used to extend Nixpkgs collection with additional
@@ -31,7 +33,7 @@ in
   # fix-point made by Nixpkgs.
   overlays ? let
       dirPath = try (if pathExists <nixpkgs-overlays> then <nixpkgs-overlays> else "") "";
-      dirHome = homeDir + "/.nixpkgs/overlays";
+      dirHome = homeDir + "/.config/nixpkgs/overlays";
       dirCheck = dir: dir != "" && pathExists (dir + "/.");
       overlays = dir:
         let content = readDir dir; in

From 58d6b40893420c23e91f381353492710ae2dbdca Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 29 Jan 2017 21:11:35 +0300
Subject: [PATCH 222/899] nfs-utils: 1.3.3 -> 2.1.1

Use upstream systemd units, add kerberos support.
---
 pkgs/os-specific/linux/nfs-utils/default.nix | 78 ++++++++++++--------
 1 file changed, 49 insertions(+), 29 deletions(-)

diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index 504d3790d86..81ce7babba1 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -1,48 +1,69 @@
-{ fetchurl, stdenv, tcp_wrappers, utillinux, libcap, libtirpc, libevent, libnfsidmap
-, lvm2, e2fsprogs, python, sqlite
+{ stdenv, fetchurl, lib, pkgconfig, utillinux, libcap, libtirpc, libevent, libnfsidmap
+, sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers
 }:
 
-stdenv.mkDerivation rec {
-  name = "nfs-utils-1.3.3";
+let
+  statdPath = lib.makeBinPath [ systemd utillinux coreutils ];
+
+in stdenv.mkDerivation rec {
+  name = "nfs-utils-${version}";
+  version = "2.1.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/nfs/${name}.tar.bz2";
-    sha256 = "1svn27j5c873nixm46l111g7cgyaj5zd51ahfq8mx5v9m3vh93py";
+    sha256 = "02dvxphndpm8vpqqnl0zvij97dq9vsq2a179pzrjcv2i91ll2a0a";
   };
 
-  buildInputs =
-    [ tcp_wrappers utillinux libcap libtirpc libevent libnfsidmap
-      lvm2 e2fsprogs python sqlite
-    ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [
+    libtirpc libcap libevent libnfsidmap sqlite lvm2
+    libuuid keyutils kerberos tcp_wrappers
+  ];
+
+  enableParallelBuilding = true;
 
-  # FIXME: Add the dependencies needed for NFSv4 and TI-RPC.
   configureFlags =
-    [ "--disable-gss"
+    [ "--enable-gss"
       "--with-statedir=/var/lib/nfs"
-      "--with-tirpcinclude=${libtirpc}/include/tirpc"
+      "--with-krb5=${kerberos}"
+      "--with-systemd=$(out)/etc/systemd/system"
+      "--enable-libmount-mount"
     ]
-    ++ stdenv.lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc.bin}/bin/rpcgen";
+    ++ lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc.bin}/bin/rpcgen";
 
-  patchPhase =
+  postPatch =
     ''
-      for i in "tests/"*.sh
-      do
-        sed -i "$i" -e's|/bin/bash|/bin/sh|g'
-        chmod +x "$i"
-      done
-      sed -i s,/usr/sbin,$out/sbin, utils/statd/statd.c
+      patchShebangs tests
+      sed -i "s,/usr/sbin,$out/bin,g" utils/statd/statd.c
+      sed -i "s,^PATH=.*,PATH=$out/bin:${statdPath}," utils/statd/start-statd
+
+      configureFlags="--with-start-statd=$out/bin/start-statd $configureFlags"
     '';
 
-  preBuild =
+  makeFlags = [
+    "sbindir=$(out)/bin"
+    "generator_dir=$(out)/etc/systemd/system-generators"
+  ];
+
+  installFlags = [
+    "statedir=$(TMPDIR)"
+    "statdpath=$(TMPDIR)"
+  ];
+
+  postInstall =
     ''
-      makeFlags="sbindir=$out/sbin"
-      installFlags="statedir=$TMPDIR statdpath=$TMPDIR" # hack to make `make install' work
+      # Not used on NixOS
+      sed -i \
+        -e "s,/sbin/modprobe,${kmod}/bin/modprobe,g" \
+        -e "s,/usr/sbin,$out/bin,g" \
+        $out/etc/systemd/system/*
     '';
 
   # One test fails on mips.
   doCheck = !stdenv.isMips;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Linux user-space NFS utilities";
 
     longDescription = ''
@@ -51,10 +72,9 @@ stdenv.mkDerivation rec {
       daemons.
     '';
 
-    homepage = http://nfs.sourceforge.net/;
-    license = stdenv.lib.licenses.gpl2;
-
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ ];
+    homepage = "https://sourceforge.net/projects/nfs/";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
   };
 }

From e0e9fddf566abcaa7c71cab9c8ee698142328e6b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 29 Jan 2017 21:11:50 +0300
Subject: [PATCH 223/899] nfsd service: use upstream systemd units

* Use /etc/nfs.conf as the recommended upstream way to configure services.
* Move server options to nfsd module.
---
 nixos/modules/rename.nix                      |   4 +
 .../services/network-filesystems/nfsd.nix     | 101 ++++++++----------
 nixos/modules/tasks/filesystems/nfs.nix       | 100 ++++++-----------
 3 files changed, 84 insertions(+), 121 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 4e7f62fc8f5..5ae3f4bd6e6 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -172,6 +172,10 @@ with lib;
     (mkRenamedOptionModule [ "services" "locate" "period" ] [ "services" "locate" "interval" ])
     (mkRemovedOptionModule [ "services" "locate" "includeStore" ] "Use services.locate.prunePaths" )
 
+    # nfs
+    (mkRenamedOptionModule [ "services" "nfs" "lockdPort" ] [ "services" "nfs" "server" "lockdPort" ])
+    (mkRenamedOptionModule [ "services" "nfs" "statdPort" ] [ "services" "nfs" "server" "statdPort" ])
+
     # Options that are obsolete and have no replacement.
     (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "")
     (mkRemovedOptionModule [ "programs" "bash" "enable" ] "")
diff --git a/nixos/modules/services/network-filesystems/nfsd.nix b/nixos/modules/services/network-filesystems/nfsd.nix
index ddc7258ce0b..4fafb7a1fdb 100644
--- a/nixos/modules/services/network-filesystems/nfsd.nix
+++ b/nixos/modules/services/network-filesystems/nfsd.nix
@@ -20,6 +20,7 @@ in
 
       server = {
         enable = mkOption {
+          type = types.bool;
           default = false;
           description = ''
             Whether to enable the kernel's NFS server.
@@ -27,6 +28,7 @@ in
         };
 
         exports = mkOption {
+          type = types.lines;
           default = "";
           description = ''
             Contents of the /etc/exports file.  See
@@ -36,6 +38,7 @@ in
         };
 
         hostName = mkOption {
+          type = types.nullOr types.str;
           default = null;
           description = ''
             Hostname or address on which NFS requests will be accepted.
@@ -46,6 +49,7 @@ in
         };
 
         nproc = mkOption {
+          type = types.int;
           default = 8;
           description = ''
             Number of NFS server threads.  Defaults to the recommended value of 8.
@@ -53,11 +57,13 @@ in
         };
 
         createMountPoints = mkOption {
+          type = types.bool;
           default = false;
           description = "Whether to create the mount points in the exports file at startup time.";
         };
 
         mountdPort = mkOption {
+          type = types.nullOr types.int;
           default = null;
           example = 4002;
           description = ''
@@ -66,11 +72,26 @@ in
         };
 
         lockdPort = mkOption {
-          default = 0;
+          type = types.nullOr types.int;
+          default = null;
+          example = 4001;
           description = ''
-            Fix the lockd port number. This can help setting firewall rules for NFS.
+            Use a fixed port for the NFS lock manager kernel module
+            (<literal>lockd/nlockmgr</literal>).  This is useful if the
+            NFS server is behind a firewall.
           '';
         };
+
+        statdPort = mkOption {
+          type = types.nullOr types.int;
+          default = null;
+          example = 4000;
+          description = ''
+            Use a fixed port for <command>rpc.statd</command>. This is
+            useful if the NFS server is behind a firewall.
+          '';
+        };
+
       };
 
     };
@@ -82,61 +103,42 @@ in
 
   config = mkIf cfg.enable {
 
+    services.nfs.extraConfig = ''
+      [nfsd]
+      threads=${toString cfg.nproc}
+      ${optionalString (cfg.hostName != null) "host=${cfg.hostName}"}
+
+      [mountd]
+      ${optionalString (cfg.mountdPort != null) "port=${toString cfg.mountdPort}"}
+
+      [statd]
+      ${optionalString (cfg.statdPort != null) "port=${toString cfg.statdPort}"}
+
+      [lockd]
+      ${optionalString (cfg.lockdPort != null) ''
+        port=${toString cfg.lockdPort}
+        udp-port=${toString cfg.lockdPort}
+      ''}
+    '';
+
     services.rpcbind.enable = true;
 
     boot.supportedFilesystems = [ "nfs" ]; # needed for statd and idmapd
 
-    environment.systemPackages = [ pkgs.nfs-utils ];
-
     environment.etc.exports.source = exports;
 
-    boot.kernelModules = [ "nfsd" ];
-
-    systemd.services.nfsd =
-      { description = "NFS Server";
-
+    systemd.services.nfs-server =
+      { enable = true;
         wantedBy = [ "multi-user.target" ];
-
-        requires = [ "rpcbind.service" "mountd.service" ];
-        after = [ "rpcbind.service" "mountd.service" "idmapd.service" ];
-        before = [ "statd.service" ];
-
-        path = [ pkgs.nfs-utils ];
-
-        script =
-          ''
-            # Create a state directory required by NFSv4.
-            mkdir -p /var/lib/nfs/v4recovery
-
-            ${pkgs.procps}/sbin/sysctl -w fs.nfs.nlm_tcpport=${builtins.toString cfg.lockdPort}
-            ${pkgs.procps}/sbin/sysctl -w fs.nfs.nlm_udpport=${builtins.toString cfg.lockdPort}
-
-            rpc.nfsd \
-              ${if cfg.hostName != null then "-H ${cfg.hostName}" else ""} \
-              ${builtins.toString cfg.nproc}
-          '';
-
-        postStop = "rpc.nfsd 0";
-
-        serviceConfig.Type = "oneshot";
-        serviceConfig.RemainAfterExit = true;
       };
 
-    systemd.services.mountd =
-      { description = "NFSv3 Mount Daemon";
-
-        requires = [ "rpcbind.service" ];
-        after = [ "rpcbind.service" "local-fs.target" ];
-
-        path = [ pkgs.nfs-utils pkgs.sysvtools pkgs.utillinux ];
+    systemd.services.nfs-mountd =
+      { enable = true;
+        path = [ pkgs.nfs-utils ];
+        restartTriggers = [ exports ];
 
         preStart =
           ''
-            mkdir -p /var/lib/nfs
-            touch /var/lib/nfs/rmtab
-
-            mountpoint -q /proc/fs/nfsd || mount -t nfsd none /proc/fs/nfsd
-
             ${optionalString cfg.createMountPoints
               ''
                 # create export directories:
@@ -149,15 +151,6 @@ in
 
             exportfs -rav
           '';
-
-        restartTriggers = [ exports ];
-
-        serviceConfig.Type = "forking";
-        serviceConfig.ExecStart = ''
-          @${pkgs.nfs-utils}/sbin/rpc.mountd rpc.mountd \
-              ${if cfg.mountdPort != null then "-p ${toString cfg.mountdPort}" else ""}
-        '';
-        serviceConfig.Restart = "always";
       };
 
   };
diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix
index e9a7ccc721a..692034c0e37 100644
--- a/nixos/modules/tasks/filesystems/nfs.nix
+++ b/nixos/modules/tasks/filesystems/nfs.nix
@@ -24,6 +24,8 @@ let
     Method = nsswitch
   '';
 
+  nfsConfFile = pkgs.writeText "nfs.conf" cfg.extraConfig;
+
   cfg = config.services.nfs;
 
 in
@@ -32,23 +34,12 @@ in
   ###### interface
 
   options = {
-
     services.nfs = {
-      statdPort = mkOption {
-        default = null;
-        example = 4000;
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
         description = ''
-          Use a fixed port for <command>rpc.statd</command>. This is
-          useful if the NFS server is behind a firewall.
-        '';
-      };
-      lockdPort = mkOption {
-        default = null;
-        example = 4001;
-        description = ''
-          Use a fixed port for the NFS lock manager kernel module
-          (<literal>lockd/nlockmgr</literal>).  This is useful if the
-          NFS server is behind a firewall.
+          Extra nfs-utils configuration.
         '';
       };
     };
@@ -62,69 +53,44 @@ in
 
     system.fsPackages = [ pkgs.nfs-utils ];
 
-    boot.extraModprobeConfig = mkIf (cfg.lockdPort != null) ''
-      options lockd nlm_udpport=${toString cfg.lockdPort} nlm_tcpport=${toString cfg.lockdPort}
-    '';
-
-    boot.kernelModules = [ "sunrpc" ];
-
     boot.initrd.kernelModules = mkIf inInitrd [ "nfs" ];
 
-    # FIXME: should use upstream units from nfs-utils.
+    systemd.packages = [ pkgs.nfs-utils ];
+    systemd.generator-packages = [ pkgs.nfs-utils ];
 
-    systemd.services.statd =
-      { description = "NFSv3 Network Status Monitor";
+    environment.etc = {
+      "idmapd.conf".source = idmapdConfFile;
+      "nfs.conf".source = nfsConfFile;
+    };
 
-        path = [ pkgs.nfs-utils pkgs.sysvtools pkgs.utillinux ];
-
-        wants = [ "remote-fs-pre.target" ];
-        before = [ "remote-fs-pre.target" ];
-        wantedBy = [ "remote-fs.target" ];
-        requires = [ "basic.target" "rpcbind.service" ];
-        after = [ "basic.target" "rpcbind.service" ];
-
-        unitConfig.DefaultDependencies = false; # don't stop during shutdown
-
-        preStart =
-          ''
-            mkdir -p ${nfsStateDir}/sm
-            mkdir -p ${nfsStateDir}/sm.bak
-            sm-notify -d
-          '';
-
-        serviceConfig.Type = "forking";
-        serviceConfig.ExecStart = ''
-          @${pkgs.nfs-utils}/sbin/rpc.statd rpc.statd --no-notify \
-              ${if cfg.statdPort != null then "-p ${toString cfg.statdPort}" else ""}
-        '';
-        serviceConfig.Restart = "always";
+    systemd.services.nfs-blkmap =
+      { restartTriggers = [ nfsConfFile ];
       };
 
-    systemd.services.idmapd =
-      { description = "NFSv4 ID Mapping Daemon";
+    systemd.targets.nfs-client =
+      { wantedBy = [ "multi-user.target" "remote-fs.target" ];
+      };
 
-        path = [ pkgs.sysvtools pkgs.utillinux ];
+    systemd.services.nfs-idmapd =
+      { restartTriggers = [ idmapdConfFile ];
+      };
 
-        wants = [ "remote-fs-pre.target" ];
-        before = [ "remote-fs-pre.target" ];
-        wantedBy = [ "remote-fs.target" ];
-        requires = [ "rpcbind.service" ];
-        after = [ "rpcbind.service" ];
+    systemd.services.nfs-mountd =
+      { restartTriggers = [ nfsConfFile ];
+        enable = mkDefault false;
+      };
 
-        preStart =
-          ''
-            mkdir -p ${rpcMountpoint}
-            mount -t rpc_pipefs rpc_pipefs ${rpcMountpoint}
-          '';
+    systemd.services.nfs-server =
+      { restartTriggers = [ nfsConfFile ];
+        enable = mkDefault false;
+      };
 
-        postStop =
-          ''
-            umount ${rpcMountpoint}
-          '';
+    systemd.services.rpc-gssd =
+      { restartTriggers = [ nfsConfFile ];
+      };
 
-        serviceConfig.Type = "forking";
-        serviceConfig.ExecStart = "@${pkgs.nfs-utils}/sbin/rpc.idmapd rpc.idmapd -c ${idmapdConfFile}";
-        serviceConfig.Restart = "always";
+    systemd.services.rpc-statd =
+      { restartTriggers = [ nfsConfFile ];
       };
 
   };

From 6ba35336f03381284e49b6a025e6008a01f7e77f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 1 Feb 2017 17:59:23 +0100
Subject: [PATCH 224/899] youtube-dl: update to version 2017.02.01

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 6ea9baf216b..c6da169a583 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -15,11 +15,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2017.01.29";
+  version = "2017.02.01";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "0visxc4rb6kw4hjcgcv5llis08z0syhian1m5hr1fdbz4w73hx9l";
+    sha256 = "1jkra0kgqg9ks76hwfcfsdaiknr9w8vavja0rc81ia644085axzz";
   };
 
   buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;

From 9f740122502d5ac9e01c1cf7a9a70ddc8c13b808 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 1 Feb 2017 14:45:44 +0100
Subject: [PATCH 225/899] pythonPackages.testpath: init at 0.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0f79045c007..81f2bd4b019 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25505,6 +25505,35 @@ in {
     };
   };
 
+  testpath = buildPythonPackage rec {
+    pname = "testpath";
+    version = "0.3";
+    name = "${pname}-${version}";
+
+    #format = "flit";
+    #src = pkgs.fetchFromGitHub {
+    #  owner = "jupyter";
+    #  repo = pname;
+    #  rev = "${version}";
+    #  sha256 = "1ghzmkrsrk9xrj42pjsq5gl7v3g2v0ji0xy0xzzxp5aizd3wrvl9";
+    #};
+    #doCheck = true;
+    #checkPhase = ''
+    #  ${python.interpreter} -m unittest discover
+    #'';
+    format = "wheel";
+    src = fetchpypi {
+      inherit pname version format;
+      sha256 = "f16b2cb3b03e1ada4fb0200b265a4446f92f3ba4b9d88ace34f51c54ab6d294e";
+    };
+
+    meta = {
+      description = "Test utilities for code working with files and commands";
+      license = with lib.licenses; [ mit ];
+      homepage = https://github.com/jupyter/testpath;
+    };
+  };
+
   testrepository = buildPythonPackage rec {
     name = "testrepository-${version}";
     version = "0.0.20";

From 2d062241eaff167935ce149021f774b9becf5fe1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 1 Feb 2017 14:46:00 +0100
Subject: [PATCH 226/899] pythonPackages.xarray: 0.8.2 -> 0.9.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 81f2bd4b019..9db1ffc0d7f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -27055,11 +27055,11 @@ EOF
 
   xarray = buildPythonPackage rec {
     name = "xarray-${version}";
-    version = "0.8.2";
+    version = "0.9.1";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/x/xarray/${name}.tar.gz";
-      sha256 = "4da06e38baea65c51347ba0770db416ebf003dbad5637215d2b25b191f2be1fb";
+      sha256 = "89772ed0e23f0e71c3fb8323746374999ecbe79c113e3fadc7ae6374e6dc0525";
     };
 
     buildInputs = with self; [ pytest ];

From 5cd9e1c8f2ca5497e24379b74497efcdd1a6414c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 1 Feb 2017 14:46:26 +0100
Subject: [PATCH 227/899] pythonPackages.pandocfilters: 1.3.0 -> 1.4.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9db1ffc0d7f..912f65c55b0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -30898,18 +30898,16 @@ EOF
     };
   };
   pandocfilters = buildPythonPackage rec{
-    version = "1.3.0";
+    version = "1.4.1";
     pname = "pandocfilters";
     name = pname + "-${version}";
 
-    src = pkgs.fetchFromGitHub {
-      owner = "jgm";
-      repo = pname;
-      rev = version;
-      sha256 = "0ky9k800ixwiwvra0na6d6qaqcyps83mycgd8qvkrn5r80hddkzz";
+    src = fetchpypi{
+      inherit pname version;
+      sha256 = "ec8bcd100d081db092c57f93462b1861bcfa1286ef126f34da5cb1d969538acd";
     };
-
-    propagatedBuildInputs = with self; [ ];
+    # No tests available
+    doCheck = false;
 
     meta = {
       description = "A python module for writing pandoc filters, with a collection of examples";

From 3eadbb746c7b94b74cdf70e84d2a951458b6d17f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 1 Feb 2017 14:47:15 +0100
Subject: [PATCH 228/899] pythonPackages.numexpr: 2.6.1 -> 2.6.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 912f65c55b0..6e17ec53649 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16097,12 +16097,12 @@ in {
   numba = callPackage ../development/python-modules/numba { };
 
   numexpr = buildPythonPackage rec {
-    version = "2.6.1";
+    version = "2.6.2";
     name = "numexpr-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/n/numexpr/${name}.tar.gz";
-      sha256 = "db2ee72f277b23c82d204189290ea4b792f9bd5b9d67744b045f8c2a8e929a06";
+      sha256 = "6ab8ff5c19e7f452966bf5a3220b845cf3244fe0b96544f7f9acedcc2db5c705";
     };
 
     propagatedBuildInputs = with self; [ numpy ];

From fae20e6c2938d2225ca7542ec40278780e5dc93e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 1 Feb 2017 14:47:38 +0100
Subject: [PATCH 229/899] pythonPackages.ipywidgets: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6e17ec53649..4980a29dd2a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13090,6 +13090,9 @@ in {
       sha256 = "baf6098f054dd5eacc2934b8ea3bef908b81ca8660d839f1f940255a72c660d2";
     };
 
+    # Tests are not distributed
+    doCheck = false;
+
     buildInputs = with self; [ nose pytest ];
     propagatedBuildInputs = with self; [ipython ipykernel traitlets notebook widgetsnbextension ];
 

From ea5c83daa207148b5eba8d395a673f4b56da7ed4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 1 Feb 2017 18:57:11 +0100
Subject: [PATCH 230/899] mupdf: 1.9a -> 1.10a

---
 pkgs/applications/misc/mupdf/default.nix | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index e1926ce386f..ba2313fc7b5 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -3,31 +3,20 @@
 , libX11, libXcursor, libXrandr, libXinerama, libXext, harfbuzz, mesa }:
 
 stdenv.mkDerivation rec {
-  version = "1.9a";
+  version = "1.10a";
   name = "mupdf-${version}";
 
   src = fetchurl {
     url = "http://mupdf.com/downloads/archive/${name}-source.tar.gz";
-    sha256 = "1k64pdapyj8a336jw3j61fhn0rp4q6az7d0dqp9r5n3d9rgwa5c0";
+    sha256 = "0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a";
   };
 
   patches = [
-    # http://www.openwall.com/lists/oss-security/2016/08/03/2
-    (fetchpatch {
-      name = "mupdf-fix-CVE-2016-6525.patch";
-      url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=39b0f07dd960f34e7e6bf230ffc3d87c41ef0f2e;hp=fa1936405b6a84e5c9bb440912c23d532772f958";
-      sha256 = "1g9fkd1f5rx1z043vr9dj4934qf7i4nkvbwjc61my9azjrrc3jv7";
-    })
-    (fetchpatch {
-      name = "mupdf-696941-fix-use-after-free.patch";
-      url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=fa1936405b6a84e5c9bb440912c23d532772f958";
-      sha256 = "02j9b6my1h3rb0sz9yp6gi7c4ldi3mz0z9s5i8g9cl0arxyzys5h";
-    })
     # Compatibility with new openjpeg
     (fetchpatch {
       name = "mupdf-1.9a-openjpeg-2.1.1.patch";
-      url = "https://git.archlinux.org/svntogit/community.git/plain/mupdf/trunk/0001-mupdf-openjpeg.patch?id=9083dac2a398bfe694d31a0c6a0a839c5a756e53";
-      sha256 = "14ndgy3w1sl25km9bcc2zfcxrcihqjw1sdzkpcw5g1mi7gcgxp3g";
+      url = "https://git.archlinux.org/svntogit/community.git/plain/mupdf/trunk/0001-mupdf-openjpeg.patch?id=5a28ad0a8999a9234aa7848096041992cc988099";
+      sha256 = "1i24qr4xagyapx4bijjfksj4g3bxz8vs5c2mn61nkm29c63knp75";
     })
   ];
 

From 68995874be1c79cf6b30c888fc05494bfc57f716 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 1 Feb 2017 19:03:56 +0100
Subject: [PATCH 231/899] asdf: 3.1.7 -> 3.2.0

---
 pkgs/development/lisp-modules/asdf/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix
index 278690f3a1c..7e05dfa585a 100644
--- a/pkgs/development/lisp-modules/asdf/default.nix
+++ b/pkgs/development/lisp-modules/asdf/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="asdf";
-    version="3.1.7";
+    version="3.2.0";
     name="${baseName}-${version}";
-    hash="16x065q6adidbdr77axsxz4f8c818szfz0b9sw1a4c89y82ylsnn";
-    url="http://common-lisp.net/project/asdf/archives/asdf-3.1.7.tar.gz";
-    sha256="16x065q6adidbdr77axsxz4f8c818szfz0b9sw1a4c89y82ylsnn";
+    hash="0ns4hh5f0anfgvy4q68wsylgwfin82kb1k2p53h29cf8jiil0p9a";
+    url="http://common-lisp.net/project/asdf/archives/asdf-3.2.0.tar.gz";
+    sha256="0ns4hh5f0anfgvy4q68wsylgwfin82kb1k2p53h29cf8jiil0p9a";
   };
   buildInputs = [
     texinfo texLive perl
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     inherit (s) url sha256;
   };
-  sourceRoot = ".";
+
   buildPhase = ''
     make build/asdf.lisp
     make -C doc asdf.info asdf.html

From 1567d3c44a62578fce87a3e8e715c398960afa7d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 1 Feb 2017 19:04:19 +0100
Subject: [PATCH 232/899] sbcl: 1.3.13 -> 1.3.14

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

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 85c558c92e8..c713d819661 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.3.13";
+  version = "1.3.14";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "1k3nij1pchkard02p51mbbsn4rrj116v1apjjpd3f9h2m7j3asac";
+    sha256 = "1jnwsv8bdkrrg1w0gkjx9nb8sw3if38sna40davrx0rxadc3v5mz";
   };
 
   patchPhase = ''

From 1561dcdc26d22a0552444295c699c276ee69e92c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 1 Feb 2017 19:15:22 +0100
Subject: [PATCH 233/899] getmail: 4.52.0 -> 4.53.0

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

diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix
index c3fe609f4cd..5eac65a009a 100644
--- a/pkgs/tools/networking/getmail/default.nix
+++ b/pkgs/tools/networking/getmail/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
-  version = "4.52.0";
+  version = "4.53.0";
   name = "getmail-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz";
-    sha256 = "0pzplrlxwbxydvfw4kkwn60l40hk1h5sxawaa6pi0k75c220k4ni";
+    sha256 = "1awjdxiq3d25h10h32a7h2wxbkgvgvsnicp5xwx4p8mm6gz9c998";
   };
 
   doCheck = false;

From 846007b8db338d8293c1bf208ba42f10c78e14aa Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 1 Feb 2017 19:20:54 +0100
Subject: [PATCH 234/899] nginx: 1.10.2 -> 1.10.3

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

diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix
index 8d91f4e4b9b..efbcada6230 100644
--- a/pkgs/servers/http/nginx/stable.nix
+++ b/pkgs/servers/http/nginx/stable.nix
@@ -1,6 +1,6 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "1.10.2";
-  sha256 = "1hk5szkwns6s0xsvd0aiy392sqbvk3wdl480bpxf55m3hx4sqi8h";
+  version = "1.10.3";
+  sha256 = "146xd566l1wkhzxqhmd01vj7c0yhsap1qkiwfg5mki6ach9hy0km";
 })

From c1f6eeb822654d74d10125fa7c4b146579bb97ad Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 1 Feb 2017 19:23:04 +0100
Subject: [PATCH 235/899] botan: 1.10.14 -> 1.10.14

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

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

From a9e55a2a8e2849fa8e991ecac4d8eeafe9187c63 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 1 Feb 2017 19:24:35 +0100
Subject: [PATCH 236/899] firejail: 0.9.44.4 -> 0.9.44.8

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

diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index 74486843b92..27acc8f1c28 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="firejail";
-    version="0.9.44.4";
+    version="0.9.44.8";
     name="${baseName}-${version}";
-    hash="03y1xc70w5xr6jynmj305fmgniz2cq21q85s5q7dnda8ap6s4w1d";
-    url="https://netcologne.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.44.4.tar.xz";
-    sha256="03y1xc70w5xr6jynmj305fmgniz2cq21q85s5q7dnda8ap6s4w1d";
+    hash="0w87n5qzvylbjipaf45sw65gg4rpqcbi32zw9cs1jbfvf4bikzmr";
+    url="https://netix.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.44.8.tar.xz";
+    sha256="0w87n5qzvylbjipaf45sw65gg4rpqcbi32zw9cs1jbfvf4bikzmr";
   };
   buildInputs = [
     which

From ac10c19746ceaec1459548cf2ba9585b4c905f2f Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Wed, 1 Feb 2017 19:43:02 +0100
Subject: [PATCH 237/899] veriT: 201506 -> 2016

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

diff --git a/pkgs/applications/science/logic/verit/default.nix b/pkgs/applications/science/logic/verit/default.nix
index 53ab084321d..ca3673d7bf9 100644
--- a/pkgs/applications/science/logic/verit/default.nix
+++ b/pkgs/applications/science/logic/verit/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "veriT-${version}";
-  version = "201506";
+  version = "2016";
 
   src = fetchurl {
-    url = "http://www.verit-solver.org/distrib/${name}.tar.gz";
-    sha256 = "1cc9gcspw3namkdfypkians2j5dn224dsw6xx95qicad6033bsgk";
+    url = "http://www.verit-solver.org/distrib/veriT-stable2016.tar.gz";
+    sha256 = "0gvp4diz0qjg0y5ry0p1z7dkdkxw8l7jb8cdhvcnhl06jx977v4b";
   };
 
   nativeBuildInputs = [ autoreconfHook flex bison ];

From b70a979c6932b9cdda58c691988b37a62a90e716 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 1 Feb 2017 20:25:58 +0100
Subject: [PATCH 238/899] Remove unnecessary "sort" call

attrNames already returns names in sorted order.
---
 pkgs/top-level/impure.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix
index 63112034d29..6999b7428ba 100644
--- a/pkgs/top-level/impure.nix
+++ b/pkgs/top-level/impure.nix
@@ -39,7 +39,7 @@ in
         let content = readDir dir; in
         map (n: import (dir + ("/" + n)))
           (builtins.filter (n: builtins.match ".*\.nix" n != null)
-            (sort lessThan (attrNames content)));
+            (attrNames content));
     in
       if dirPath != "" then
         overlays dirPath

From 3d10d5ffdca0670d05cf5213b1bac68bd9208002 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 1 Feb 2017 19:34:42 +0000
Subject: [PATCH 239/899] omake: 0.10.1 -> 0.10.2

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

diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix
index 53152898fd6..93d96005d35 100644
--- a/pkgs/development/tools/ocaml/omake/default.nix
+++ b/pkgs/development/tools/ocaml/omake/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "omake-${version}";
-  version = "0.10.1";
+  version = "0.10.2";
 
   src = fetchurl {
     url = "http://download.camlcity.org/download/${name}.tar.gz";
-    sha256 = "093ansbppms90hiqvzar2a46fj8gm9iwnf8gn38s6piyp70lrbsj";
+    sha256 = "1znnlkpz89hk44byvnl1pr92ym6hwfyyw2qm9clq446r6l2z4m64";
   };
 
   buildInputs = [ ocaml ncurses ];

From 2bf0fd0f294e0c1e52e36b9c2aba257f5fe4d468 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 21 Jan 2017 14:25:19 +0100
Subject: [PATCH 240/899] Revert "nmap: use python infra's .withPackages"

This reverts commit 278d3050ae85e959e4c6485b5ad43bbba96eb829 because it
breaks zenmap:

$ zenmap
Could not import the zenmapGUI.App module: 'No module named zenmapGUI.App'.
I checked in these directories:
    /nix/store/2hiz11plgjdrk2mziwc2jcxqalqh9hii-nmap-graphical-7.12/bin
    /home/bfo/forks/nixpkgs
    /nix/store/0l4lriqf07qah8c0kh9kcyc8l5iyij16-python-2.7.12/lib/python27.zip
    /nix/store/0l4lriqf07qah8c0kh9kcyc8l5iyij16-python-2.7.12/lib/python2.7
    /nix/store/0l4lriqf07qah8c0kh9kcyc8l5iyij16-python-2.7.12/lib/python2.7/plat-linux2
    /nix/store/0l4lriqf07qah8c0kh9kcyc8l5iyij16-python-2.7.12/lib/python2.7/lib-tk
    /nix/store/0l4lriqf07qah8c0kh9kcyc8l5iyij16-python-2.7.12/lib/python2.7/lib-old
    /nix/store/0l4lriqf07qah8c0kh9kcyc8l5iyij16-python-2.7.12/lib/python2.7/lib-dynload
    /nix/store/0l4lriqf07qah8c0kh9kcyc8l5iyij16-python-2.7.12/lib/python2.7/site-packages
If you installed Zenmap in another directory, you may have to add the
modules directory to the PYTHONPATH environment variable.
---
 pkgs/tools/security/nmap/default.nix | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix
index 9413f992086..71d93d44322 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/pkgs/tools/security/nmap/default.nix
@@ -1,12 +1,13 @@
 { stdenv, fetchurl, libpcap, pkgconfig, openssl
 , graphicalSupport ? false
-, gtk2 ? null
 , libX11 ? null
+, gtk2 ? null
 , withPython ? false # required for the `ndiff` binary
-, python2 ? null
+, python2Packages ? null
+, makeWrapper ? null
 }:
 
-assert withPython -> python2 != null;
+assert withPython -> python2Packages != null;
 
 with stdenv.lib;
 
@@ -16,10 +17,6 @@ let
   # so automatically enable pythonSupport if graphicalSupport is requested.
   pythonSupport = withPython || graphicalSupport;
 
-  pythonEnv = python2.withPackages(ps: with ps; []
-    ++ optionals graphicalSupport [ pycairo pygobject2 pygtk pysqlite ]
-  );
-
 in stdenv.mkDerivation rec {
   name = "nmap${optionalString graphicalSupport "-graphical"}-${version}";
   version = "7.31";
@@ -36,10 +33,17 @@ in stdenv.mkDerivation rec {
     ++ optional (!graphicalSupport) "--without-zenmap"
     ;
 
-  buildInputs = [ libpcap pkgconfig openssl ]
-    ++ optional pythonSupport pythonEnv
-    ++ optionals graphicalSupport [ gtk2 libX11 ]
-    ;
+  postInstall = optionalString pythonSupport ''
+      wrapProgram $out/bin/ndiff --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH"
+  '' + optionalString graphicalSupport ''
+      wrapProgram $out/bin/zenmap --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" --prefix PYTHONPATH : $(toPythonPath $pygtk)/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath $pygobject)/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath $pycairo)/gtk-2.0
+  '';
+
+  buildInputs = with python2Packages; [ libpcap pkgconfig openssl ]
+    ++ optionals pythonSupport [ makeWrapper python ]
+    ++ optionals graphicalSupport [
+      libX11 gtk2 pygtk pysqlite pygobject2 pycairo
+    ];
 
   meta = {
     description = "A free and open source utility for network discovery and security auditing";

From 32a6a4df774f208fbcc8d5d4098b7d175dcc780a Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Wed, 1 Feb 2017 21:12:02 +0100
Subject: [PATCH 241/899] gitlab-runner: 1.10.0 -> 1.10.4

Patch release fixes some crashes and race conditions
---
 .../continuous-integration/gitlab-runner/default.nix      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index c2e105d469e..7c8c71b2969 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
 { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
 
 let
-  version = "1.10.0";
+  version = "1.10.4";
   # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
   docker_x86_64 = fetchurl {
     url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
-    sha256 = "1fv4sv92ng4gx53pbpagb6kv2hdab04lf2chsflf10xgzqw5l521";
+    sha256 = "0csaacghcdnkrpxiwsg8166nmdpnddf77c619i558vj0wdglq45k";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
-    sha256 = "153dbgk6fvl73d5qhainqr9hzicsryc6ynlryi9si40ld82flrsr";
+    sha256 = "1lsdp4v92v406qiwr435ym4f3zbc1vq6ipwrp7li640frhr2jqpk";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-ci-multi-runner";
     rev = "v${version}";
-    sha256 = "0ma6b6624c8218cz4gg5pr077li7nbs0v3mpgr1hxq7v465spa7j";
+    sha256 = "0r8f1m9f544ikcknvq1500kfjxbikgqlv7wdayfpazvj6s1zlswg";
   };
 
   buildInputs = [ go-bindata ];

From 3e5022c787c2581aa3fc5685a3c0e08a2a0314a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 1 Feb 2017 21:03:02 +0100
Subject: [PATCH 242/899] hardinfo: init at 0.5.1

Display information about your hardware and operating system.
---
 pkgs/tools/system/hardinfo/default.nix | 45 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/tools/system/hardinfo/default.nix

diff --git a/pkgs/tools/system/hardinfo/default.nix b/pkgs/tools/system/hardinfo/default.nix
new file mode 100644
index 00000000000..11236b7a9d1
--- /dev/null
+++ b/pkgs/tools/system/hardinfo/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, which, pkgconfig, gtk2, pcre, glib, libxml2
+, libsoup ? null
+}:
+
+stdenv.mkDerivation rec {
+  name = "hardinfo-${version}";
+  version = "0.5.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/hardinfo.berlios/hardinfo-${version}.tar.bz2";
+    sha256 = "0yhvfc5icam3i4mphlz0m9d9d2irjw8mbsxq203x59wjgh6nrpx0";
+  };
+
+  # Not adding 'hostname' command, the build shouldn't depend on what the build
+  # host is called.
+  buildInputs = [ which pkgconfig gtk2 pcre glib libxml2 libsoup ];
+
+  # Fixes '#error You must compile this program without "-O"'
+  hardeningDisable = [ "all" ];
+
+  preConfigure = ''
+    patchShebangs configure
+
+    # -std=gnu89 fixes build error, copied from
+    # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=757525
+    sed -i -e "s/^CFLAGS = \(.*\)/CFLAGS = \1 -std=gnu89/" Makefile.in
+
+    substituteInPlace ./arch/linux/common/modules.h --replace /sbin/modinfo modinfo
+  '';
+
+  # Makefile supports DESTDIR but not PREFIX (it hardcodes $DESTDIR/usr/).
+  installFlags = [ "DESTDIR=$(out)" ];
+  postInstall = ''
+    mv "$out/usr/"* "$out"
+    rmdir "$out/usr"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://hardinfo.org/;
+    description = "Display information about your hardware and operating system";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ bjornfor ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90e44c9819a..a2c08d2eea8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2150,6 +2150,8 @@ with pkgs;
 
   halibut = callPackage ../tools/typesetting/halibut { };
 
+  hardinfo = callPackage ../tools/system/hardinfo { };
+
   hdapsd = callPackage ../os-specific/linux/hdapsd { };
 
   hddtemp = callPackage ../tools/misc/hddtemp { };

From 220adbb0393e8acff35d137998a133df38bc8198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 1 Feb 2017 21:31:53 +0100
Subject: [PATCH 243/899] docs: fix link for python

---
 doc/languages-frameworks/python.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index 3f5d500620b..83d47b6f43a 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -781,7 +781,7 @@ If you get the following error:
     could not create '/nix/store/6l1bvljpy8gazlsw2aw9skwwp4pmvyxw-python-2.7.8/etc':
     Permission denied
 
-This is a [known bug](https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix) in setuptools.
+This is a [known bug](https://github.com/pypa/setuptools/issues/130) in setuptools.
 Setuptools `install_data` does not respect `--prefix`. An example of such package using the feature is `pkgs/tools/X11/xpra/default.nix`.
 As workaround install it as an extra `preInstall` step:
 

From de172ae0613092a0efb2fd7654943a06463b90ac Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 1 Feb 2017 22:18:36 +0100
Subject: [PATCH 244/899] copyright-update: init at 2016.1018

---
 pkgs/tools/text/copyright-update/default.nix | 26 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/tools/text/copyright-update/default.nix

diff --git a/pkgs/tools/text/copyright-update/default.nix b/pkgs/tools/text/copyright-update/default.nix
new file mode 100644
index 00000000000..604097fbe77
--- /dev/null
+++ b/pkgs/tools/text/copyright-update/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, perl }:
+
+stdenv.mkDerivation rec {
+  name = "copyright-update-${version}";
+  version = "2016.1018";
+
+  src = fetchFromGitHub {
+    name = "${name}-src";
+    owner = "jaalto";
+    repo = "project--copyright-update";
+    rev = "release/${version}";
+    sha256 = "1kj6jlgyxrgvrpv7fcgbibfqqa83xljp17v6sas42dlb105h6sgd";
+  };
+
+  buildInputs = [ perl ];
+
+  installFlags = [ "INSTALL=install" "prefix=$(out)" ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/jaalto/project--copyright-update;
+    description = "Updates the copyright information in a set of files";
+    license = licenses.gpl2Plus;
+    platforms = platforms.all;
+    maintainers = [ maintainers.rycee ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2c08d2eea8..4cd17dfea3c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -743,6 +743,8 @@ with pkgs;
 
   consul-template = callPackage ../tools/system/consul-template { };
 
+  copyright-update = callPackage ../tools/text/copyright-update { };
+
   corebird = callPackage ../applications/networking/corebird { };
 
   corosync = callPackage ../servers/corosync { };

From 24f3abdafbf0a4840d63baa91e60ba34fad00d4d Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Mon, 30 Jan 2017 14:03:42 +0100
Subject: [PATCH 245/899] Revert "Make services.xserver.xkbDir conflict free
 when overriden."

This reverts commit 82bcfef109ecf58ac1503e4cab15ae53dd524f4b.

cc @nbp

Fixes #22290, #22352.

Signed-off-by: Franz Pletz <fpletz@fnordicwalking.de>
---
 .../x11/desktop-managers/enlightenment.nix    |  5 +++-
 .../services/x11/desktop-managers/kde4.nix    |  5 +++-
 .../services/x11/desktop-managers/kde5.nix    |  5 +++-
 nixos/modules/services/x11/xserver.nix        | 24 ++++++++++++-------
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index 615504bab15..7ea8b30d23d 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -64,7 +64,10 @@ in
 
     security.setuidPrograms = [ "e_freqset" ];
 
-    services.xserver.exportConfiguration = true;
+    environment.etc = singleton
+      { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
+        target = "X11/xkb";
+      };
 
     fonts.fonts = [ pkgs.dejavu_fonts pkgs.ubuntu_font_family ];
 
diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix
index b551432bc27..3aa4821a052 100644
--- a/nixos/modules/services/x11/desktop-managers/kde4.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde4.nix
@@ -183,7 +183,10 @@ in
       GST_PLUGIN_SYSTEM_PATH = [ "/lib/gstreamer-0.10" ];
     };
 
-    services.xserver.exportConfiguration = true;
+    environment.etc = singleton
+      { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
+        target = "X11/xkb";
+      };
 
     # Enable helpful DBus services.
     services.udisks2.enable = true;
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index ec85cf1d0bd..8f081a1e9d2 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -199,7 +199,10 @@ in
 
       environment.pathsToLink = [ "/share" ];
 
-      services.xserver.exportConfiguration = true;
+      environment.etc = singleton {
+        source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
+        target = "X11/xkb";
+      };
 
       environment.variables =
         {
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 8617a5fab03..f5ed5233818 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -465,15 +465,23 @@ in
         }
       ];
 
-    environment.etc = mkMerge [
-      (mkIf cfg.exportConfiguration {
-        "X11/xorg.conf".source = configFile;
-        "X11/xkb".source = cfg.xkbDir;
-      })
+    environment.etc =
+      (optionals cfg.exportConfiguration
+        [ { source = "${configFile}";
+            target = "X11/xorg.conf";
+          }
+          # -xkbdir command line option does not seems to be passed to xkbcomp.
+          { source = "${cfg.xkbDir}";
+            target = "X11/xkb";
+          }
+        ])
       # Needed since 1.18; see https://bugs.freedesktop.org/show_bug.cgi?id=89023#c5
-      (let cfgPath = "X11/xorg.conf.d/10-evdev.conf"; in
-        { "${cfgPath}".source = xorg.xf86inputevdev.out + "/share" + cfgPath; })
-    ];
+      ++ (let cfgPath = "/X11/xorg.conf.d/10-evdev.conf"; in
+        [{
+          source = xorg.xf86inputevdev.out + "/share" + cfgPath;
+          target = cfgPath;
+        }]
+      );
 
     environment.systemPackages =
       [ xorg.xorgserver.out

From c3badbb3664f43612998927f8cfaba945b1d418c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 1 Feb 2017 22:44:10 +0100
Subject: [PATCH 246/899] knot-resolver: 1.2.0 -> 1.2.1

It mainly fixes a single issue that perhaps has a minor security impact.
https://lists.nic.cz/pipermail/knot-dns-users/2017-February/001045.html
---
 pkgs/servers/dns/knot-resolver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 1e7dbaf8e2f..6b4f1522e21 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -10,11 +10,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "knot-resolver-${version}";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
-    sha256 = "b8828197dbd563e4b502571538c6d44ef2bb07dede1df884b785921f8aec77fd";
+    sha256 = "1b6f55ea1dfec90f45c437f23e1ab440e478570498161d0f8a8f94a439305f8c";
   };
 
   outputs = [ "out" "dev" ];

From 8ef14f80e3d4d27644dec3d6d47152ae4b40ab07 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 2 Feb 2017 00:51:16 +0300
Subject: [PATCH 247/899] systemd service: add aliases option

---
 nixos/modules/system/boot/systemd-lib.nix        |  8 +++++++-
 .../modules/system/boot/systemd-unit-options.nix |  6 ++++++
 nixos/modules/system/boot/systemd.nix            | 16 ++++++++--------
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixos/modules/system/boot/systemd-lib.nix
index 997770b8bec..7dbf3b25cdb 100644
--- a/nixos/modules/system/boot/systemd-lib.nix
+++ b/nixos/modules/system/boot/systemd-lib.nix
@@ -159,7 +159,13 @@ rec {
         fi
       done
 
-      # Created .wants and .requires symlinks from the wantedBy and
+      # Create service aliases from aliases option.
+      ${concatStrings (mapAttrsToList (name: unit:
+          concatMapStrings (name2: ''
+            ln -sfn '${name}' $out/'${name2}'
+          '') unit.aliases) units)}
+
+      # Create .wants and .requires symlinks from the wantedBy and
       # requiredBy options.
       ${concatStrings (mapAttrsToList (name: unit:
           concatMapStrings (name2: ''
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index 69af2398148..904e41b019f 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -52,6 +52,12 @@ in rec {
       description = "Units that want (i.e. depend on) this unit.";
     };
 
+    aliases = mkOption {
+      default = [];
+      type = types.listOf types.str;
+      description = "Aliases of that unit.";
+    };
+
   };
 
   concreteUnitOptions = sharedOptions // {
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index a2ee5166971..79779d3b42f 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -301,7 +301,7 @@ let
     '';
 
   targetToUnit = name: def:
-    { inherit (def) wantedBy requiredBy enable;
+    { inherit (def) aliases wantedBy requiredBy enable;
       text =
         ''
           [Unit]
@@ -310,7 +310,7 @@ let
     };
 
   serviceToUnit = name: def:
-    { inherit (def) wantedBy requiredBy enable;
+    { inherit (def) aliases wantedBy requiredBy enable;
       text = commonUnitText def +
         ''
           [Service]
@@ -330,7 +330,7 @@ let
     };
 
   socketToUnit = name: def:
-    { inherit (def) wantedBy requiredBy enable;
+    { inherit (def) aliases wantedBy requiredBy enable;
       text = commonUnitText def +
         ''
           [Socket]
@@ -340,7 +340,7 @@ let
     };
 
   timerToUnit = name: def:
-    { inherit (def) wantedBy requiredBy enable;
+    { inherit (def) aliases wantedBy requiredBy enable;
       text = commonUnitText def +
         ''
           [Timer]
@@ -349,7 +349,7 @@ let
     };
 
   pathToUnit = name: def:
-    { inherit (def) wantedBy requiredBy enable;
+    { inherit (def) aliases wantedBy requiredBy enable;
       text = commonUnitText def +
         ''
           [Path]
@@ -358,7 +358,7 @@ let
     };
 
   mountToUnit = name: def:
-    { inherit (def) wantedBy requiredBy enable;
+    { inherit (def) aliases wantedBy requiredBy enable;
       text = commonUnitText def +
         ''
           [Mount]
@@ -367,7 +367,7 @@ let
     };
 
   automountToUnit = name: def:
-    { inherit (def) wantedBy requiredBy enable;
+    { inherit (def) aliases wantedBy requiredBy enable;
       text = commonUnitText def +
         ''
           [Automount]
@@ -376,7 +376,7 @@ let
     };
 
   sliceToUnit = name: def:
-    { inherit (def) wantedBy requiredBy enable;
+    { inherit (def) aliases wantedBy requiredBy enable;
       text = commonUnitText def +
         ''
           [Slice]

From 496476be4ed3d8e81213ccb7240fd91fdcf83e15 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 2 Feb 2017 00:51:39 +0300
Subject: [PATCH 248/899] bluez4: reintroduce to nixpkgs

It's still needed by KDE4. It was there, just unreferenced from all-packages.
---
 pkgs/os-specific/linux/bluez/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix          | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix
index 9943a1de6d4..d0a875516fa 100644
--- a/pkgs/os-specific/linux/bluez/default.nix
+++ b/pkgs/os-specific/linux/bluez/default.nix
@@ -5,8 +5,8 @@ assert stdenv.isLinux;
 
 let
   inherit (pythonPackages) python;
-  pythonpath = "${pythonPackages.dbus}/lib/${python.libPrefix}/site-packages:"
-    + "${pythonPackages.pygobject}/lib/${python.libPrefix}/site-packages";
+  pythonpath = "${pythonPackages.dbus-python}/lib/${python.libPrefix}/site-packages:"
+    + "${pythonPackages.pygobject2}/lib/${python.libPrefix}/site-packages";
 in stdenv.mkDerivation rec {
   name = "bluez-4.101";
    
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90e44c9819a..fcb3ec9ceec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10848,6 +10848,8 @@ with pkgs;
 
   bluez5 = callPackage ../os-specific/linux/bluez/bluez5.nix { };
 
+  bluez4 = callPackage ../os-specific/linux/bluez { };
+
   # Needed for LibreOffice
   bluez5_28 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5_28.nix { });
 

From 4abcef2ba19a73ea212f6812b395e8e3ac698fd5 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 2 Feb 2017 00:52:12 +0300
Subject: [PATCH 249/899] bluez service: use upstream units

---
 nixos/modules/services/hardware/bluetooth.nix | 51 ++++++-------------
 1 file changed, 15 insertions(+), 36 deletions(-)

diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix
index 2c271b32817..f6cf2d01d80 100644
--- a/nixos/modules/services/hardware/bluetooth.nix
+++ b/nixos/modules/services/hardware/bluetooth.nix
@@ -2,41 +2,9 @@
 
 with lib;
 let
-    bluez-bluetooth = if config.services.xserver.desktopManager.kde4.enable then pkgs.bluez else pkgs.bluez5;
+  isBluez4 = config.services.xserver.desktopManager.kde4.enable;
+  bluez-bluetooth = if isBluez4 then pkgs.bluez4 else pkgs.bluez;
 
-    configBluez = {
-        description = "Bluetooth Service";
-        serviceConfig = {
-          Type = "dbus";
-          BusName = "org.bluez";
-          ExecStart = "${getBin bluez-bluetooth}/bin/bluetoothd -n";
-        };
-        wantedBy = [ "bluetooth.target" ];
-    };
-
-    configBluez5 =  {
-        description = "Bluetooth Service";
-        serviceConfig = {
-          Type = "dbus";
-          BusName = "org.bluez";
-          ExecStart = "${getBin bluez-bluetooth}/bin/bluetoothd -n";
-          NotifyAccess="main";
-          CapabilityBoundingSet="CAP_NET_ADMIN CAP_NET_BIND_SERVICE";
-          LimitNPROC=1;
-        };
-        wantedBy = [ "bluetooth.target" ];
-    };
-
-    obexConfig = {
-        description = "Bluetooth OBEX service";
-        serviceConfig = {
-          Type = "dbus";
-          BusName = "org.bluez.obex";
-          ExecStart = "${getBin bluez-bluetooth}/bin/obexd";
-        };
-    };
-
-    bluezConfig = if config.services.xserver.desktopManager.kde4.enable then configBluez else configBluez5;
 in
 
 {
@@ -58,10 +26,21 @@ in
   config = mkIf config.hardware.bluetooth.enable {
 
     environment.systemPackages = [ bluez-bluetooth pkgs.openobex pkgs.obexftp ];
+
     services.udev.packages = [ bluez-bluetooth ];
+
     services.dbus.packages = [ bluez-bluetooth ];
-    systemd.services."dbus-org.bluez" = bluezConfig;
-    systemd.services."dbus-org.bluez.obex" = obexConfig;
+
+    systemd.packages = [ bluez-bluetooth ];
+
+    systemd.services.bluetooth = {
+      wantedBy = [ "bluetooth.target" ];
+      aliases = [ "dbus-org.bluez.service" ];
+    };
+
+    systemd.user.services.obex = mkIf (!isBluez4) {
+      aliases = [ "dbus-org.bluez.obex.service" ];
+    };
 
   };
 

From 4877a5664e356968ec3ca0c17d33a85992f4a348 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 1 Feb 2017 23:22:19 +0300
Subject: [PATCH 250/899] dbus: don't search for units in current-system

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

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 509e7dd00c8..7743c1e3f80 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -9,8 +9,9 @@ let
   version = "1.10.14";
   sha256 = "10x0wvv2ly4lyyfd42k4xw0ar5qdbi9cksw3l5fcwf1y6mq8y8r3";
 
-self =  stdenv.mkDerivation {
+self = stdenv.mkDerivation {
     name = "dbus-${version}";
+    inherit version;
 
     src = fetchurl {
       url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
@@ -49,8 +50,6 @@ self =  stdenv.mkDerivation {
       "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
       "--with-systemduserunitdir=$(out)/etc/systemd/user"
       "--enable-user-session"
-      # this package installs nothing into those dirs and they create a dependency
-      "--datadir=/run/current-system/sw/share"
       "--libexecdir=$(out)/libexec" # we don't need dbus-daemon-launch-helper
     ] ++ lib.optional (!x11Support) "--without-x";
 
@@ -64,7 +63,7 @@ self =  stdenv.mkDerivation {
 
     doCheck = true;
 
-    installFlags = "sysconfdir=$(out)/etc datadir=$(out)/share";
+    installFlags = [ "sysconfdir=$(out)/etc" ];
 
     # it's executed from $lib by absolute path
     postFixup = ''

From 1095d2cc076dcab627c97cb272fc2bcf5814aca3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 1 Feb 2017 22:59:01 +0100
Subject: [PATCH 251/899] jenkins: 2.33 -> 2.44 for multiple CVEs

Fixes:

  * CVE-2017-2598
  * CVE-2017-2599
  * CVE-2017-2600
  * CVE-2011-4969
  * CVE-2017-2601
  * CVE-2015-0886
  * CVE-2017-2602
  * CVE-2017-2603
  * CVE-2017-2604
  * CVE-2017-2605
  * CVE-2017-2606
  * CVE-2017-2607
  * CVE-2017-2608
  * CVE-2017-2609
  * CVE-2017-2610
  * CVE-2017-2611
  * CVE-2017-2612
  * CVE-2017-2613

See https://wiki.jenkins-ci.org/display/SECURITY/Jenkins+Security+Advisory+2017-02-01.
---
 .../tools/continuous-integration/jenkins/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 6a752d08cff..3196b6728e0 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "2.33";
+  version = "2.44";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "1x1m4d7r128v6i0gpa4z07db6vdw1x9ik0p4a8gsnj6g15fzkdzy";
+    sha256 = "01v9p0p27czwsk7ljv1879b5qcrhgy7zan6dj8klr9rci1id8x0d";
   };
 
   buildCommand = ''

From 5cbcd3af69d859a6d919ad26261c57649e9c888f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 14 Jan 2017 04:14:01 +0300
Subject: [PATCH 252/899] types library: add coercedTo

---
 lib/types.nix | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/lib/types.nix b/lib/types.nix
index 9366d394da7..0d1a88a00f2 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -352,6 +352,28 @@ rec {
       functor = (defaultFunctor name) // { wrapped = [ t1 t2 ]; };
     };
 
+    coercedTo = coercedType: coerceFunc: finalType:
+      assert coercedType.getSubModules == null;
+      mkOptionType rec {
+        name = "coercedTo";
+        description = "${finalType.description} or ${coercedType.description}";
+        check = x: finalType.check x || coercedType.check x;
+        merge = loc: defs:
+          let
+            coerceVal = val:
+              if finalType.check val then val
+              else let
+                coerced = coerceFunc val;
+              in assert finalType.check coerced; coerced;
+
+          in finalType.merge loc (map (def: def // { value = coerceVal def.value; }) defs);
+        getSubOptions = finalType.getSubOptions;
+        getSubModules = finalType.getSubModules;
+        substSubModules = m: coercedTo coercedType coerceFunc (finalType.substSubModules m);
+        typeMerge = t1: t2: null;
+        functor = (defaultFunctor name) // { wrapped = finalType; };
+      };
+
     # Obsolete alternative to configOf.  It takes its option
     # declarations from the ‘options’ attribute of containing option
     # declaration.

From fcb20b9feecb33c60d15a98766f7fd1bfbeae13e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 2 Feb 2017 01:52:40 +0300
Subject: [PATCH 253/899] module tests: add tests for coercedTo

---
 lib/tests/modules.sh                        |  5 +++++
 lib/tests/modules/declare-coerced-value.nix | 10 ++++++++++
 lib/tests/modules/define-value-list.nix     |  3 +++
 lib/tests/modules/define-value-string.nix   |  3 +++
 4 files changed, 21 insertions(+)
 create mode 100644 lib/tests/modules/declare-coerced-value.nix
 create mode 100644 lib/tests/modules/define-value-list.nix
 create mode 100644 lib/tests/modules/define-value-string.nix

diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index 65de8e378c7..e0774383720 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -115,6 +115,11 @@ set -- config.enable ./declare-enable.nix ./define-enable.nix ./define-loaOfSub-
 checkConfigError 'The option .* defined in .* does not exist.' "$@"
 checkConfigOutput "true" "$@" ./define-module-check.nix
 
+# Check coerced value.
+checkConfigOutput "\"42\"" config.value ./declare-coerced-value.nix
+checkConfigOutput "\"24\"" config.value ./declare-coerced-value.nix ./define-value-string.nix
+checkConfigError 'The option value .* in .* is not a coercedTo.' config.value ./declare-coerced-value.nix ./define-value-list.nix
+
 cat <<EOF
 ====== module tests ======
 $pass Pass
diff --git a/lib/tests/modules/declare-coerced-value.nix b/lib/tests/modules/declare-coerced-value.nix
new file mode 100644
index 00000000000..76b12ad53f0
--- /dev/null
+++ b/lib/tests/modules/declare-coerced-value.nix
@@ -0,0 +1,10 @@
+{ lib, ... }:
+
+{
+  options = {
+    value = lib.mkOption {
+      default = 42;
+      type = lib.types.coercedTo lib.types.int builtins.toString lib.types.str;
+    };
+  };
+}
diff --git a/lib/tests/modules/define-value-list.nix b/lib/tests/modules/define-value-list.nix
new file mode 100644
index 00000000000..4831c1cc09b
--- /dev/null
+++ b/lib/tests/modules/define-value-list.nix
@@ -0,0 +1,3 @@
+{
+  value = [];
+}
diff --git a/lib/tests/modules/define-value-string.nix b/lib/tests/modules/define-value-string.nix
new file mode 100644
index 00000000000..e7a166965a7
--- /dev/null
+++ b/lib/tests/modules/define-value-string.nix
@@ -0,0 +1,3 @@
+{
+  value = "24";
+}

From 0cb487ee044bbe5cfa1d6421df385b6bc2447bd2 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 14 Jan 2017 04:14:16 +0300
Subject: [PATCH 254/899] network-interfaces service: add
 defaultGateway{,6}.interface

---
 .../tasks/network-interfaces-scripted.nix     | 16 ++++---
 .../tasks/network-interfaces-systemd.nix      |  6 +++
 nixos/modules/tasks/network-interfaces.nix    | 42 ++++++++++++++++---
 3 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index c50ea5c7964..aa86fc85feb 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -102,17 +102,21 @@ in
                 EOF
 
                 # Set the default gateway.
-                ${optionalString (cfg.defaultGateway != null && cfg.defaultGateway != "") ''
+                ${optionalString (cfg.defaultGateway != null && cfg.defaultGateway.address != "") ''
                   # FIXME: get rid of "|| true" (necessary to make it idempotent).
-                  ip route add default via "${cfg.defaultGateway}" ${
+                  ip route add default via "${cfg.defaultGateway.address}" ${
                     optionalString (cfg.defaultGatewayWindowSize != null)
-                      "window ${toString cfg.defaultGatewayWindowSize}"} || true
+                      "window ${toString cfg.defaultGatewayWindowSize}"} ${
+                    optionalString (cfg.defaultGateway.interface != null)
+                      "dev ${cfg.defaultGateway.interface}"}|| true
                 ''}
-                ${optionalString (cfg.defaultGateway6 != null && cfg.defaultGateway6 != "") ''
+                ${optionalString (cfg.defaultGateway6 != null && cfg.defaultGateway6.address != "") ''
                   # FIXME: get rid of "|| true" (necessary to make it idempotent).
-                  ip -6 route add ::/0 via "${cfg.defaultGateway6}" ${
+                  ip -6 route add ::/0 via "${cfg.defaultGateway6.address}" ${
                     optionalString (cfg.defaultGatewayWindowSize != null)
-                      "window ${toString cfg.defaultGatewayWindowSize}"} || true
+                      "window ${toString cfg.defaultGatewayWindowSize}"} ${
+                    optionalString (cfg.defaultGateway6.interface != null)
+                      "dev ${cfg.defaultGateway6.interface}"} || true
                 ''}
               '';
           };
diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix
index 974041d7e1a..a1212c90556 100644
--- a/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -38,6 +38,12 @@ in
     } {
       assertion = cfg.vswitches == {};
       message = "networking.vswichtes are not supported by networkd.";
+    } {
+      assertion = cfg.defaultGateway == null || cfg.defaultGateway.interface == null;
+      message = "networking.defaultGateway.interface is not supported by networkd.";
+    } {
+      assertion = cfg.defaultGateway6 == null || cfg.defaultGateway6.interface == null;
+      message = "networking.defaultGateway6.interface is not supported by networkd.";
     } ] ++ flip mapAttrsToList cfg.bridges (n: { rstp, ... }: {
       assertion = !rstp;
       message = "networking.bridges.${n}.rstp is not supported by networkd.";
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 83d9854d351..3f56419d2a6 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -116,6 +116,28 @@ let
       };
     };
 
+  gatewayCoerce = address: { inherit address; };
+
+  gatewayOpts = { ... }: {
+
+    options = {
+
+      address = mkOption {
+        type = types.str;
+        description = "The default gateway address.";
+      };
+
+      interface = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = "enp0s3";
+        description = "The default gateway interface.";
+      };
+
+    };
+
+  };
+
   interfaceOpts = { name, ... }: {
 
     options = {
@@ -327,19 +349,27 @@ in
 
     networking.defaultGateway = mkOption {
       default = null;
-      example = "131.211.84.1";
-      type = types.nullOr types.str;
+      example = {
+        address = "131.211.84.1";
+        device = "enp3s0";
+      };
+      type = types.nullOr (types.coercedTo types.str gatewayCoerce (types.submodule gatewayOpts));
       description = ''
-        The default gateway.  It can be left empty if it is auto-detected through DHCP.
+        The default gateway. It can be left empty if it is auto-detected through DHCP.
+        It can be specified as a string or an option set along with a network interface.
       '';
     };
 
     networking.defaultGateway6 = mkOption {
       default = null;
-      example = "2001:4d0:1e04:895::1";
-      type = types.nullOr types.str;
+      example = {
+        address = "2001:4d0:1e04:895::1";
+        device = "enp3s0";
+      };
+      type = types.nullOr (types.coercedTo types.str gatewayCoerce (types.submodule gatewayOpts));
       description = ''
-        The default ipv6 gateway.  It can be left empty if it is auto-detected through DHCP.
+        The default ipv6 gateway. It can be left empty if it is auto-detected through DHCP.
+        It can be specified as a string or an option set along with a network interface.
       '';
     };
 

From 4feb0a998adc60c1ff8a3e31b7a79455fe27f6d5 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 14 Jan 2017 13:49:03 +0300
Subject: [PATCH 255/899] manual: mention needed options for IPv6

---
 .../doc/manual/configuration/ipv6-config.xml  | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/nixos/doc/manual/configuration/ipv6-config.xml b/nixos/doc/manual/configuration/ipv6-config.xml
index bf86926f9bf..6d9e0a164e9 100644
--- a/nixos/doc/manual/configuration/ipv6-config.xml
+++ b/nixos/doc/manual/configuration/ipv6-config.xml
@@ -22,5 +22,25 @@ boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true;
 </programlisting>
 </para>
 
+<para>As with IPv4 networking interfaces are automatically configured via
+DHCPv6. You can configure an interface manually:
+
+<programlisting>
+networking.interfaces.eth0.ip6 = [ { address = "fe00:aa:bb:cc::2"; prefixLength = 64; } ];
+</programlisting>
+</para>
+
+<para>For configuring a gateway, optionally with explicitly specified interface:
+
+<programlisting>
+networking.defaultGateway6 = {
+  address = "fe00::1";
+  interface = "enp0s3";
+}
+</programlisting>
+</para>
+
+<para>See <xref linkend='sec-ipv4' /> for similar examples and additional information.
+</para>
 
 </section>

From 0b19f2f7429db35a2e089978313dc8e2899d10f1 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 00:25:51 +0100
Subject: [PATCH 256/899] libressl_2_4: 2.4.4 -> 2.4.5

security update, no CVE assigned AFAICS

/cc @grahamc
---
 pkgs/development/libraries/libressl/2.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libressl/2.4.nix b/pkgs/development/libraries/libressl/2.4.nix
index a0d8511e2b8..c5642635b0f 100644
--- a/pkgs/development/libraries/libressl/2.4.nix
+++ b/pkgs/development/libraries/libressl/2.4.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libressl-${version}";
-  version = "2.4.4";
+  version = "2.4.5";
 
   src = fetchurl {
     url    = "mirror://openbsd/LibreSSL/${name}.tar.gz";
-    sha256 = "1ldzxqc0bds9mwnirrckhx42y3k0v5cx997nnbfa2gkk6ilszkvg";
+    sha256 = "0is3zqjcxxncycq44m3if6s5hiq31kpq85pxdnpm3sdfb3iw806k";
   };
 
   enableParallelBuilding = true;

From 2110d59fa1dffbe006ad96422e862bbc55c5caff Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 00:26:47 +0100
Subject: [PATCH 257/899] libressl_2_5: 2.5.0 -> 2.5.1

security update, no CVE assigned AFAICS

/cc @grahamc
---
 pkgs/development/libraries/libressl/2.5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libressl/2.5.nix b/pkgs/development/libraries/libressl/2.5.nix
index 51925ee108e..0a3e0d97f84 100644
--- a/pkgs/development/libraries/libressl/2.5.nix
+++ b/pkgs/development/libraries/libressl/2.5.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libressl-${version}";
-  version = "2.5.0";
+  version = "2.5.1";
 
   src = fetchurl {
     url    = "mirror://openbsd/LibreSSL/${name}.tar.gz";
-    sha256 = "1bkfvapi4z826slycmicvs7hwgk4l82gd8w6nqvznldbammvyll6";
+    sha256 = "1kc709scgd76vk7fld4jnb4wb5lxdv1cj8zsgyjb33xp4jlf06pp";
   };
 
   enableParallelBuilding = true;

From 8a0d1bcf8bcc5b09a857769bfb3f1e45e9f73249 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 01:12:55 +0100
Subject: [PATCH 258/899] systemd: add patches to fix i686 booting

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

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 97ba7315ead..3248b93a522 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "systemd";
-    rev = "42a48d16c0ec48330286f8332a4628e1d71c759b";
-    sha256 = "18bcxbba1wk44xhlsna18x3c4b07sq6670wnsy2xy1x2kzfnmhdl";
+    rev = "9a35924a4f15dab2a84b3104b1cd125a3c36f77d";
+    sha256 = "1z3rishvjlr5d4qgd262r13z04vzvlrlgwm7kpsf4hk7w0gmz4i5";
   };
 
   outputs = [ "out" "lib" "man" "dev" ];

From b4f36746941a1bcc51e6e3abef2fd0165227b9be Mon Sep 17 00:00:00 2001
From: Antoine Racine <racine.antoine@gmail.com>
Date: Wed, 1 Feb 2017 20:05:22 -0500
Subject: [PATCH 259/899] Add vim-elixir to vim plugins

---
 pkgs/misc/vim-plugins/default.nix      | 10 ++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 11 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 560aa3ff079..46f6d1f8b37 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -2049,6 +2049,16 @@ rec {
 
   };
 
+  vim-elixir = buildVimPluginFrom2Nix {
+      name = "vim-elixir-2017-02-01";
+      src = fetchgit {
+        url = "https://github.com/elixir-lang/vim-elixir";
+        rev = "9cbb3ee3865c594ed017f8118a80b355cd7e238f";
+        sha256 = "14mlnjpmgfal4vai2k8jjmhszwgyhnf3v75rssj05n47qnzlddk4";
+      };
+      dependencies = [];
+    };
+
   vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-gista-2016-09-21";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index cd22f63d562..d6418e5da4e 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -40,6 +40,7 @@
 "github:dracula/vim"
 "github:eagletmt/neco-ghc"
 "github:eikenb/acp"
+"github:elixir-lang/vim-elixir"
 "github:elmcast/elm-vim"
 "github:embear/vim-localvimrc"
 "github:enomsg/vim-haskellConcealPlus"

From 58a5d0783e0d640ca9fb510ce5d53140ba00299e Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Thu, 2 Feb 2017 09:13:54 +0800
Subject: [PATCH 260/899] speedcrunch: 0.11 -> 0.12.0

Also:
  - build against qt5 instead of qt4
---
 .../science/math/speedcrunch/default.nix      | 20 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  6 +-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix
index 56ae454831b..334423660a0 100644
--- a/pkgs/applications/science/math/speedcrunch/default.nix
+++ b/pkgs/applications/science/math/speedcrunch/default.nix
@@ -1,19 +1,23 @@
-{ stdenv, fetchurl, qt, cmake }:
+{ stdenv, fetchgit, cmake, qtbase, qttools }:
 
 stdenv.mkDerivation rec {
   name = "speedcrunch-${version}";
-  version = "0.11";
+  version = "0.12.0";
 
-  src = fetchurl {
-    url = "https://bitbucket.org/heldercorreia/speedcrunch/get/${version}.tar.gz";
-    sha256 = "0phba14z9jmbmax99klbxnffwzv3awlzyhpcwr1c9lmyqnbcsnkd";
+  src = fetchgit {
+    # the tagging is not standard, so you probably need to check this when updating
+    rev = "refs/tags/release-${version}";
+    url = "https://bitbucket.org/heldercorreia/speedcrunch";
+    sha256 = "0vh7cd1915bjqzkdp3sk25ngy8cq624mkh8c53c5bnzk357kb0fk";
   };
 
-  buildInputs = [cmake qt];
+  buildInputs = [ qtbase qttools ];
 
-  dontUseCmakeBuildDir = true;
+  nativeBuildInputs = [ cmake ];
 
-  cmakeDir = "src";
+  preConfigure = ''
+    cd src
+  '';
 
   meta = with stdenv.lib; {
     homepage    = http://speedcrunch.org;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28668e0fc1c..4fe4d1b07fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17254,11 +17254,7 @@ with pkgs;
 
   yacas = callPackage ../applications/science/math/yacas { };
 
-  speedcrunch = callPackage ../applications/science/math/speedcrunch {
-    qt = qt4;
-    cmake = cmakeCurses;
-  };
-
+  speedcrunch = qt5.callPackage ../applications/science/math/speedcrunch { };
 
   ### SCIENCE / MISC
 

From d34ee526a814a6231ec2d400d86fea6d26d450bd Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 2 Feb 2017 02:18:26 +0100
Subject: [PATCH 261/899] aws-sdk-cpp: fix on darwin

The LD_LIBRARY_PATH variable does nothing on Darwin, but
DYLD_LIBRARY_PATH does the same thing, so splice in the right variable
based on which system we're working on.
---
 pkgs/development/libraries/aws-sdk-cpp/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 54d490b77af..6a18ff3ed24 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -5,7 +5,14 @@
   customMemoryManagement ? true
 }:
 
-stdenv.mkDerivation rec {
+let
+  loaderVar =
+    if stdenv.isLinux
+      then "LD_LIBRARY_PATH"
+      else if stdenv.isDarwin
+        then "DYLD_LIBRARY_PATH"
+        else throw "Unsupported system!";
+in stdenv.mkDerivation rec {
   name = "aws-sdk-cpp-${version}";
   version = "1.0.48";
 
@@ -29,11 +36,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  # Behold the escaping nightmare below on loaderVar o.O
   preBuild =
     ''
       # Ensure that the unit tests can find the *.so files.
       for i in testing-resources aws-cpp-sdk-*; do
-        export LD_LIBRARY_PATH=$(pwd)/$i:$LD_LIBRARY_PATH
+        export ${loaderVar}=$(pwd)/$i:''${${loaderVar}}
       done
     '';
 

From fd0814761321d7097ff7af3f802cf1498b5a5efb Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Thu, 2 Feb 2017 09:26:17 +0800
Subject: [PATCH 262/899] okteta: init at 16.12.1 (kf5 version)

---
 pkgs/desktops/kde-5/applications/default.nix |  1 +
 pkgs/desktops/kde-5/applications/okteta.nix  | 26 ++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/desktops/kde-5/applications/okteta.nix

diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix
index db255a1d5b7..739fc166c5a 100644
--- a/pkgs/desktops/kde-5/applications/default.nix
+++ b/pkgs/desktops/kde-5/applications/default.nix
@@ -64,6 +64,7 @@ let
     libkipi = callPackage ./libkipi.nix {};
     libkomparediff2 = callPackage ./libkomparediff2.nix {};
     marble = callPackage ./marble.nix {};
+    okteta = callPackage ./okteta.nix {};
     okular = callPackage ./okular.nix {};
     print-manager = callPackage ./print-manager.nix {};
     spectacle = callPackage ./spectacle.nix {};
diff --git a/pkgs/desktops/kde-5/applications/okteta.nix b/pkgs/desktops/kde-5/applications/okteta.nix
new file mode 100644
index 00000000000..6683b9876fc
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications/okteta.nix
@@ -0,0 +1,26 @@
+{
+  kdeApp, lib, kdeWrapper,
+  ecm, kdoctools,
+  kconfig, kinit,
+  kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5
+}:
+
+let
+  unwrapped =
+    kdeApp {
+      name = "okteta";
+      meta = {
+        license = with lib.licenses; [ gpl2 ];
+        maintainers = with lib.maintainers; [ peterhoeg ];
+      };
+      nativeBuildInputs = [ ecm kdoctools ];
+      propagatedBuildInputs = [
+        kconfig kinit
+        kcmutils kconfigwidgets knewstuff kparts qca-qt5
+      ];
+    };
+
+in kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/okteta" ];
+}

From 47f392d3c7a55e357f9da706211a0777ba53d2b5 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pasci.bach@gmail.com>
Date: Thu, 2 Feb 2017 02:52:26 +0100
Subject: [PATCH 263/899] mbedtls: 1.3.17 -> 1.3.18

See https://tls.mbed.org/tech-updates/releases/mbedtls-2.4.0-2.1.6-and-1.3.18-released.
---
 pkgs/development/libraries/mbedtls/1.3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mbedtls/1.3.nix b/pkgs/development/libraries/mbedtls/1.3.nix
index 9bb7a5fa003..41c0e0a9d16 100644
--- a/pkgs/development/libraries/mbedtls/1.3.nix
+++ b/pkgs/development/libraries/mbedtls/1.3.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mbedtls-1.3.17";
+  name = "mbedtls-1.3.18";
 
   src = fetchurl {
     url = "https://tls.mbed.org/download/${name}-gpl.tgz";
-    sha256 = "10nviv3d8w6sp3kn3yzdpssvzqxdbr4kg38g7rg930q2hlzb9gpm";
+    sha256 = "188fjm0zzggxrjxnqc7zv7zz8pvys6yp1jx3xdyq8970h9qj2ad2";
   };
 
   nativeBuildInputs = [ perl ];

From 3d16d69b4093b523e8d0583d44140d6ba77696e5 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Thu, 2 Feb 2017 09:55:47 +0800
Subject: [PATCH 264/899] qgit: 2.5 -> 2.6 (#22360)

Also:

 - build the qt5 version by default instead of qt4
 - use cmake
---
 .../git-and-tools/default.nix                 |  2 +-
 .../git-and-tools/qgit/default.nix            | 27 ++++++++-----------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index e8c7c3bfbfd..975c83c6e97 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -80,7 +80,7 @@ rec {
     inherit (darwin) Security;
   };
 
-  qgit = callPackage ./qgit { };
+  qgit = qt5.callPackage ./qgit { };
 
   stgit = callPackage ./stgit {
   };
diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix
index b8d001ee97c..5e3532b5643 100644
--- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix
@@ -1,27 +1,22 @@
-{ stdenv, fetchurl, qt4, qmake4Hook, libXext, libX11 }:
+{ stdenv, fetchurl, cmake, qtbase }:
 
 stdenv.mkDerivation rec {
-  name = "qgit-2.5";
+  name = "qgit-2.6";
 
   src = fetchurl {
-    url = "http://libre.tibirna.org/attachments/download/9/${name}.tar.gz";
-    sha256 = "25f1ca2860d840d87b9919d34fc3a1b05d4163671ed87d29c3e4a8a09e0b2499";
+    url = "http://libre.tibirna.org/attachments/download/12/${name}.tar.gz";
+    sha256 = "1brrhac6s6jrw3djhgailg5d5s0vgrfvr0sczqgzpp3i6pxf8qzl";
   };
 
-  hardeningDisable = [ "format" ];
+  buildInputs = [ qtbase ];
 
-  buildInputs = [ qt4 libXext libX11 ];
+  nativeBuildInputs = [ cmake ];
 
-  nativeBuildInputs = [ qmake4Hook ];
-
-  installPhase = ''
-    install -s -D -m 755 bin/qgit "$out/bin/qgit"
-  '';
-
-  meta = {
-    license = stdenv.lib.licenses.gpl2;
-    homepage = "http://libre.tibirna.org/projects/qgit/wiki/QGit";
+  meta = with stdenv.lib; {
+    license = licenses.gpl2;
+    homepage = http://libre.tibirna.org/projects/qgit/wiki/QGit;
     description = "Graphical front-end to Git";
-    inherit (qt4.meta) platforms;
+    maintainer = with maintainers; [ peterhoeg ];
+    inherit (qtbase.meta) platforms;
   };
 }

From 15bc80f3b9c7f3626735755927748bf6ba6c1ce5 Mon Sep 17 00:00:00 2001
From: Drakonis <khronosforce@gmail.com>
Date: Wed, 1 Feb 2017 21:21:34 -0500
Subject: [PATCH 265/899] keepassx-community: init at 2.1.0

 - deprecating keepassx-reboot (was at 2.0.3)
---
 .../misc/keepassx/{reboot.nix => community.nix}      | 12 ++++++------
 pkgs/top-level/aliases.nix                           |  1 +
 pkgs/top-level/all-packages.nix                      |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)
 rename pkgs/applications/misc/keepassx/{reboot.nix => community.nix} (72%)

diff --git a/pkgs/applications/misc/keepassx/reboot.nix b/pkgs/applications/misc/keepassx/community.nix
similarity index 72%
rename from pkgs/applications/misc/keepassx/reboot.nix
rename to pkgs/applications/misc/keepassx/community.nix
index f6ed251601a..075de4dcb65 100644
--- a/pkgs/applications/misc/keepassx/reboot.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -1,21 +1,21 @@
 { stdenv, fetchFromGitHub, cmake, libgcrypt, qt5, zlib, libmicrohttpd, libXtst }:
 
 stdenv.mkDerivation rec {
-  name = "keepassx-reboot-${version}";
-  version = "2.0.3";
+  name = "keepassx-community-${version}";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "keepassxreboot";
-    repo = "keepassx";
-    rev = "${version}-http";
-    sha256 = "0pj3mirhw87hk9nlls9hgfx08xrr8ln7d1fqi3fcm519qjr72lmv";
+    repo = "keepassxc";
+    rev = "${version}";
+    sha256 = "0qwmi9f8ik3vkwl1kx7g3079h5ia4wl87y42nr5dal3ic1jc941p";
   };
 
   buildInputs = [ cmake libgcrypt zlib qt5.full libXtst libmicrohttpd ];
 
   meta = {
     description = "Fork of the keepassX password-manager with additional http-interface to allow browser-integration an use with plugins such as PasslFox (https://github.com/pfn/passifox). See also keepassX2.";
-    homepage = https://github.com/keepassxreboot/keepassx;
+    homepage = https://github.com/keepassxreboot/keepassxc;
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ s1lvester jonafato ];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6123c418123..57242e2a742 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -59,6 +59,7 @@ doNotDisplayTwice rec {
   joseki = apache-jena-fuseki; # added 2016-02-28
   jquery_ui = jquery-ui;  # added 2014-09-07
   keepassx2-http = keepassx-reboot; # added 2016-10-17
+  keepassx-reboot = keepassx-community; # added 2017-02-01
   keybase-go = keybase;  # added 2016-08-24
   letsencrypt = certbot; # added 2016-05-16
   libdbusmenu_qt5 = qt5.libdbusmenu;  # added 2015-12-19
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 734644ae998..38d7e317124 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13142,7 +13142,7 @@ with pkgs;
 
   keepassx = callPackage ../applications/misc/keepassx { };
   keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { };
-  keepassx-reboot = callPackage ../applications/misc/keepassx/reboot.nix { };
+  keepassx-community = callPackage ../applications/misc/keepassx/community.nix { };
 
   inherit (gnome3) evince;
   evolution_data_server = gnome3.evolution_data_server;

From 9fa9339a1386e816baee62ca26435d86146c9f90 Mon Sep 17 00:00:00 2001
From: Antoine Racine <racine.antoine@gmail.com>
Date: Wed, 1 Feb 2017 23:13:28 -0500
Subject: [PATCH 266/899] vimPlugins.alchemist-vim: init at rev c22d4883b7

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 46f6d1f8b37..1b6369d87d9 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -281,6 +281,17 @@ rec {
     sourceRoot = ".";
   };
 
+  alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "alchemist.vim-2017-01-02";
+    src = fetchgit {
+      url = "git://github.com/slashmili/alchemist.vim";
+      rev = "c22d4883b7e2bfed78b70b557d816bf0491d7dd4";
+      sha256 = "0iv91mfj3lxc41xb8sxhl9mby5dllzyvw8508igrj5lvyrd1ikkf";
+    };
+    dependencies = [];
+
+  };
+
   commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "commentary-2016-03-10";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index d6418e5da4e..4be4c0a9722 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -97,6 +97,7 @@
 "github:shougo/vimproc.vim"
 "github:shougo/vimshell.vim"
 "github:sjl/gundo.vim"
+"github:slashmili/alchemist.vim"
 "github:takac/vim-hardtime"
 "github:terryma/vim-expand-region"
 "github:tex/vimpreviewpandoc"

From 8d803b90ac81576795538b0242e68deae7145732 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Thu, 2 Feb 2017 13:01:40 +0800
Subject: [PATCH 267/899] kdiff3-qt5: init at 1.7.0

Upstream hasn't made a formal release yet of the qt5 version which is why I'm
not replacing the existing kde4 version.
---
 pkgs/tools/text/kdiff3/kde5.nix | 37 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/tools/text/kdiff3/kde5.nix

diff --git a/pkgs/tools/text/kdiff3/kde5.nix b/pkgs/tools/text/kdiff3/kde5.nix
new file mode 100644
index 00000000000..f1ae958ed63
--- /dev/null
+++ b/pkgs/tools/text/kdiff3/kde5.nix
@@ -0,0 +1,37 @@
+{
+  kdeDerivation, kdeWrapper, lib, fetchgit,
+  ecm, kdoctools, kconfig, kinit, kparts
+}:
+
+let
+  rev = "468652ce70b1214842cef0a021c81d056ec6aa01";
+
+  unwrapped = kdeDerivation rec {
+    name = "kdiff3-${version}";
+    version = "1.7.0-${lib.strings.substring 0 7 rev}";
+
+    src = fetchgit {
+      url = "https://gitlab.com/tfischer/kdiff3";
+      sha256 = "126xl7jbb26v2970ba1rw1d6clhd14p1f2avcwvj8wzqmniq5y5m";
+      inherit rev;
+    };
+
+    preConfigure = "cd kdiff3";
+
+    nativeBuildInputs = [ ecm kdoctools ];
+
+    propagatedBuildInputs = [ kconfig kinit kparts ];
+
+    meta = with lib; {
+      homepage = http://kdiff3.sourceforge.net/;
+      license = licenses.gpl2Plus;
+      description = "Compares and merges 2 or 3 files or directories";
+      maintainers = with maintainers; [ viric urkud peterhoeg ];
+      platforms = with platforms; linux;
+    };
+  };
+
+in kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/kdiff3" ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28668e0fc1c..16b7b8e2281 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2417,6 +2417,8 @@ with pkgs;
 
   kronometer = qt5.callPackage ../tools/misc/kronometer { };
 
+  kdiff3-qt5 = qt5.callPackage ../tools/text/kdiff3/kde5.nix { };
+
   peruse = qt5.callPackage ../tools/misc/peruse { };
 
   kst = qt5.callPackage ../tools/graphics/kst { gsl = gsl_1; };

From f7871d3433d0a614886394a7edf6b94332f6b300 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Thu, 2 Feb 2017 13:41:23 +0800
Subject: [PATCH 268/899] suil: 0.8.2 -> 0.8.4

We can now also build against qt5 but not qt4 and qt5 at the same time.
---
 .../libraries/audio/suil/default.nix          | 23 +++++++++++++------
 pkgs/top-level/all-packages.nix               | 12 +++++++++-
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix
index 518f89092ab..8864d710174 100644
--- a/pkgs/development/libraries/audio/suil/default.nix
+++ b/pkgs/development/libraries/audio/suil/default.nix
@@ -1,15 +1,24 @@
-{ stdenv, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom, qt4 }:
+{ stdenv, lib, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom
+, withQt4 ? true, qt4 ? null
+, withQt5 ? false, qt5 ? null }:
+
+# I haven't found an XOR operator in nix...
+assert withQt4 || withQt5;
+assert !(withQt4 && withQt5);
 
 stdenv.mkDerivation rec {
-  name = "suil-${version}";
-  version = "0.8.2";
+  pname = "suil";
+  version = "0.8.4";
+  name = "${pname}-qt${if withQt4 then "4" else "5"}-${version}";
 
   src = fetchurl {
-    url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "1s3adyiw7sa5gfvm5wasa61qa23629kprxyv6w8hbxdiwp0hhxkq";
+    url = "http://download.drobilla.net/${pname}-${version}.tar.bz2";
+    sha256 = "1kji3lhha26qr6xm9j8ic5c40zbrrb5qnwm2qxzmsfxgmrz29wkf";
   };
 
-  buildInputs = [ gtk2 lv2 pkgconfig python qt4 serd sord sratom ];
+  buildInputs = [ gtk2 lv2 pkgconfig python serd sord sratom ]
+    ++ (lib.optionals withQt4 [ qt4 ])
+    ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ]));
 
   configurePhase = "python waf configure --prefix=$out";
 
@@ -21,7 +30,7 @@ stdenv.mkDerivation rec {
     homepage = http://drobilla.net/software/suil;
     description = "A lightweight C library for loading and wrapping LV2 plugin UIs";
     license = licenses.mit;
-    maintainers = [ maintainers.goibhniu ];
+    maintainers = with maintainers; [ goibhniu ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28668e0fc1c..c88e1d157fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9550,7 +9550,17 @@ with pkgs;
 
   subtitleeditor = callPackage ../applications/video/subtitleeditor { };
 
-  suil = callPackage ../development/libraries/audio/suil { };
+  suil-qt4 = callPackage ../development/libraries/audio/suil {
+    withQt4 = true;
+    withQt5 = false;
+  };
+
+  suil-qt5 = callPackage ../development/libraries/audio/suil {
+    withQt4 = false;
+    withQt5 = true;
+  };
+
+  suil = suil-qt4;
 
   sutils = callPackage ../tools/misc/sutils { };
 

From 7ea20c9e2752d5164e5a37f44a5dae9955d5d03f Mon Sep 17 00:00:00 2001
From: Rongcui Dong <rongcuid@outlook.com>
Date: Wed, 1 Feb 2017 14:13:35 -0800
Subject: [PATCH 269/899] ngspice: 25 -> 26

---
 pkgs/applications/science/electronics/ngspice/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix
index f4870d7bfbb..7a493e14bca 100644
--- a/pkgs/applications/science/electronics/ngspice/default.nix
+++ b/pkgs/applications/science/electronics/ngspice/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, readline, bison, libX11, libICE, libXaw, libXext}:
 
 stdenv.mkDerivation {
-  name = "ngspice-25";
+  name = "ngspice-26";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ngspice/ngspice-25.tar.gz";
-    sha256 = "03hlxwvl2j1wlb5yg4swvmph9gja37c2gqvwvzv6z16vg2wvn06h";
+    url = "mirror://sourceforge/ngspice/ngspice-26.tar.gz";
+    sha256 = "51e230c8b720802d93747bc580c0a29d1fb530f3dd06f213b6a700ca9a4d0108";
   };
 
   buildInputs = [ readline libX11 bison libICE libXaw libXext ];
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     description = "The Next Generation Spice (Electronic Circuit Simulator)";
     homepage = "http://ngspice.sourceforge.net";
     license = with licenses; [ "BSD" gpl2 ];
-    maintainers = with maintainers; [ viric ];
+    maintainers = with maintainers; [ viric rongcuid ];
     platforms = platforms.linux;
   };
 }

From c64934529e5cd1cc3c50f0a417ce19be9d0bd201 Mon Sep 17 00:00:00 2001
From: Mica Semrick <mica@silentumbrella.com>
Date: Wed, 1 Feb 2017 22:50:35 -0800
Subject: [PATCH 270/899] darktable 2.2.1 -> 2.2.3

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

diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 7213ddcc366..1a80c1466d4 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -11,12 +11,12 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  version = "2.2.1";
+  version = "2.2.3";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    sha256 = "da843190f08e02df19ccbc02b9d1bef6bd242b81499494c7da2cccdc520e24fc";
+    sha256 = "1b33859585bf283577680c61e3c0ea4e48214371453b9c17a86664d2fbda48a0";
   };
 
   buildInputs =

From 8389060731e758708093722bf3e5099e51b0932b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle?= <viric@viric.name>
Date: Thu, 2 Feb 2017 09:50:53 +0100
Subject: [PATCH 271/899] Updating shotcut to 17.02.

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

diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index 03d597cac58..140c8e5863d 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -5,11 +5,11 @@ qmakeHook, makeQtWrapper }:
 
 stdenv.mkDerivation rec {
   name = "shotcut-${version}";
-  version = "17.01";
+  version = "17.02";
 
   src = fetchurl {
     url = "https://github.com/mltframework/shotcut/archive/v${version}.tar.gz";
-    sha256 = "1f3276q58rvw1brxfnm9z3v99fx63wml6j02sgmpzazw3172lnpg";
+    sha256 = "09nygz1x9fvqf33gqpc6jnr1j7ny0yny3w2ngwqqfkf3f8n83qhr";
   };
 
   buildInputs = [ SDL frei0r gettext mlt pkgconfig qtbase qtmultimedia qtwebkit

From dfcc9e2994eba3544ddfe303be5128ff17195ca6 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Wed, 25 Jan 2017 00:00:54 +0100
Subject: [PATCH 272/899] ghc: support building with integer-simple and provide
 package sets for it

If the flag enableIntegerSimple is true GHC will be build with the GPL-free but
slower integer-simple library instead of the faster but GPLed integer-gmp
library.

The attribute `pkgs.haskell.compiler.integer-simple."${ghcVersion}"` provides a
GHC compiler build with `integer-simple`.

Similarly, the attribute `pkgs.haskell.packages.integer-simple."${ghcVersion}"`
provides a package set supporting `integer-simple`.

Closes https://github.com/NixOS/nixpkgs/pull/22121.
Closes https://github.com/NixOS/nixpkgs/issues/5493.
---
 doc/languages-frameworks/haskell.md       | 58 +++++++++++++++++++++++
 pkgs/development/compilers/ghc/7.10.2.nix | 18 +++++--
 pkgs/development/compilers/ghc/7.10.3.nix | 11 ++++-
 pkgs/development/compilers/ghc/7.2.2.nix  | 19 ++++++--
 pkgs/development/compilers/ghc/7.4.2.nix  | 19 ++++++--
 pkgs/development/compilers/ghc/7.6.3.nix  | 19 ++++++--
 pkgs/development/compilers/ghc/7.8.3.nix  | 19 ++++++--
 pkgs/development/compilers/ghc/7.8.4.nix  | 19 ++++++--
 pkgs/development/compilers/ghc/8.0.1.nix  | 11 ++++-
 pkgs/development/compilers/ghc/8.0.2.nix  | 11 ++++-
 pkgs/development/compilers/ghc/head.nix   | 11 ++++-
 pkgs/top-level/haskell-packages.nix       | 42 +++++++++++++++-
 12 files changed, 218 insertions(+), 39 deletions(-)

diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md
index 6728f4abba0..34b53ded379 100644
--- a/doc/languages-frameworks/haskell.md
+++ b/doc/languages-frameworks/haskell.md
@@ -793,6 +793,64 @@ It's important to realize, however, that most system libraries in Nix are built
 as shared libraries only, i.e. there is just no static library available that
 Cabal could link!
 
+### Building GHC with integer-simple
+
+By default GHC implements the Integer type using the
+[GNU Multiple Precision Arithmetic (GMP) library](https://gmplib.org/).
+The implementation can be found in the
+[integer-gmp](http://hackage.haskell.org/package/integer-gmp) package.
+
+A potential problem with this is that GMP is licensed under the
+[​GNU Lesser General Public License (LGPL)](http://www.gnu.org/copyleft/lesser.html),
+a kind of "copyleft" license. According to the terms of the LGPL, paragraph 5,
+you may distribute a program that is designed to be compiled and dynamically
+linked with the library under the terms of your choice (i.e., commercially) but
+if your program incorporates portions of the library, if it is linked
+statically, then your program is a "derivative"--a "work based on the
+library"--and according to paragraph 2, section c, you "must cause the whole of
+the work to be licensed" under the terms of the LGPL (including for free).
+
+The LGPL licensing for GMP is a problem for the overall licensing of binary
+programs compiled with GHC because most distributions (and builds) of GHC use
+static libraries. (Dynamic libraries are currently distributed only for OS X.)
+The LGPL licensing situation may be worse: even though
+​[The Glasgow Haskell Compiler License](https://www.haskell.org/ghc/license)
+is essentially a "free software" license (BSD3), according to
+paragraph 2 of the LGPL, GHC must be distributed under the terms of the LGPL!
+
+To work around these problems GHC can be build with a slower but LGPL-free
+alternative implemention for Integer called
+[integer-simple](http://hackage.haskell.org/package/integer-simple).
+
+To get a GHC compiler build with `integer-simple` instead of `integer-gmp` use
+the attribute: `pkgs.haskell.compiler.integer-simple."${ghcVersion}"`.
+For example:
+
+    $ nix-build -E '(import <nixpkgs> {}).pkgs.haskell.compiler.integer-simple.ghc802'
+    ...
+    $ result/bin/ghc-pkg list | grep integer
+        integer-simple-0.1.1.1
+
+The following command displays the complete list of GHC compilers build with `integer-simple`:
+
+    $ nix-env -f "<nixpkgs>" -qaP -A haskell.compiler.integer-simple
+    haskell.compiler.integer-simple.ghc7102  ghc-7.10.2
+    haskell.compiler.integer-simple.ghc7103  ghc-7.10.3
+    haskell.compiler.integer-simple.ghc722   ghc-7.2.2
+    haskell.compiler.integer-simple.ghc742   ghc-7.4.2
+    haskell.compiler.integer-simple.ghc763   ghc-7.6.3
+    haskell.compiler.integer-simple.ghc783   ghc-7.8.3
+    haskell.compiler.integer-simple.ghc784   ghc-7.8.4
+    haskell.compiler.integer-simple.ghc801   ghc-8.0.1
+    haskell.compiler.integer-simple.ghc802   ghc-8.0.2
+    haskell.compiler.integer-simple.ghcHEAD  ghc-8.1.20170106
+
+To get a package set supporting `integer-simple` use the attribute:
+`pkgs.haskell.packages.integer-simple."${ghcVersion}"`. For example
+use the following to get the `scientific` package build with `integer-simple`:
+
+    $ nix-build -A pkgs.haskell.packages.integer-simple.ghc802.scientific
+
 
 ## Other resources
 
diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix
index e384a42a51f..521afbd88b4 100644
--- a/pkgs/development/compilers/ghc/7.10.2.nix
+++ b/pkgs/development/compilers/ghc/7.10.2.nix
@@ -1,20 +1,27 @@
-{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
+{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, binutils, coreutils
 , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour
+
+  # If enabled GHC will be build with the GPL-free but slower integer-simple
+  # library instead of the faster but GPLed integer-gmp library.
+, enableIntegerSimple ? false, gmp
 }:
 
 let
   inherit (bootPkgs) ghc;
 
   buildMK = ''
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib"
     ${stdenv.lib.optionalString stdenv.isDarwin ''
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
     ''}
-  '';
+  '' + (if enableIntegerSimple then ''
+    INTEGER_LIBRARY=integer-simple
+  '' else ''
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
+  '');
 
 in
 
@@ -46,8 +53,9 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-gcc=${stdenv.cc}/bin/cc"
-    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
     "--datadir=$doc/share/doc/ghc"
+  ] ++ stdenv.lib.optional (! enableIntegerSimple) [
+    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
   ];
 
   # required, because otherwise all symbols from HSffi.o are stripped, and
diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix
index 020e4fd30cf..d75f5df370f 100644
--- a/pkgs/development/compilers/ghc/7.10.3.nix
+++ b/pkgs/development/compilers/ghc/7.10.3.nix
@@ -1,5 +1,9 @@
-{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
+{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, binutils, coreutils
 , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour
+
+  # If enabled GHC will be build with the GPL-free but slower integer-simple
+  # library instead of the faster but GPLed integer-gmp library.
+, enableIntegerSimple ? false, gmp
 }:
 
 let
@@ -38,13 +42,16 @@ stdenv.mkDerivation rec {
     export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
     export NIX_LDFLAGS+=" -no_dtrace_dof"
+  '' + stdenv.lib.optionalString enableIntegerSimple ''
+    echo "INTEGER_LIBRARY=integer-simple" > mk/build.mk
   '';
 
   configureFlags = [
     "--with-gcc=${stdenv.cc}/bin/cc"
-    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
     "--datadir=$doc/share/doc/ghc"
+  ] ++ stdenv.lib.optional (! enableIntegerSimple) [
+    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
   ] ++ stdenv.lib.optional stdenv.isDarwin [
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ];
diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix
index 31cac49135f..b3f672a8ef5 100644
--- a/pkgs/development/compilers/ghc/7.2.2.nix
+++ b/pkgs/development/compilers/ghc/7.2.2.nix
@@ -1,4 +1,9 @@
-{ stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }:
+{ stdenv, fetchurl, ghc, perl, ncurses, libiconv
+
+  # If enabled GHC will be build with the GPL-free but slower integer-simple
+  # library instead of the faster but GPLed integer-gmp library.
+, enableIntegerSimple ? false, gmp
+}:
 
 stdenv.mkDerivation rec {
   version = "7.2.2";
@@ -11,18 +16,22 @@ stdenv.mkDerivation rec {
 
   patches = [ ./fix-7.2.2-clang.patch ./relocation.patch ];
 
-  buildInputs = [ ghc perl gmp ncurses ];
+  buildInputs = [ ghc perl ncurses ]
+                ++ stdenv.lib.optional (!enableIntegerSimple) gmp;
 
   buildMK = ''
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib"
     ${stdenv.lib.optionalString stdenv.isDarwin ''
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
     ''}
-  '';
+  '' + (if enableIntegerSimple then ''
+    INTEGER_LIBRARY=integer-simple
+  '' else ''
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
+  '');
 
   preConfigure = ''
     echo "${buildMK}" > mk/build.mk
diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix
index 63ce7ddfacc..08b4f6f5471 100644
--- a/pkgs/development/compilers/ghc/7.4.2.nix
+++ b/pkgs/development/compilers/ghc/7.4.2.nix
@@ -1,4 +1,9 @@
-{ stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }:
+{ stdenv, fetchurl, ghc, perl, ncurses, libiconv
+
+  # If enabled GHC will be build with the GPL-free but slower integer-simple
+  # library instead of the faster but GPLed integer-gmp library.
+, enableIntegerSimple ? false, gmp
+}:
 
 stdenv.mkDerivation rec {
   version = "7.4.2";
@@ -12,18 +17,22 @@ stdenv.mkDerivation rec {
 
   patches = [ ./fix-7.4.2-clang.patch ./relocation.patch ];
 
-  buildInputs = [ ghc perl gmp ncurses ];
+  buildInputs = [ ghc perl ncurses ]
+                ++ stdenv.lib.optional (!enableIntegerSimple) gmp;
 
   buildMK = ''
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib"
     ${stdenv.lib.optionalString stdenv.isDarwin ''
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
     ''}
-  '';
+  '' + (if enableIntegerSimple then ''
+    INTEGER_LIBRARY=integer-simple
+  '' else ''
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
+  '');
 
   preConfigure = ''
     echo "${buildMK}" > mk/build.mk
diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix
index 5a933a23aa8..bdc0a20d3b4 100644
--- a/pkgs/development/compilers/ghc/7.6.3.nix
+++ b/pkgs/development/compilers/ghc/7.6.3.nix
@@ -1,4 +1,9 @@
-{ stdenv, fetchurl, ghc, perl, gmp, ncurses, binutils, libiconv }:
+{ stdenv, fetchurl, ghc, perl, ncurses, binutils, libiconv
+
+  # If enabled GHC will be build with the GPL-free but slower integer-simple
+  # library instead of the faster but GPLed integer-gmp library.
+, enableIntegerSimple ? false, gmp
+}:
 
 let
   # The "-Wa,--noexecstack" options might be needed only with GNU ld (as opposed
@@ -19,11 +24,10 @@ in stdenv.mkDerivation rec {
 
   patches = [ ./fix-7.6.3-clang.patch ./relocation.patch ];
 
-  buildInputs = [ ghc perl gmp ncurses ];
+  buildInputs = [ ghc perl ncurses ]
+                ++ stdenv.lib.optional (!enableIntegerSimple) gmp;
 
   buildMK = ''
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib"
     ${stdenv.lib.optionalString stdenv.isDarwin ''
@@ -34,7 +38,12 @@ in stdenv.mkDerivation rec {
     # Set ghcFlags for building ghc itself
     SRC_HC_OPTS += ${ghcFlags}
     SRC_CC_OPTS += ${cFlags}
-  '';
+  '' + (if enableIntegerSimple then ''
+    INTEGER_LIBRARY=integer-simple
+  '' else ''
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
+  '');
 
   preConfigure = ''
     echo "${buildMK}" > mk/build.mk
diff --git a/pkgs/development/compilers/ghc/7.8.3.nix b/pkgs/development/compilers/ghc/7.8.3.nix
index f631ad92356..986ec98c6b3 100644
--- a/pkgs/development/compilers/ghc/7.8.3.nix
+++ b/pkgs/development/compilers/ghc/7.8.3.nix
@@ -1,4 +1,9 @@
-{ stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }:
+{ stdenv, fetchurl, ghc, perl, ncurses, libiconv
+
+  # If enabled GHC will be build with the GPL-free but slower integer-simple
+  # library instead of the faster but GPLed integer-gmp library.
+, enableIntegerSimple ? false, gmp
+}:
 
 stdenv.mkDerivation rec {
   version = "7.8.3";
@@ -11,13 +16,12 @@ stdenv.mkDerivation rec {
 
   patches = [ ./relocation.patch ];
 
-  buildInputs = [ ghc perl gmp ncurses ];
+  buildInputs = [ ghc perl ncurses ]
+                ++ stdenv.lib.optional (!enableIntegerSimple) gmp;
 
   enableParallelBuilding = true;
 
   buildMK = ''
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib"
     DYNAMIC_BY_DEFAULT = NO
@@ -25,7 +29,12 @@ stdenv.mkDerivation rec {
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
     ''}
-  '';
+  '' + (if enableIntegerSimple then ''
+    INTEGER_LIBRARY=integer-simple
+  '' else ''
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
+  '');
 
   preConfigure = ''
     echo "${buildMK}" > mk/build.mk
diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix
index f41a1cf7d98..057b9f70fc7 100644
--- a/pkgs/development/compilers/ghc/7.8.4.nix
+++ b/pkgs/development/compilers/ghc/7.8.4.nix
@@ -1,4 +1,9 @@
-{ stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }:
+{ stdenv, fetchurl, ghc, perl, ncurses, libiconv
+
+  # If enabled GHC will be build with the GPL-free but slower integer-simple
+  # library instead of the faster but GPLed integer-gmp library.
+, enableIntegerSimple ? false, gmp
+}:
 
 stdenv.mkDerivation (rec {
   version = "7.8.4";
@@ -11,13 +16,12 @@ stdenv.mkDerivation (rec {
 
   patches = [ ./relocation.patch ];
 
-  buildInputs = [ ghc perl gmp ncurses ];
+  buildInputs = [ ghc perl ncurses ]
+                ++ stdenv.lib.optional (!enableIntegerSimple) gmp;
 
   enableParallelBuilding = true;
 
   buildMK = ''
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib"
     DYNAMIC_BY_DEFAULT = NO
@@ -25,7 +29,12 @@ stdenv.mkDerivation (rec {
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
     ''}
-  '';
+  '' + (if enableIntegerSimple then ''
+    INTEGER_LIBRARY=integer-simple
+  '' else ''
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
+  '');
 
   preConfigure = ''
     echo "${buildMK}" > mk/build.mk
diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix
index 1834f3ae50b..ae6edb739c9 100644
--- a/pkgs/development/compilers/ghc/8.0.1.nix
+++ b/pkgs/development/compilers/ghc/8.0.1.nix
@@ -1,5 +1,9 @@
-{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
+{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, binutils, coreutils
 , hscolour, patchutils, sphinx
+
+  # If enabled GHC will be build with the GPL-free but slower integer-simple
+  # library instead of the faster but GPLed integer-gmp library.
+, enableIntegerSimple ? false, gmp
 }:
 
 let
@@ -41,13 +45,16 @@ stdenv.mkDerivation rec {
     export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
     export NIX_LDFLAGS+=" -no_dtrace_dof"
+  '' + stdenv.lib.optionalString enableIntegerSimple ''
+    echo "INTEGER_LIBRARY=integer-simple" > mk/build.mk
   '';
 
   configureFlags = [
     "--with-gcc=${stdenv.cc}/bin/cc"
-    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
     "--datadir=$doc/share/doc/ghc"
+  ] ++ stdenv.lib.optional (! enableIntegerSimple) [
+    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
   ] ++ stdenv.lib.optional stdenv.isDarwin [
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ];
diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index ba8401b9b09..5f687aca63a 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -1,5 +1,9 @@
-{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
+{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, binutils, coreutils
 , hscolour, patchutils, sphinx
+
+  # If enabled GHC will be build with the GPL-free but slower integer-simple
+  # library instead of the faster but GPLed integer-gmp library.
+, enableIntegerSimple ? false, gmp
 }:
 
 let
@@ -28,13 +32,16 @@ stdenv.mkDerivation rec {
     export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
     export NIX_LDFLAGS+=" -no_dtrace_dof"
+  '' + stdenv.lib.optionalString enableIntegerSimple ''
+    echo "INTEGER_LIBRARY=integer-simple" > mk/build.mk
   '';
 
   configureFlags = [
     "--with-gcc=${stdenv.cc}/bin/cc"
-    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
     "--datadir=$doc/share/doc/ghc"
+  ] ++ stdenv.lib.optional (! enableIntegerSimple) [
+    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
   ] ++ stdenv.lib.optional stdenv.isDarwin [
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ];
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index e7f4335d6f6..0ca8e8c299e 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,6 +1,10 @@
-{ stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
+{ stdenv, fetchgit, bootPkgs, perl, ncurses, libiconv, binutils, coreutils
 , autoconf, automake, happy, alex, python3, buildPlatform, targetPlatform
 , selfPkgs, cross ? null
+
+  # If enabled GHC will be build with the GPL-free but slower integer-simple
+  # library instead of the faster but GPLed integer-gmp library.
+, enableIntegerSimple ? false, gmp
 }:
 
 let
@@ -20,6 +24,8 @@ let
     export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
     export NIX_LDFLAGS+=" -no_dtrace_dof"
+  '' + stdenv.lib.optionalString enableIntegerSimple ''
+    echo "INTEGER_LIBRARY=integer-simple" > mk/build.mk
   '';
 in stdenv.mkDerivation (rec {
   inherit version rev;
@@ -41,8 +47,9 @@ in stdenv.mkDerivation (rec {
 
   configureFlags = [
     "CC=${stdenv.cc}/bin/cc"
-    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
+  ] ++ stdenv.lib.optional (! enableIntegerSimple) [
+    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
   ] ++ stdenv.lib.optional stdenv.isDarwin [
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ];
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 805e9560c20..7d4c06425ba 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1,6 +1,21 @@
 { pkgs, callPackage, stdenv, buildPlatform, targetPlatform }:
 
-rec {
+let # These are attributes in compiler and packages that don't support integer-simple.
+    integerSimpleExcludes = [
+      "ghc6102Binary"
+      "ghc704Binary"
+      "ghc742Binary"
+      "ghc6104"
+      "ghc6123"
+      "ghc704"
+      "ghcjs"
+      "ghcjsHEAD"
+      "ghcCross"
+      "jhc"
+      "uhc"
+      "integer-simple"
+    ];
+in rec {
 
   lib = import ../development/haskell-modules/lib.nix { inherit pkgs; };
 
@@ -74,6 +89,17 @@ rec {
       inherit (pkgs.haskellPackages) ghcWithPackages;
     });
 
+    # The integer-simple attribute set contains all the GHC compilers
+    # build with integer-simple instead of integer-gmp.
+    integer-simple =
+      let integerSimpleGhcNames =
+            pkgs.lib.filter (name: ! builtins.elem name integerSimpleExcludes)
+                            (pkgs.lib.attrNames compiler);
+          integerSimpleGhcs = pkgs.lib.genAttrs integerSimpleGhcNames
+                                (name: compiler."${name}".override { enableIntegerSimple = true; });
+      in integerSimpleGhcs // {
+           ghcHEAD = integerSimpleGhcs.ghcHEAD.override { selfPkgs = packages.integer-simple.ghcHEAD; };
+         };
   };
 
   packages = {
@@ -142,6 +168,20 @@ rec {
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
     };
 
+    # The integer-simple attribute set contains package sets for all the GHC compilers
+    # using integer-simple instead of integer-gmp.
+    integer-simple =
+      let integerSimpleGhcNames =
+            pkgs.lib.filter (name: ! builtins.elem name integerSimpleExcludes)
+                            (pkgs.lib.attrNames packages);
+      in pkgs.lib.genAttrs integerSimpleGhcNames (name: packages."${name}".override {
+       ghc = compiler.integer-simple."${name}";
+       overrides = _self : _super : {
+         integer-simple = null;
+         integer-gmp = null;
+       };
+    });
+
     # These attributes exist only for backwards-compatibility so that we don't break
     # stack's --nix support. These attributes will disappear in the foreseeable
     # future: https://github.com/commercialhaskell/stack/issues/2259.

From 75a4679548aef2062babe669da27471af3dbcae2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 1 Feb 2017 11:01:24 +0100
Subject: [PATCH 273/899] Recurse from haskell.compiler into
 haskell.compiler.integer-simple on Hydra.

This ensures that the gmp-free compiler variants are compiled on
hydra.nixos.org, too.
---
 pkgs/top-level/haskell-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7d4c06425ba..6f07c129322 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -97,9 +97,9 @@ in rec {
                             (pkgs.lib.attrNames compiler);
           integerSimpleGhcs = pkgs.lib.genAttrs integerSimpleGhcNames
                                 (name: compiler."${name}".override { enableIntegerSimple = true; });
-      in integerSimpleGhcs // {
+      in pkgs.recurseIntoAttrs (integerSimpleGhcs // {
            ghcHEAD = integerSimpleGhcs.ghcHEAD.override { selfPkgs = packages.integer-simple.ghcHEAD; };
-         };
+         });
   };
 
   packages = {

From 2be4214c68384456924e4e91d10292a9b6dfad29 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 1 Feb 2017 18:23:42 +0100
Subject: [PATCH 274/899] hackage2nix: update list of broken packages

---
 .../haskell-modules/configuration-hackage2nix.yaml          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index f5967f5a281..41814d382e0 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2042,8 +2042,8 @@ extra-packages:
 
 package-maintainers:
   peti:
-    - cabal2nix
     - cabal-install
+    - cabal2nix
     - funcmp
     - git-annex
     - hackage-db
@@ -2062,6 +2062,8 @@ package-maintainers:
     - pandoc
     - stack
     - streamproc
+    - structured-haskell-mode
+    - titlecase
   gebner:
     - hledger-diff
   gridaphobe:
@@ -7111,7 +7113,6 @@ dont-distribute-packages:
   stripe:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   structs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   structural-induction:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  structured-haskell-mode:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   structured-mongoDB:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   structures:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stunts:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7358,7 +7359,6 @@ dont-distribute-packages:
   tip-haskell-frontend:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tip-lib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Titim:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  titlecase:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tkhs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tkyprof:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tld:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]

From 30bdcd9a8e5cb90cea9221f04072c823016e6c7c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 30 Jan 2017 12:34:50 +0100
Subject: [PATCH 275/899] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.0.4-8-g0d49e12 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/45587c11140ea1e9c8ff0ea4d60f4d14f48c9988.
---
 .../haskell-modules/hackage-packages.nix      | 1158 ++++++++++++-----
 1 file changed, 853 insertions(+), 305 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 45924e6a541..b5b9954244a 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -739,8 +739,8 @@ self: {
        pname = "Agda";
        version = "2.5.2";
        sha256 = "d812cec3bf7f03c4b27248572475c7e060154102771a8434cc11ba89f5691439";
-       revision = "1";
-       editedCabalFile = "44f0f96c5d26202f964c575e5f94fe52686f4b889078ddfdafef0c6fd2571b47";
+       revision = "2";
+       editedCabalFile = "4db0b12bc07e72fe1b180acad2a0d59ac11d9a1d45698b46cede7b634fb6bfff";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -7823,32 +7823,34 @@ self: {
      }) {};
 
   "HROOT" = callPackage
-    ({ mkDerivation, base, fficxx-runtime, HROOT-core, HROOT-graf
-     , HROOT-hist, HROOT-io, HROOT-math
+    ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core
+     , HROOT-graf, HROOT-hist, HROOT-io, HROOT-math, HROOT-tree
+     , template-haskell
      }:
      mkDerivation {
        pname = "HROOT";
-       version = "0.8";
-       sha256 = "0e6fa9e42e8843bbd7cb0af48e3f86ba8412a2fb12c70f94990ed10f832cd660";
-       revision = "1";
-       editedCabalFile = "43058ba39e0517740c45b1087a39e4f84912c1a3c500504850395d4f2fda0917";
+       version = "0.9";
+       sha256 = "5a8e948e0970d901feafdc184270f1631314512b4bd967f0f16c83a640d1b975";
        libraryHaskellDepends = [
-         base fficxx-runtime HROOT-core HROOT-graf HROOT-hist HROOT-io
-         HROOT-math
+         base fficxx fficxx-runtime HROOT-core HROOT-graf HROOT-hist
+         HROOT-io HROOT-math HROOT-tree template-haskell
        ];
        homepage = "http://ianwookim.org/HROOT";
-       description = "Haskell binding to ROOT RooFit modules";
+       description = "Haskell binding to the ROOT data analysis framework";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+       broken = true;
+     }) {HROOT-tree = null;};
 
   "HROOT-core" = callPackage
-    ({ mkDerivation, base, fficxx-runtime }:
+    ({ mkDerivation, base, fficxx, fficxx-runtime, template-haskell }:
      mkDerivation {
        pname = "HROOT-core";
-       version = "0.8";
-       sha256 = "161807e042e440c6b00d87dda1bb1a945ec9aee53375f2c66d80984c84b080b8";
-       libraryHaskellDepends = [ base fficxx-runtime ];
+       version = "0.9";
+       sha256 = "af2678d6fcd87531b2866b753e65b0c455216dd27c87fdfabb694201748bea83";
+       libraryHaskellDepends = [
+         base fficxx fficxx-runtime template-haskell
+       ];
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT Core modules";
        license = stdenv.lib.licenses.lgpl21;
@@ -7856,13 +7858,15 @@ self: {
      }) {};
 
   "HROOT-graf" = callPackage
-    ({ mkDerivation, base, fficxx-runtime, HROOT-core, HROOT-hist }:
+    ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core
+     , HROOT-hist, template-haskell
+     }:
      mkDerivation {
        pname = "HROOT-graf";
-       version = "0.8";
-       sha256 = "7c817f7c174a2ad026dd494391427719da23addcda9dc3e7fa59aa9fb96102ca";
+       version = "0.9";
+       sha256 = "1e80209799bdceea7ef65e1dd6ca7d4e0d182209442ff3489d7fe5cd47fda552";
        libraryHaskellDepends = [
-         base fficxx-runtime HROOT-core HROOT-hist
+         base fficxx fficxx-runtime HROOT-core HROOT-hist template-haskell
        ];
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT Graf modules";
@@ -7871,12 +7875,16 @@ self: {
      }) {};
 
   "HROOT-hist" = callPackage
-    ({ mkDerivation, base, fficxx-runtime, HROOT-core }:
+    ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core
+     , template-haskell
+     }:
      mkDerivation {
        pname = "HROOT-hist";
-       version = "0.8";
-       sha256 = "01ce1810bcdd1dbf53d2b7f7c5923f7409d1388ceaa328549046f06fc5c3f47b";
-       libraryHaskellDepends = [ base fficxx-runtime HROOT-core ];
+       version = "0.9";
+       sha256 = "18baee9511c105f92d11a9523f0b212e13d0975b733daf22733357cc56e04c5e";
+       libraryHaskellDepends = [
+         base fficxx fficxx-runtime HROOT-core template-haskell
+       ];
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT Hist modules";
        license = stdenv.lib.licenses.lgpl21;
@@ -7884,12 +7892,16 @@ self: {
      }) {};
 
   "HROOT-io" = callPackage
-    ({ mkDerivation, base, fficxx-runtime, HROOT-core }:
+    ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core
+     , template-haskell
+     }:
      mkDerivation {
        pname = "HROOT-io";
-       version = "0.8";
-       sha256 = "621adb74a41241cb7678e4a28ba3aff3bb21b132c2890ae0be627722be347069";
-       libraryHaskellDepends = [ base fficxx-runtime HROOT-core ];
+       version = "0.9";
+       sha256 = "222bab39e503aa61775beb5904c72aa2e9018a46f4c4b2a9d0e68a5cd4c837ef";
+       libraryHaskellDepends = [
+         base fficxx fficxx-runtime HROOT-core template-haskell
+       ];
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT IO modules";
        license = stdenv.lib.licenses.lgpl21;
@@ -7897,12 +7909,16 @@ self: {
      }) {};
 
   "HROOT-math" = callPackage
-    ({ mkDerivation, base, fficxx-runtime, HROOT-core }:
+    ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core
+     , template-haskell
+     }:
      mkDerivation {
        pname = "HROOT-math";
-       version = "0.8";
-       sha256 = "95ff6a0125141818f4bdb3946dcfa9dd8cbeb4a00674c429b082b7df61deba62";
-       libraryHaskellDepends = [ base fficxx-runtime HROOT-core ];
+       version = "0.9";
+       sha256 = "f203711dac9891f394e9193f9bdf861edff163ec923b48f9c086961f6e1f6644";
+       libraryHaskellDepends = [
+         base fficxx fficxx-runtime HROOT-core template-haskell
+       ];
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT Math modules";
        license = stdenv.lib.licenses.lgpl21;
@@ -11263,8 +11279,8 @@ self: {
      }:
      mkDerivation {
        pname = "MagicHaskeller";
-       version = "0.9.6.5";
-       sha256 = "5289340f0ec721e35f66e13a871f8fe65d55ed8af9c63ebec2a2cc99db699fb8";
+       version = "0.9.6.6.1";
+       sha256 = "5f477822961bfdf7d3af73903877c1eb448ddbf323afc73f2f5da18f633a9e6e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -15158,6 +15174,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "STMonadTrans_0_4" = callPackage
+    ({ mkDerivation, array, base, Cabal, mtl }:
+     mkDerivation {
+       pname = "STMonadTrans";
+       version = "0.4";
+       sha256 = "518667c253184c8c5cf707564d117f67bb0fabf5f6ebe8b25400359d4a8a6200";
+       libraryHaskellDepends = [ array base mtl ];
+       testHaskellDepends = [ array base Cabal mtl ];
+       description = "A monad transformer version of the ST monad";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "SVG2Q" = callPackage
     ({ mkDerivation, base, haskell98, language-c, pretty, svgutils, syb
      , xml
@@ -25610,8 +25639,8 @@ self: {
        pname = "ansi-pretty";
        version = "0.1.2.1";
        sha256 = "708819f93f1759919a19dcfccddf3ddc8d9fba930cb73fab3ec9f6f5691394c6";
-       revision = "1";
-       editedCabalFile = "266eb754d15de06de1d488c82564bbf6c359e4e94e5210a58f2c18917a19d78d";
+       revision = "2";
+       editedCabalFile = "7d10d2f8605d932394138b76880eb08db72606730394c7f6a895f923e608ba65";
        libraryHaskellDepends = [
          aeson ansi-wl-pprint array base bytestring containers generics-sop
          nats scientific semigroups tagged text time unordered-containers
@@ -28494,6 +28523,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "attoparsec-time" = callPackage
+    ({ mkDerivation, attoparsec, base, base-prelude, directory, doctest
+     , filepath, text, time
+     }:
+     mkDerivation {
+       pname = "attoparsec-time";
+       version = "0.1.1";
+       sha256 = "9789759199654f3767823b62bb48182b5f83226ebde3ec74e31863309a77a362";
+       libraryHaskellDepends = [ attoparsec base-prelude text time ];
+       testHaskellDepends = [
+         base base-prelude directory doctest filepath
+       ];
+       homepage = "https://github.com/sannsyn/attoparsec-time";
+       description = "Attoparsec parsers of time";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "attoparsec-trans" = callPackage
     ({ mkDerivation, attoparsec, base, transformers }:
      mkDerivation {
@@ -32070,8 +32116,8 @@ self: {
        pname = "binary-tagged";
        version = "0.1.4.2";
        sha256 = "311fab8c2bac00cb6785cb144e25ed58b2efce85e5dc64e30e2b5a2a16cdc784";
-       revision = "2";
-       editedCabalFile = "7abacbe953b33132ec4cd7f4765e58918404e22c8b05eb6411f6bd62b05a828c";
+       revision = "3";
+       editedCabalFile = "6fd4d363bd8a64deacea2726daa15b67b4331f7d6b47de9980c11435564a3de1";
        libraryHaskellDepends = [
          aeson array base base16-bytestring binary bytestring containers
          generics-sop hashable nats scientific semigroups SHA tagged text
@@ -33383,36 +33429,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "bitcoin-payment-channel_1_0_0_0" = callPackage
+  "bitcoin-payment-channel_1_0_1_0" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring
-     , bytestring, cereal, errors, haskell-rbpcp-api, haskoin-core
-     , hexstring, hspec, monad-time, mtl, QuickCheck, random, scientific
+     , bytestring, cereal, deepseq, errors, haskoin-core, hexstring
+     , hspec, monad-time, mtl, QuickCheck, random, rbpcp-api, scientific
      , semigroups, string-conversions, tagged, test-framework
      , test-framework-quickcheck2, text, tf-random, time
      }:
      mkDerivation {
        pname = "bitcoin-payment-channel";
-       version = "1.0.0.0";
-       sha256 = "3858a212258099aed8361bbaeef5a251c5d12d7b222c027290d963571e1f7698";
+       version = "1.0.1.0";
+       sha256 = "b723c4f808fd3e517bdacd27e59f08410a600a05ebea2ca6baf5cafa64490fa2";
        libraryHaskellDepends = [
-         aeson base base16-bytestring bytestring cereal errors
-         haskell-rbpcp-api haskoin-core hexstring hspec monad-time
-         QuickCheck scientific semigroups string-conversions tagged text
-         time
+         aeson base base16-bytestring bytestring cereal deepseq errors
+         haskoin-core hexstring hspec monad-time QuickCheck rbpcp-api
+         scientific semigroups string-conversions tagged text time
        ];
        testHaskellDepends = [
          aeson base base16-bytestring base64-bytestring bytestring cereal
-         errors haskell-rbpcp-api haskoin-core hexstring hspec monad-time
-         mtl QuickCheck random scientific semigroups string-conversions
-         tagged test-framework test-framework-quickcheck2 text tf-random
-         time
+         deepseq errors haskoin-core hexstring hspec monad-time mtl
+         QuickCheck random rbpcp-api scientific semigroups
+         string-conversions tagged test-framework test-framework-quickcheck2
+         text tf-random time
        ];
        homepage = "https://github.com/runeksvendsen/bitcoin-payment-channel";
        description = "Instant, two-party Bitcoin payments";
-       license = stdenv.lib.licenses.publicDomain;
+       license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {haskell-rbpcp-api = null;};
+     }) {};
 
   "bitcoin-rpc" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal
@@ -34167,6 +34211,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "blaze-html_0_9_0_1" = callPackage
+    ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring
+     , containers, HUnit, QuickCheck, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text
+     }:
+     mkDerivation {
+       pname = "blaze-html";
+       version = "0.9.0.1";
+       sha256 = "aeceaab3fbccbf7f01a241819e6c16c0a1cf19dccecb795c5de5407bc8660a64";
+       libraryHaskellDepends = [
+         base blaze-builder blaze-markup bytestring text
+       ];
+       testHaskellDepends = [
+         base blaze-builder blaze-markup bytestring containers HUnit
+         QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2 text
+       ];
+       homepage = "http://jaspervdj.be/blaze";
+       description = "A blazingly fast HTML combinator library for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "blaze-html-contrib" = callPackage
     ({ mkDerivation, base, blaze-html, cgi, data-default, network, safe
      , text
@@ -34255,6 +34322,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "blaze-markup_0_8_0_0" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
+     , QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text
+     }:
+     mkDerivation {
+       pname = "blaze-markup";
+       version = "0.8.0.0";
+       sha256 = "19e1cbb9303803273ed7f9fcf3b8b6938578afbed2bfafe5ea9fcc6d743f540f";
+       libraryHaskellDepends = [ base blaze-builder bytestring text ];
+       testHaskellDepends = [
+         base blaze-builder bytestring containers HUnit QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck2 text
+       ];
+       homepage = "http://jaspervdj.be/blaze";
+       description = "A blazingly fast markup combinator library for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "blaze-shields" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, blaze-svg, text }:
      mkDerivation {
@@ -35150,6 +35237,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "bootstrap-types" = callPackage
+    ({ mkDerivation, base, text }:
+     mkDerivation {
+       pname = "bootstrap-types";
+       version = "0.3";
+       sha256 = "84b0c14c4d7c12beadef4b2950b888065e6e94dd0a08bcdfa5f43db4111db5a5";
+       libraryHaskellDepends = [ base text ];
+       description = "Bootstrap CSS Framework type-safe interface";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "borel" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, bimap, cassava
      , ceilometer-common, chevalier-common, configurator, containers
@@ -37059,6 +37157,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cabal-doctest" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath }:
+     mkDerivation {
+       pname = "cabal-doctest";
+       version = "1";
+       sha256 = "7c769d62029d10f8861d88f48080a64f875346b74028ed2fd808d674accc6147";
+       libraryHaskellDepends = [ base Cabal directory filepath ];
+       homepage = "https://github.com/phadej/cabal-doctests";
+       description = "A Setup.hs helper for doctests running";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cabal-file-th" = callPackage
     ({ mkDerivation, base, Cabal, directory, pretty, template-haskell
      }:
@@ -39533,15 +39643,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cayley-client_0_3_3" = callPackage
+  "cayley-client_0_4_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.3";
-       sha256 = "0c94c59e68b148b1bbae85ea89a8676e8b108b8f51accf84295bf40bf5f2e5e3";
+       version = "0.4.0";
+       sha256 = "bdd21a245b6db5102d11096746edd85545d150ee835c0324e554d8b812ee6571";
        libraryHaskellDepends = [
          aeson attoparsec base binary bytestring exceptions http-client
          http-conduit lens lens-aeson mtl text transformers
@@ -40815,10 +40925,8 @@ self: {
      }:
      mkDerivation {
        pname = "chronos";
-       version = "0.3";
-       sha256 = "97e9bcdb2a65bb5034d2d6af2e0ac23dd91e797d7d4b914bad0110e9740486b5";
-       revision = "1";
-       editedCabalFile = "61e89d96d116d28efa59ca1583ce5e1a9dd6bbc8a644000f182233aa5fb480a0";
+       version = "0.4";
+       sha256 = "547910db795b52bc6aea1202fc2db32324697cad4cba6677edba043fc3c28751";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring hashable primitive text vector
        ];
@@ -42864,6 +42972,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cmark_0_5_5" = callPackage
+    ({ mkDerivation, base, bytestring, HUnit, text }:
+     mkDerivation {
+       pname = "cmark";
+       version = "0.5.5";
+       sha256 = "03bd6fc962bb92127f64a9c597a904492a16fb3f34587775a741d22311fe53e2";
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [ base HUnit text ];
+       homepage = "https://github.com/jgm/cmark-hs";
+       description = "Fast, accurate CommonMark (Markdown) parser and renderer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cmark-highlight" = callPackage
     ({ mkDerivation, base, blaze-html, cmark, highlighting-kate, text
      }:
@@ -42897,8 +43019,8 @@ self: {
      }:
      mkDerivation {
        pname = "cmark-sections";
-       version = "0.1.0.2";
-       sha256 = "3617bb05d899ead54e1f58faa97fd30f6a9ec152112b6b962e26cdd02c34da57";
+       version = "0.1.0.3";
+       sha256 = "08cf3bb1bf87e7e9685fb24f3204df7023b0c5f0bfd6d16c950cba3507651441";
        libraryHaskellDepends = [
          base base-prelude cmark containers microlens split text
        ];
@@ -43603,8 +43725,8 @@ self: {
      }:
      mkDerivation {
        pname = "colonnade";
-       version = "0.4.7";
-       sha256 = "45bdd0a8d67e483f52d3212149d3dda99813aef4c00a6d4118b425d7d7e49457";
+       version = "0.5";
+       sha256 = "ed16c4510b89ec592fe3f96eef3a3725173aa6184fb89efef604b19aef1d6fb3";
        libraryHaskellDepends = [
          base bytestring contravariant text vector
        ];
@@ -43644,8 +43766,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "colorful-monoids";
-       version = "0.2.0.1";
-       sha256 = "0becada75e006e88563631bf0a33a241e40772d04b15220d660f16c02cf4b331";
+       version = "0.2.1.0";
+       sha256 = "426e36c9219ebc19108f0968aee8900bad7642937b5800d6045c5085c2b06532";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/minad/colorful-monoids#readme";
@@ -48763,6 +48885,8 @@ self: {
        pname = "cryptol";
        version = "2.4.0";
        sha256 = "d34471f734429c25b52ca71ce63270ec3157a8413eeaf7f65dd7abe3cb27014d";
+       revision = "1";
+       editedCabalFile = "2bee5fb1a197ddde354e17c2b8b4f3081f005a133efe1eb2a021cedfd3b154f1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -56536,6 +56660,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "distributive_0_5_2" = callPackage
+    ({ mkDerivation, base, base-orphans, Cabal, cabal-doctest
+     , directory, doctest, filepath, generic-deriving, hspec, tagged
+     , transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "distributive";
+       version = "0.5.2";
+       sha256 = "ade2be6a5e81950ab2918d938037dde0ce09d04dc399cefbf191ce6cb5f76cd9";
+       revision = "1";
+       editedCabalFile = "b8e7dbc541e69b9f8e79faefd636e50d42eb38354ffbe5512af6f2bc98c3e257";
+       setupHaskellDepends = [
+         base Cabal cabal-doctest directory filepath
+       ];
+       libraryHaskellDepends = [
+         base base-orphans tagged transformers transformers-compat
+       ];
+       testHaskellDepends = [ base doctest generic-deriving hspec ];
+       homepage = "http://github.com/ekmett/distributive/";
+       description = "Distributive functors -- Dual to Traversable";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diversity" = callPackage
     ({ mkDerivation, base, containers, data-ordlist, fasta
      , math-functions, MonadRandom, optparse-applicative, parsec, pipes
@@ -58981,8 +59129,8 @@ self: {
     ({ mkDerivation, base, process }:
      mkDerivation {
        pname = "echo";
-       version = "0.1.2";
-       sha256 = "819afc6655c4973f5ff3e65bb604cc871d2a1b17faf2a9840224e27b51a9f030";
+       version = "0.1.3";
+       sha256 = "704f07310f8272d170f8ab7fb2a2c13f15d8501ef8310801e36964c8eff485ef";
        libraryHaskellDepends = [ base process ];
        homepage = "https://github.com/RyanGlScott/echo";
        description = "A cross-platform, cross-console way to handle echoing terminal input";
@@ -60027,8 +60175,8 @@ self: {
      }:
      mkDerivation {
        pname = "elm-export";
-       version = "0.6.0.0";
-       sha256 = "ad6342e25a5f71b7eb8abbfb894802d3d72f75b05d588c76eee780d0528dc00f";
+       version = "0.6.0.1";
+       sha256 = "bf9862015918c72b54b421efcd9d858969dcd94ef0a3d0cb92d9bc0c4363f9d5";
        libraryHaskellDepends = [
          base bytestring containers directory formatting mtl text time
          wl-pprint-text
@@ -61043,10 +61191,8 @@ self: {
      }:
      mkDerivation {
        pname = "envy";
-       version = "1.0.0.0";
-       sha256 = "0505d8883f796b86f362048b7897bab3cad382f325aa423f743a7cab48064bf4";
-       revision = "2";
-       editedCabalFile = "4557dbc843b8c588b30d3124f3261fb7ffa2ff705e53ad0d0042c3c4e13ebed3";
+       version = "1.3.0.0";
+       sha256 = "ed2906c08163045e8b2ba22d591d79954e2b070b7643632e4e860ad09a7968bd";
        libraryHaskellDepends = [
          base bytestring containers mtl text time transformers
        ];
@@ -63521,14 +63667,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "fast-logger_2_4_9" = callPackage
+  "fast-logger_2_4_10" = callPackage
     ({ mkDerivation, array, auto-update, base, bytestring, directory
      , easy-file, filepath, hspec, text, unix, unix-time
      }:
      mkDerivation {
        pname = "fast-logger";
-       version = "2.4.9";
-       sha256 = "0c75847259d79221fd710b546b19fca1d4270721ba8fd78ac98285878324704a";
+       version = "2.4.10";
+       sha256 = "dec4a5d1a88f822d08d334ee870a08a8bb63b2b226d145cd24a7f08676ce678d";
        libraryHaskellDepends = [
          array auto-update base bytestring directory easy-file filepath text
          unix unix-time
@@ -64520,18 +64666,19 @@ self: {
 
   "fficxx" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, data-default
-     , directory, either, errors, filepath, hashable, HStringTemplate
-     , lens, mtl, process, pureMD5, split, template-haskell
-     , transformers, unordered-containers
+     , directory, either, errors, filepath, hashable, haskell-src-exts
+     , lens, mtl, process, pureMD5, split, template, template-haskell
+     , text, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "fficxx";
-       version = "0.2.1";
-       sha256 = "0d2808a81f75db856bb392a9a3968b86abdbc00b74eec3b93047e83cc1e553ee";
+       version = "0.3";
+       sha256 = "bdf56fb5f2226ef17c525c3f83fc8c85e7f0c2238da3f06280a7d40748b746a6";
        libraryHaskellDepends = [
          base bytestring Cabal containers data-default directory either
-         errors filepath hashable HStringTemplate lens mtl process pureMD5
-         split template-haskell transformers unordered-containers
+         errors filepath hashable haskell-src-exts lens mtl process pureMD5
+         split template template-haskell text transformers
+         unordered-containers
        ];
        description = "automatic C++ binding generation";
        license = stdenv.lib.licenses.bsd3;
@@ -64539,12 +64686,12 @@ self: {
      }) {};
 
   "fficxx-runtime" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, bytestring, template-haskell }:
      mkDerivation {
        pname = "fficxx-runtime";
-       version = "0.2.1";
-       sha256 = "b3dfb29aff05dba4b0f8f70e93370ead11b012a674aeef51f70356b21a609741";
-       libraryHaskellDepends = [ base ];
+       version = "0.3";
+       sha256 = "ab4563421558a4bf6a91e459cf700ca3eb58fe74ac72df073a4e648d1d94ffa2";
+       libraryHaskellDepends = [ base bytestring template-haskell ];
        description = "Runtime for fficxx-generated library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -66681,6 +66828,8 @@ self: {
        pname = "folds";
        version = "0.7.1";
        sha256 = "e07adf0c9834b5f78180250d7fec6a56ba84c752cbe4c991d52efc6c60b7d25a";
+       revision = "1";
+       editedCabalFile = "1ef82fedd12e9e46055436c3bfa5992f595c08ca986012dc301fd76f0bcaf05f";
        configureFlags = [ "-f-test-hlint" ];
        libraryHaskellDepends = [
          adjunctions base bifunctors comonad constraints contravariant
@@ -78054,8 +78203,8 @@ self: {
      }:
      mkDerivation {
        pname = "graflog";
-       version = "6.1.0";
-       sha256 = "60575c60b20dc7d52f4297f2d979b3074fd093dae2bbb700ba132f45e50dc3c3";
+       version = "6.1.3";
+       sha256 = "b0af2e3becca91475a1ec8737d3bf27a3f68bc106ac46cce0f4264408b0a8bda";
        libraryHaskellDepends = [
          aeson base bytestring containers mtl text text-conversions
        ];
@@ -78595,6 +78744,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "graphql-api" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, containers, directory
+     , doctest, exceptions, hspec, protolude, QuickCheck, raw-strings-qq
+     , scientific, tasty, tasty-hspec, text, transformers
+     }:
+     mkDerivation {
+       pname = "graphql-api";
+       version = "0.1.1";
+       sha256 = "e8d19197ff982e111ec199b411faf78e2800778b82c3c0147f1ef35615522a7d";
+       revision = "1";
+       editedCabalFile = "593742fa27cf4b14bcb88ced31b9af3a0567a5fab700e18e2f47f49a6c5fd1a9";
+       libraryHaskellDepends = [
+         aeson attoparsec base containers exceptions protolude QuickCheck
+         scientific text transformers
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base containers directory doctest exceptions hspec
+         protolude QuickCheck raw-strings-qq tasty tasty-hspec transformers
+       ];
+       homepage = "https://github.com/jml/graphql-api#readme";
+       description = "Write type-safe GraphQL services in Haskell";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "graphs" = callPackage
     ({ mkDerivation, array, base, containers, transformers
      , transformers-compat, void
@@ -83748,8 +83921,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasbolt";
-       version = "0.1.0.5";
-       sha256 = "f0ec1be21cb5560fa575c414c691bcf48f14e6dfb8f53ae5feae013a105639fa";
+       version = "0.1.0.8";
+       sha256 = "ab3fde6c246636bf06d6a1a3a64261469d3f146a862a15db83fca86b02ade250";
        libraryHaskellDepends = [
          base binary bytestring containers data-binary-ieee754 data-default
          hex network network-simple text transformers
@@ -85514,8 +85687,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-ast";
-       version = "0.4.1.3";
-       sha256 = "f456e74ada1c5ce4386a2b0e6a844c893b75dcdaaccac4dabc49977da8ae3405";
+       version = "0.5.0.0";
+       sha256 = "69f8feebf6ffbb942f7e0ca9b0e6a258a83f4acda13977e99b4568d36e9dee77";
        libraryHaskellDepends = [
          base ghc mtl references template-haskell uniplate
        ];
@@ -85586,8 +85759,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-backend-ghc";
-       version = "0.4.1.3";
-       sha256 = "590147059de94fc0224e86fd1cba144b32737dd9e9e3efa91d6389e99265642e";
+       version = "0.5.0.0";
+       sha256 = "eb8d8b2367020d851f83a2a9fccda813da6537a38c7065e92237f769e7bd2fe8";
        libraryHaskellDepends = [
          base bytestring containers ghc haskell-tools-ast mtl references
          safe split template-haskell transformers uniplate
@@ -85601,13 +85774,13 @@ self: {
   "haskell-tools-cli" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , ghc, ghc-paths, haskell-tools-ast, haskell-tools-prettyprint
-     , haskell-tools-refactor, knob, mtl, references, split, tasty
-     , tasty-hunit
+     , haskell-tools-refactor, knob, mtl, process, references, split
+     , tasty, tasty-hunit
      }:
      mkDerivation {
        pname = "haskell-tools-cli";
-       version = "0.4.1.3";
-       sha256 = "e37721ca8bcbdc0e5eb2977a956b1e97c858a13f7d8c236c3a04e948e4ebe699";
+       version = "0.5.0.0";
+       sha256 = "08796a6d02d06c9cd68936436a452e82c90468e1420d3f02b3ed040f117d2c14";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -85615,7 +85788,7 @@ self: {
          haskell-tools-prettyprint haskell-tools-refactor mtl references
          split
        ];
-       executableHaskellDepends = [ base ];
+       executableHaskellDepends = [ base directory process split ];
        testHaskellDepends = [
          base bytestring directory filepath knob tasty tasty-hunit
        ];
@@ -85633,8 +85806,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-daemon";
-       version = "0.4.1.3";
-       sha256 = "0a10d80c3ed2bdc65010ef73b7d090544a086e4eba09b613f3045b23a141814a";
+       version = "0.5.0.0";
+       sha256 = "588ef66d492b16d6d76a34111dc43fc3243c4bff48d6f5aa2281c72ae365925a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -85644,7 +85817,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         aeson base bytestring directory filepath HUnit network process
+         aeson base bytestring directory filepath ghc HUnit network process
          tasty tasty-hunit
        ];
        homepage = "https://github.com/haskell-tools/haskell-tools";
@@ -85660,8 +85833,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-debug";
-       version = "0.4.1.3";
-       sha256 = "2e89fee8acdd91b92b6ce9f079e1f3c445c19f37ac0092310ed20ba51a8a677e";
+       version = "0.5.0.0";
+       sha256 = "b70796a99599cb051d2bbad5b02863245c8eae9732aa96ff3bc038e7b114dc27";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -85685,8 +85858,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-demo";
-       version = "0.4.1.3";
-       sha256 = "d8ab6534f3f04cd2bfb3c636d88f008501b23cee15171a435f8aea464398ed20";
+       version = "0.5.0.0";
+       sha256 = "4b5dd31ee4a5342a49e07c8c48daccc98f7dd16afab819e370b944f45ec2618c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -85712,8 +85885,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-prettyprint";
-       version = "0.4.1.3";
-       sha256 = "77fc5cab4b93e3e58022a23282776a667d0e90f357341f41ff72771919530490";
+       version = "0.5.0.0";
+       sha256 = "4690b95cd4e2d53547dd854d792dd1731c85470e97c1e0d6ed1df951b951367c";
        libraryHaskellDepends = [
          base containers ghc haskell-tools-ast mtl references split uniplate
        ];
@@ -85727,13 +85900,14 @@ self: {
     ({ mkDerivation, base, Cabal, containers, directory, either
      , filepath, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-backend-ghc, haskell-tools-prettyprint
-     , haskell-tools-rewrite, mtl, references, split, tasty, tasty-hunit
-     , template-haskell, time, transformers, uniplate
+     , haskell-tools-rewrite, mtl, old-time, polyparse, references
+     , split, tasty, tasty-hunit, template-haskell, time, transformers
+     , uniplate
      }:
      mkDerivation {
        pname = "haskell-tools-refactor";
-       version = "0.4.1.3";
-       sha256 = "d732fb853cf0e066cec00f126030edd2e43abbde423affc3c8f2ceacab18cb82";
+       version = "0.5.0.0";
+       sha256 = "41dcc1a933623fd172776800473596d7d5fa84b68a96042361d474c76db35df8";
        libraryHaskellDepends = [
          base Cabal containers directory filepath ghc ghc-paths
          haskell-tools-ast haskell-tools-backend-ghc
@@ -85743,8 +85917,9 @@ self: {
        testHaskellDepends = [
          base Cabal containers directory either filepath ghc ghc-paths
          haskell-tools-ast haskell-tools-backend-ghc
-         haskell-tools-prettyprint haskell-tools-rewrite mtl references
-         split tasty tasty-hunit template-haskell time transformers uniplate
+         haskell-tools-prettyprint haskell-tools-rewrite mtl old-time
+         polyparse references split tasty tasty-hunit template-haskell time
+         transformers uniplate
        ];
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Refactoring Tool for Haskell";
@@ -85759,8 +85934,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-rewrite";
-       version = "0.4.1.3";
-       sha256 = "a92dafd6fd3511517edfc6517ba040130caaf0d24608270af69ae75bd84ff59b";
+       version = "0.5.0.0";
+       sha256 = "abbd76e8709b6fff25c6da010447ab5ad06381169fbf191470178eb8412dbc94";
        libraryHaskellDepends = [
          base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl
          references
@@ -87002,6 +87177,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hasql_0_19_16" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
+     , bytestring-tree-builder, contravariant, contravariant-extras
+     , data-default-class, dlist, either, hashable, hashtables, loch-th
+     , mtl, placeholders, postgresql-binary, postgresql-libpq
+     , profunctors, QuickCheck, quickcheck-instances, rebase, rerebase
+     , scientific, semigroups, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck, text, time, transformers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "hasql";
+       version = "0.19.16";
+       sha256 = "b207195a7de0798f325b338b72059b9ef43546796401604b4a7a04a32be011c0";
+       libraryHaskellDepends = [
+         aeson attoparsec base base-prelude bytestring
+         bytestring-tree-builder contravariant contravariant-extras
+         data-default-class dlist either hashable hashtables loch-th mtl
+         placeholders postgresql-binary postgresql-libpq profunctors
+         scientific semigroups text time transformers uuid vector
+       ];
+       testHaskellDepends = [
+         data-default-class QuickCheck quickcheck-instances rebase rerebase
+         tasty tasty-hunit tasty-quickcheck tasty-smallcheck
+       ];
+       homepage = "https://github.com/nikita-volkov/hasql";
+       description = "An efficient PostgreSQL driver and a flexible mapping API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hasql-backend" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, either, free
      , list-t, text, transformers, vector
@@ -89693,8 +89898,8 @@ self: {
      }:
      mkDerivation {
        pname = "heterocephalus";
-       version = "1.0.3.0";
-       sha256 = "df5bece7cd4a03df21e82a195b030b59608b991b16b1d7771569d542bbb7ee0b";
+       version = "1.0.3.1";
+       sha256 = "9be3bf3945b4a937cb7c34e040ba5ebc220551a4e4685258a9ad3da7280575c4";
        libraryHaskellDepends = [
          base blaze-html blaze-markup containers dlist parsec shakespeare
          template-haskell text
@@ -90893,6 +91098,29 @@ self: {
        license = "GPL";
      }) {};
 
+  "highlighting-kate_0_6_4" = callPackage
+    ({ mkDerivation, base, blaze-html, bytestring, containers, Diff
+     , directory, filepath, mtl, parsec, pcre-light, process
+     , utf8-string
+     }:
+     mkDerivation {
+       pname = "highlighting-kate";
+       version = "0.6.4";
+       sha256 = "d8b83385f5da2ea7aa59f28eb860fd7eba0d35a4c36192a5044ee7ea1e001baf";
+       configureFlags = [ "-fpcre-light" ];
+       libraryHaskellDepends = [
+         base blaze-html bytestring containers mtl parsec pcre-light
+         utf8-string
+       ];
+       testHaskellDepends = [
+         base blaze-html containers Diff directory filepath process
+       ];
+       homepage = "http://github.com/jgm/highlighting-kate";
+       description = "Syntax highlighting";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hills" = callPackage
     ({ mkDerivation, array, base, bytestring, directory, filepath
      , optparse-applicative, text, transformers
@@ -103465,6 +103693,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ieee754_0_8_0" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "ieee754";
+       version = "0.8.0";
+       sha256 = "0e2dff9c37f59acf5c64f978ec320005e9830f276f9f314e4bfed3f482289ad1";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://github.com/patperry/hs-ieee754";
+       description = "Utilities for dealing with IEEE floating point numbers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ieee754-parser" = callPackage
     ({ mkDerivation, base, binary, bytestring }:
      mkDerivation {
@@ -106259,6 +106500,8 @@ self: {
        pname = "ip";
        version = "0.8.7";
        sha256 = "f33f12745defa0ac5aa72f8bfd1b48d905c6ece9a228c9a2209b2943c2f2c690";
+       revision = "1";
+       editedCabalFile = "53d0cca59537fcb2f837d6afcb3d9b0ac3df15a7cdbc4a06f97d696931698ebd";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring hashable primitive text vector
        ];
@@ -111367,6 +111610,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "lackey_0_4_2" = callPackage
+    ({ mkDerivation, base, servant, servant-foreign, tasty, tasty-hspec
+     , text
+     }:
+     mkDerivation {
+       pname = "lackey";
+       version = "0.4.2";
+       sha256 = "3a7f28b66e015a8aafe7af45cfe2da0fec32bdd2ff4f4634def64cce033878c9";
+       libraryHaskellDepends = [ base servant servant-foreign text ];
+       testHaskellDepends = [ base servant tasty tasty-hspec text ];
+       homepage = "https://github.com/tfausak/lackey#readme";
+       description = "Generate Ruby clients from Servant APIs";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lagrangian" = callPackage
     ({ mkDerivation, ad, base, hmatrix, HUnit, nonlinear-optimization
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -112834,7 +113093,7 @@ self: {
        hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
-  "language-puppet_1_3_4_1" = callPackage
+  "language-puppet_1_3_5" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
      , base16-bytestring, bytestring, case-insensitive, containers
      , cryptonite, directory, either, exceptions, filecache, formatting
@@ -112848,8 +113107,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-puppet";
-       version = "1.3.4.1";
-       sha256 = "41cfb18f96af7d30f4477c78b559d78b3bfa3fa385c1a06dd9177f221f0cce71";
+       version = "1.3.5";
+       sha256 = "23c86afa89085f33bfcce1c7290b1f3b302f675578c0625237773211d76d8590";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -114390,6 +114649,8 @@ self: {
        pname = "lenz";
        version = "0.1";
        sha256 = "98b3aef14ca16218ecd6643812e9df5dde5c60af6e2f56f98ec523ecc0917397";
+       revision = "1";
+       editedCabalFile = "48a9254ce289eedf5db423844732c4b5a42798d94b3c2e82b4b9770f87c97f07";
        libraryHaskellDepends = [ base base-unicode-symbols transformers ];
        description = "Van Laarhoven lenses";
        license = "unknown";
@@ -117774,15 +118035,15 @@ self: {
   "log-warper" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring
      , data-default, directory, dlist, errors, exceptions, extra
-     , filepath, formatting, hashable, hslogger, hspec, lens
+     , filepath, formatting, hashable, hslogger, hspec, HUnit, lens
      , monad-control, mtl, QuickCheck, safecopy, text, text-format, time
      , transformers, transformers-base, universum, unordered-containers
      , yaml
      }:
      mkDerivation {
        pname = "log-warper";
-       version = "0.2.5";
-       sha256 = "db8894f9cbc932ad04e0cd29449d18df0803e4ffe0a10bf5cfc0b94332b39585";
+       version = "0.3.1";
+       sha256 = "ff1c2e2fac08b44e180f8d9359eac8ad3df1967dea53b9f29aa78da12d5c7678";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117793,7 +118054,7 @@ self: {
        ];
        executableHaskellDepends = [ base exceptions hslogger text ];
        testHaskellDepends = [
-         async base data-default directory filepath hspec QuickCheck
+         async base data-default directory filepath hspec HUnit QuickCheck
          universum unordered-containers
        ];
        homepage = "https://github.com/serokell/log-warper";
@@ -120346,10 +120607,8 @@ self: {
      }:
      mkDerivation {
        pname = "map-syntax";
-       version = "0.2.0.1";
-       sha256 = "f45f0e09da98dc749eae15f403e30674e874c57f81c4bdd8db818028a25b5c55";
-       revision = "1";
-       editedCabalFile = "98d6cd8739a862600633098d811286237e263dcb7edbc99557aaeea4cd108076";
+       version = "0.2.0.2";
+       sha256 = "b18f95a6369a600fda189c6f475606cbf5f5f1827f96ca3384f33ae76bda4d8a";
        libraryHaskellDepends = [ base containers mtl ];
        testHaskellDepends = [
          base containers deepseq hspec HUnit mtl QuickCheck transformers
@@ -121553,17 +121812,15 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "megaparsec_5_1_2" = callPackage
+  "megaparsec_5_2_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, exceptions
      , hspec, hspec-expectations, mtl, QuickCheck, scientific, text
      , transformers
      }:
      mkDerivation {
        pname = "megaparsec";
-       version = "5.1.2";
-       sha256 = "ecb943979f8078a0f6e3bf8db2232d91cb1224768aa8ea0b8fc577af24b36ccd";
-       revision = "1";
-       editedCabalFile = "5286fd0b0f2edd01ca06e4cc1f814eedf81365c8b7b36cf3023128f75fadbc54";
+       version = "5.2.0";
+       sha256 = "c250a7ae2365e96df8f1061d28c7d04e5a1695395ea87055f36e3f3a57e90408";
        libraryHaskellDepends = [
          base bytestring containers deepseq exceptions mtl QuickCheck
          scientific text transformers
@@ -123244,6 +123501,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mintty" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "mintty";
+       version = "0.1";
+       sha256 = "956b346c89b12e683b957bf45eb0d09cae121fd247916de0386687f713ca0865";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/RyanGlScott/mintty";
+       description = "A reliable way to detect the presence of a MinTTY console on Windows";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "mios" = callPackage
     ({ mkDerivation, base, bytestring, ghc-prim, vector }:
      mkDerivation {
@@ -124106,8 +124375,8 @@ self: {
        pname = "monad-http";
        version = "0.1.0.0";
        sha256 = "a333b087835aa4902d0814e76fe4f32a523092fd7b13526aad415160a8317192";
-       revision = "3";
-       editedCabalFile = "7d244f8a4ef132e7af6de7d70223548c34b99805e8e45edad6ab091a1e664ff6";
+       revision = "4";
+       editedCabalFile = "14c2dd1a2de592a520efe1b743d98b6ecdaf71cd56fde036628f8c8f759fbf03";
        libraryHaskellDepends = [
          base base-compat bytestring exceptions http-client http-client-tls
          http-types monad-logger monadcryptorandom MonadRandom mtl text
@@ -126749,6 +127018,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "multivariant" = callPackage
+    ({ mkDerivation, base, containers, free, HUnit, invertible
+     , MonadRandom, profunctors, QuickCheck, semigroupoids, tasty
+     , tasty-hunit, tasty-quickcheck, text, transformers
+     }:
+     mkDerivation {
+       pname = "multivariant";
+       version = "0.1.0.1";
+       sha256 = "57278b97a88ecc9d8e2a4c58aee902393cf4a9dbaa500683568053ba60e06408";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers free HUnit invertible MonadRandom profunctors
+         QuickCheck semigroupoids tasty tasty-hunit tasty-quickcheck text
+         transformers
+       ];
+       executableHaskellDepends = [
+         base containers free HUnit invertible MonadRandom profunctors
+         QuickCheck semigroupoids tasty tasty-hunit tasty-quickcheck text
+         transformers
+       ];
+       testHaskellDepends = [
+         base containers free HUnit invertible MonadRandom profunctors
+         QuickCheck semigroupoids tasty tasty-hunit tasty-quickcheck text
+         transformers
+       ];
+       homepage = "https://bitbucket.org/gltronred/multivariant#readme";
+       description = "Multivariant assignments generation language";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "muon" = callPackage
     ({ mkDerivation, base, blaze-html, ConfigFile, directory, Glob
      , happstack-server, HStringTemplate, markdown, MissingH, process
@@ -128063,6 +128363,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "nat-sized-numbers" = callPackage
+    ({ mkDerivation, base, doctest, QuickCheck, smallcheck }:
+     mkDerivation {
+       pname = "nat-sized-numbers";
+       version = "0.1.0.0";
+       sha256 = "64b862c8e64ccd3d71dc62723dc84817f9b1aeea45818d535cca60575de34144";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest QuickCheck smallcheck ];
+       homepage = "https://github.com/oisdk/nat-sized-numbers#readme";
+       description = "Variable-sized numbers from type-level nats";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "nationstates" = callPackage
     ({ mkDerivation, base, bytestring, clock, containers, http-client
      , http-client-tls, http-types, multiset, tls, transformers, xml
@@ -134504,7 +134817,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "pandoc_1_19_2" = callPackage
+  "pandoc_1_19_2_1" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, base
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
      , cmark, containers, data-default, deepseq, Diff, directory
@@ -134519,8 +134832,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "1.19.2";
-       sha256 = "8a87110f60e6412a4cae68b27e1647d029b73bb7f1794a62a3477a0df1bbbbbc";
+       version = "1.19.2.1";
+       sha256 = "08692f3d77bf95bb9ba3407f7af26de7c23134e7efcdafad0bdaf9050e2c7801";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -134604,31 +134917,28 @@ self: {
      }) {};
 
   "pandoc-crossref" = callPackage
-    ({ mkDerivation, base, bytestring, containers, data-accessor
+    ({ mkDerivation, base, containers, data-accessor
      , data-accessor-template, data-accessor-transformers, data-default
-     , directory, filepath, hspec, mtl, pandoc, pandoc-types, process
-     , roman-numerals, syb, template-haskell, utility-ht, yaml
+     , directory, filepath, hspec, mtl, pandoc, pandoc-types
+     , roman-numerals, syb, template-haskell, utility-ht
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.2.4.1";
-       sha256 = "2aa2266ac3916677c18bd9a88b99f32622c22c983abaed3598020913ca3912ed";
+       version = "0.2.4.2";
+       sha256 = "fe1121698b9b9804f8ccc43cbbb2e77e40948caa543b42e129bf4ce872a7cd3f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers data-accessor data-accessor-template
+         base containers data-accessor data-accessor-template
          data-accessor-transformers data-default mtl pandoc pandoc-types
-         roman-numerals syb template-haskell utility-ht yaml
-       ];
-       executableHaskellDepends = [
-         base bytestring containers data-default mtl pandoc pandoc-types
-         yaml
+         roman-numerals syb template-haskell utility-ht
        ];
+       executableHaskellDepends = [ base pandoc pandoc-types ];
        testHaskellDepends = [
-         base bytestring containers data-accessor data-accessor-template
+         base containers data-accessor data-accessor-template
          data-accessor-transformers data-default directory filepath hspec
-         mtl pandoc pandoc-types process roman-numerals syb template-haskell
-         utility-ht yaml
+         mtl pandoc pandoc-types roman-numerals syb template-haskell
+         utility-ht
        ];
        description = "Pandoc filter for cross-references";
        license = stdenv.lib.licenses.gpl2;
@@ -139430,8 +139740,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-misc";
-       version = "0.2.0.1";
-       sha256 = "ef48d83421e90d2f13d8d90e1b7fcd34130eec0bbbefe635c0efa5a6c46b6a04";
+       version = "0.2.2.1";
+       sha256 = "9ff15e0ebcae6732eeff413a2fe9dfb33b07073eda54cfa1513a0ee0e2603c5f";
        libraryHaskellDepends = [
          base lens mtl pipes pipes-category pipes-concurrency semigroups stm
          transformers
@@ -141606,6 +141916,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "postgresql-binary_0_9_2" = callPackage
+    ({ mkDerivation, aeson, base, base-prelude, binary-parser
+     , bytestring, conversion, conversion-bytestring, conversion-text
+     , foldl, json-ast, loch-th, placeholders, postgresql-libpq
+     , QuickCheck, quickcheck-instances, rerebase, scientific, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text, time
+     , transformers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "postgresql-binary";
+       version = "0.9.2";
+       sha256 = "ba9df352bbfc0ee3dff91ef1462f1a3d676e5bac3a45ff3af5d765b7365b1d47";
+       libraryHaskellDepends = [
+         aeson base base-prelude binary-parser bytestring foldl loch-th
+         placeholders scientific text time transformers uuid vector
+       ];
+       testHaskellDepends = [
+         aeson conversion conversion-bytestring conversion-text json-ast
+         loch-th placeholders postgresql-libpq QuickCheck
+         quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
+         tasty-smallcheck
+       ];
+       homepage = "https://github.com/nikita-volkov/postgresql-binary";
+       description = "Encoders and decoders for the PostgreSQL's binary format";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "postgresql-config" = callPackage
     ({ mkDerivation, aeson, base, bytestring, monad-control, mtl
      , postgresql-simple, resource-pool, time
@@ -143656,19 +143994,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "profiteur_0_4_1_0" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, filepath
-     , js-jquery, text, unordered-containers, vector
+  "profiteur_0_4_2_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, filepath
+     , ghc-prof, js-jquery, scientific, text, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "profiteur";
-       version = "0.4.1.0";
-       sha256 = "c9e67c15761d06df8088cdbdfaf56a31f3b7b4c169e5c50418c8cd3a29fd8ef7";
+       version = "0.4.2.0";
+       sha256 = "eb1936c5b9db53695530ba6302fe6950dd8dc275628112b05b7902996f414b91";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         aeson attoparsec base bytestring filepath js-jquery text
-         unordered-containers vector
+         aeson base bytestring containers filepath ghc-prof js-jquery
+         scientific text unordered-containers vector
        ];
        homepage = "http://github.com/jaspervdj/profiteur";
        description = "Treemap visualiser for GHC prof files";
@@ -145744,8 +146083,8 @@ self: {
      }:
      mkDerivation {
        pname = "qif";
-       version = "1.1.0";
-       sha256 = "c0e432203b4b9bb3c225670e58aeee0cd75a83914f518e9b092e9980d3579f9a";
+       version = "1.1.1";
+       sha256 = "f7fea15fbf6c290e44d75bb60ca2187009febcda88da87c931abb136f5f4d22d";
        libraryHaskellDepends = [
          attoparsec base microlens microlens-th text time
        ];
@@ -146440,13 +146779,15 @@ self: {
      }) {};
 
   "quickcheck-special" = callPackage
-    ({ mkDerivation, base, bytestring, QuickCheck, scientific, text }:
+    ({ mkDerivation, base, bytestring, ieee754, QuickCheck, scientific
+     , text
+     }:
      mkDerivation {
        pname = "quickcheck-special";
-       version = "0.1.0.2";
-       sha256 = "3938d6992d9c269f0318cf247db4a9f472eb6f1e69d2e249fa8841ba92a19977";
+       version = "0.1.0.3";
+       sha256 = "8dbe5c2cdefb35880433902402110c1d9927b96d2363df8382fb6ee7e8d3e2f7";
        libraryHaskellDepends = [
-         base bytestring QuickCheck scientific text
+         base bytestring ieee754 QuickCheck scientific text
        ];
        homepage = "https://github.com/minad/quickcheck-special#readme";
        description = "Edge cases and special values for QuickCheck Arbitrary instances";
@@ -148958,6 +149299,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "rebase_1_0_8" = callPackage
+    ({ mkDerivation, base, base-prelude, bifunctors, bytestring
+     , containers, contravariant, contravariant-extras, deepseq, dlist
+     , either, fail, hashable, mtl, profunctors, scientific
+     , semigroupoids, semigroups, stm, text, time, transformers
+     , unordered-containers, uuid, vector, void
+     }:
+     mkDerivation {
+       pname = "rebase";
+       version = "1.0.8";
+       sha256 = "84d3a1f8e0663fa1f19f963b1a385ef12b0dcb41f8400b0fdda55e7cd7cfb8bd";
+       libraryHaskellDepends = [
+         base base-prelude bifunctors bytestring containers contravariant
+         contravariant-extras deepseq dlist either fail hashable mtl
+         profunctors scientific semigroupoids semigroups stm text time
+         transformers unordered-containers uuid vector void
+       ];
+       homepage = "https://github.com/nikita-volkov/rebase";
+       description = "A more progressive alternative to the \"base\" package";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rebindable" = callPackage
     ({ mkDerivation, base, data-default-class, indexed }:
      mkDerivation {
@@ -149925,28 +150289,31 @@ self: {
 
   "regex" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
-     , hashable, heredoc, hsyslog, regex-base, regex-pcre-builtin
-     , regex-tdfa, regex-tdfa-text, shelly, smallcheck, tasty
-     , tasty-hunit, tasty-smallcheck, template-haskell, text, time
-     , transformers, unordered-containers
+     , hashable, heredoc, regex-base, regex-pcre-builtin, regex-tdfa
+     , regex-tdfa-text, shelly, smallcheck, tasty, tasty-hunit
+     , tasty-smallcheck, template-haskell, text, time, transformers
+     , unordered-containers
      }:
      mkDerivation {
        pname = "regex";
-       version = "0.0.0.1";
-       sha256 = "16068310c4d27651f270bb8221d03860407fa2c13e128bd34dd561315362d183";
+       version = "0.0.0.2";
+       sha256 = "200695e102f2a698939833c35c6862bfa93803a5f4e22fa7ad40e76999ed2396";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         array base bytestring containers hashable heredoc hsyslog
-         regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text smallcheck
-         tasty tasty-hunit tasty-smallcheck template-haskell text time
+         array base bytestring containers hashable heredoc regex-base
+         regex-pcre-builtin regex-tdfa regex-tdfa-text smallcheck tasty
+         tasty-hunit tasty-smallcheck template-haskell text time
          transformers unordered-containers
        ];
        executableHaskellDepends = [
-         array base bytestring directory regex-base regex-tdfa shelly text
+         array base bytestring containers directory hashable heredoc
+         regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text shelly
+         smallcheck tasty tasty-hunit tasty-smallcheck template-haskell text
+         time transformers unordered-containers
        ];
        testHaskellDepends = [
-         array base bytestring containers directory hashable heredoc hsyslog
+         array base bytestring containers directory hashable heredoc
          regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text shelly
          smallcheck tasty tasty-hunit tasty-smallcheck template-haskell text
          time transformers unordered-containers
@@ -151746,8 +152113,8 @@ self: {
     ({ mkDerivation, rebase }:
      mkDerivation {
        pname = "rerebase";
-       version = "1.0.1.1";
-       sha256 = "44b023de5749713d04d43342dc94ca6562fc0e827e53ac3a8f1e62500b60463b";
+       version = "1.0.3";
+       sha256 = "63532e72cd0febdff280930658ad345e28f38c736a5391d5a313015e9942ffbe";
        libraryHaskellDepends = [ rebase ];
        homepage = "https://github.com/nikita-volkov/rerebase";
        description = "Reexports from \"base\" with a bunch of other standard libraries";
@@ -154874,14 +155241,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "sampling_0_3_1" = callPackage
+  "sampling_0_3_2" = callPackage
     ({ mkDerivation, base, containers, foldl, mwc-random, primitive
      , vector
      }:
      mkDerivation {
        pname = "sampling";
-       version = "0.3.1";
-       sha256 = "0bc2557dd64e4a933c9c6abab083e57b52508236c94d2151fd6890acc54e691b";
+       version = "0.3.2";
+       sha256 = "a66156e4600ffb15bde127a841251d49f2d0ff67a85e05961b91839b4769824e";
        libraryHaskellDepends = [
          base containers foldl mwc-random primitive vector
        ];
@@ -155299,15 +155666,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "sbv_5_14" = callPackage
+  "sbv_5_15" = callPackage
     ({ mkDerivation, array, async, base, base-compat, containers
      , crackNum, data-binary-ieee754, deepseq, directory, filepath, ghc
      , HUnit, mtl, old-time, pretty, process, QuickCheck, random, syb
      }:
      mkDerivation {
        pname = "sbv";
-       version = "5.14";
-       sha256 = "92dc71b96071162a47383c5f4833e8b78c2874009e671e2a6bc8de9707328e7e";
+       version = "5.15";
+       sha256 = "2364c29cb4cd20c8489e76689aa885072bf51faf2f60b208ec58be3d5ae5d719";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -156495,6 +156862,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) SDL2;};
 
+  "sdl2_2_1_3_1" = callPackage
+    ({ mkDerivation, base, bytestring, exceptions, linear, SDL2
+     , StateVar, text, transformers, vector
+     }:
+     mkDerivation {
+       pname = "sdl2";
+       version = "2.1.3.1";
+       sha256 = "788a7f1e2bb08e393b806d9f700f62234703ec85b772e0e25ff740b4aafaae14";
+       libraryHaskellDepends = [
+         base bytestring exceptions linear StateVar text transformers vector
+       ];
+       librarySystemDepends = [ SDL2 ];
+       libraryPkgconfigDepends = [ SDL2 ];
+       description = "Both high- and low-level bindings to the SDL library (version 2.0.2+).";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) SDL2;};
+
   "sdl2-cairo" = callPackage
     ({ mkDerivation, base, cairo, linear, mtl, random, sdl2, time }:
      mkDerivation {
@@ -156685,6 +157070,47 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "seakale" = callPackage
+    ({ mkDerivation, base, bytestring, free, mtl, text }:
+     mkDerivation {
+       pname = "seakale";
+       version = "0.1.0.0";
+       sha256 = "c1aebae23aaa611db361eb2327fba0d90b3559d5ab8702417696e80c6e6254ea";
+       libraryHaskellDepends = [ base bytestring free mtl text ];
+       description = "Pure SQL layer on top of other libraries";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "seakale-postgresql" = callPackage
+    ({ mkDerivation, base, bytestring, free, mtl, postgresql-libpq
+     , seakale, time
+     }:
+     mkDerivation {
+       pname = "seakale-postgresql";
+       version = "0.1.0.0";
+       sha256 = "b8557deb006934cd605eabcf1a00c0c9ab4492490f140df22eef3e38a8d21752";
+       libraryHaskellDepends = [
+         base bytestring free mtl postgresql-libpq seakale time
+       ];
+       description = "PostgreSQL backend for Seakale";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "seakale-tests" = callPackage
+    ({ mkDerivation, base, bytestring, free, mtl, recursion-schemes
+     , seakale
+     }:
+     mkDerivation {
+       pname = "seakale-tests";
+       version = "0.1.0.0";
+       sha256 = "bbd5c83a6335dca7f06bf8b7943e80bd3186530ff621d25b00b3a8a3950cec52";
+       libraryHaskellDepends = [
+         base bytestring free mtl recursion-schemes seakale
+       ];
+       description = "Helpers to test code using Seakale";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "seal-module" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -157791,27 +158217,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant_0_9_1_1" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
-     , case-insensitive, directory, doctest, filemanip, filepath, hspec
-     , http-api-data, http-media, http-types, mmorph, mtl, network-uri
-     , QuickCheck, quickcheck-instances, string-conversions, text, url
-     , vault
+  "servant_0_10" = callPackage
+    ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat
+     , bytestring, Cabal, case-insensitive, directory, doctest
+     , filemanip, filepath, hspec, http-api-data, http-media, http-types
+     , mmorph, mtl, natural-transformation, network-uri, QuickCheck
+     , quickcheck-instances, string-conversions, text, url, vault
      }:
      mkDerivation {
        pname = "servant";
-       version = "0.9.1.1";
-       sha256 = "fb3372f676ab07dfab1695ccd0e23d98c948318f4b4d5ae827a6fa5284c4e5fa";
-       revision = "1";
-       editedCabalFile = "a9be93ef6e6464dc76f4572fe372095b9e77fdbaf92966569b5a50ee4829de4d";
+       version = "0.10";
+       sha256 = "e1daa9ba2b759615341345a17a95833729ae3200af12dacec07507a95a4b331e";
+       setupHaskellDepends = [ base Cabal directory filepath ];
        libraryHaskellDepends = [
          aeson attoparsec base base-compat bytestring case-insensitive
-         http-api-data http-media http-types mmorph mtl network-uri
-         string-conversions text vault
+         http-api-data http-media http-types mmorph mtl
+         natural-transformation network-uri string-conversions text vault
        ];
        testHaskellDepends = [
-         aeson attoparsec base base-compat bytestring directory doctest
-         filemanip filepath hspec QuickCheck quickcheck-instances
+         aeson aeson-compat attoparsec base base-compat bytestring directory
+         doctest filemanip filepath hspec QuickCheck quickcheck-instances
          string-conversions text url
        ];
        homepage = "http://haskell-servant.readthedocs.org/";
@@ -157909,26 +158334,23 @@ self: {
      }) {};
 
   "servant-auth-cookie" = callPackage
-    ({ mkDerivation, base, base-compat, base64-bytestring
-     , blaze-builder, blaze-html, blaze-markup, bytestring, cereal
-     , cookie, cryptonite, data-default, deepseq, exceptions, hspec
-     , http-api-data, http-media, http-types, memory, mtl, QuickCheck
-     , servant, servant-blaze, servant-server, tagged, text, time
-     , transformers, wai, warp
+    ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
+     , cereal, cookie, cryptonite, data-default, deepseq, exceptions
+     , hspec, http-api-data, http-types, memory, mtl, QuickCheck
+     , servant, servant-server, tagged, time, transformers, wai
      }:
      mkDerivation {
        pname = "servant-auth-cookie";
-       version = "0.4.2.1";
-       sha256 = "830df7c6d14345b6ff8e869354388f6242b75abe371265e5f1e414427a88fed3";
+       version = "0.4.3.1";
+       sha256 = "c4ea750d6f7ab768e16f212ae7b0f76b98db43021d62736ebd2996b4d92809c1";
        libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring cereal cookie
          cryptonite data-default exceptions http-api-data http-types memory
          mtl servant servant-server tagged time transformers wai
        ];
        testHaskellDepends = [
-         base base-compat blaze-html blaze-markup bytestring cereal
-         cryptonite data-default deepseq hspec http-api-data http-media mtl
-         QuickCheck servant servant-blaze servant-server text time wai warp
+         base bytestring cereal cryptonite data-default deepseq hspec
+         QuickCheck servant-server time
        ];
        description = "Authentication via encrypted cookies";
        license = stdenv.lib.licenses.bsd3;
@@ -158001,8 +158423,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-server";
-       version = "0.2.1.0";
-       sha256 = "0f9e848300a916de0892c55a8b530a02d3fc8bcbc7983012780355a88e266c84";
+       version = "0.2.2.0";
+       sha256 = "ffec3373f25cabc2b182ea7226fff9e43a151c02e603780e5848a5ea03ee48b4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -158077,8 +158499,8 @@ self: {
        pname = "servant-blaze";
        version = "0.7.1";
        sha256 = "90ed1c7a22b83bee344ef3896203f3699b7633bf986ffa064752c3596c072646";
-       revision = "3";
-       editedCabalFile = "9f4f41889ae9722c92c87cf84de89c3c00d48a37749797fa04a74fba7db5a5ef";
+       revision = "4";
+       editedCabalFile = "cae733c4dbe8faa35b4f8fdfc5984ef6c01c653c056c799f7fd225a54c9b9b9f";
        libraryHaskellDepends = [ base blaze-html http-media servant ];
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "Blaze-html support for servant";
@@ -158091,8 +158513,8 @@ self: {
        pname = "servant-cassava";
        version = "0.8";
        sha256 = "5d9b85f7dc2fc42c7fe47bf92e4502e4ff5dde03724a6ee6ab20887524dce4fb";
-       revision = "1";
-       editedCabalFile = "56c74c61929917f3f9a662638f9759f92fed2ce0ef49b8fcc8090651f7f854b0";
+       revision = "2";
+       editedCabalFile = "4b6443d2de0087bed78cd5a0238b7483c5ef75dc72ecac43a45d47522134857a";
        libraryHaskellDepends = [ base cassava http-media servant vector ];
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "Servant CSV content-type for cassava";
@@ -158127,30 +158549,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-client_0_9_1_1" = callPackage
+  "servant-client_0_10" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat
-     , base64-bytestring, bytestring, deepseq, exceptions, hspec
-     , http-api-data, http-client, http-client-tls, http-media
-     , http-types, HUnit, mtl, network, network-uri, QuickCheck, safe
-     , servant, servant-server, string-conversions, text, transformers
+     , base64-bytestring, bytestring, deepseq, exceptions, generics-sop
+     , hspec, http-api-data, http-client, http-client-tls, http-media
+     , http-types, HUnit, monad-control, mtl, network, network-uri
+     , QuickCheck, safe, semigroupoids, servant, servant-server
+     , string-conversions, text, transformers, transformers-base
      , transformers-compat, wai, warp
      }:
      mkDerivation {
        pname = "servant-client";
-       version = "0.9.1.1";
-       sha256 = "6e085faa1a8ecab076ffdec61b97b6e7c8fff7eb18a9a4cf3538c26b7b99c724";
-       revision = "1";
-       editedCabalFile = "d3ac72d1b11dd6ebf86076237d8ffab3b87e8b6f04d2af1b28a2c5506faa82c5";
+       version = "0.10";
+       sha256 = "55e411ac7e38a5c1b77d8d3c2320369be36a7b7181e27bb5ac4fba308ef93eaa";
        libraryHaskellDepends = [
          aeson attoparsec base base-compat base64-bytestring bytestring
-         exceptions http-api-data http-client http-client-tls http-media
-         http-types mtl network-uri safe servant string-conversions text
-         transformers transformers-compat
+         exceptions generics-sop http-api-data http-client http-client-tls
+         http-media http-types monad-control mtl network-uri safe
+         semigroupoids servant string-conversions text transformers
+         transformers-base transformers-compat
        ];
        testHaskellDepends = [
-         aeson base base-compat bytestring deepseq hspec http-api-data
-         http-client http-media http-types HUnit network QuickCheck servant
-         servant-server text transformers transformers-compat wai warp
+         aeson base base-compat bytestring deepseq generics-sop hspec
+         http-api-data http-client http-media http-types HUnit mtl network
+         QuickCheck servant servant-server text transformers
+         transformers-compat wai warp
        ];
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "automatical derivation of querying functions for servant webservices";
@@ -158244,20 +158667,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "servant-docs_0_9_1_1" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring
+  "servant-docs_0_10" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
      , case-insensitive, control-monad-omega, hashable, hspec
      , http-media, http-types, lens, servant, string-conversions, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "servant-docs";
-       version = "0.9.1.1";
-       sha256 = "7c4205d25caa926355221e62842c3e58337d05022b1e4341045ac385e568bc79";
+       version = "0.10";
+       sha256 = "0a471acc5a292ed48be2c7f1a22e15c5685c1a1049f99834a56619d7c836603b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring case-insensitive
+         aeson aeson-pretty base base-compat bytestring case-insensitive
          control-monad-omega hashable http-media http-types lens servant
          string-conversions text unordered-containers
        ];
@@ -158297,6 +158720,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-ekg" = callPackage
+    ({ mkDerivation, aeson, base, ekg, ekg-core, hspec, http-client
+     , http-types, process, servant, servant-client, servant-server
+     , text, time, transformers, unordered-containers, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-ekg";
+       version = "0.2.0.0";
+       sha256 = "02b54e60e87e5a6c9879fdd1f9a7924b1d16c667b81464d8f3b9ec1c7d693ab3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base ekg-core http-types servant text time unordered-containers wai
+       ];
+       executableHaskellDepends = [
+         aeson base ekg ekg-core process servant-server text wai warp
+       ];
+       testHaskellDepends = [
+         aeson base ekg ekg-core hspec http-client servant servant-client
+         servant-server text transformers unordered-containers wai warp
+       ];
+       description = "Helpers for using ekg with servant";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-elm" = callPackage
     ({ mkDerivation, aeson, base, Diff, elm-export, hspec, HUnit, lens
      , servant, servant-foreign, text, wl-pprint-text
@@ -158508,8 +158956,8 @@ self: {
        pname = "servant-lucid";
        version = "0.7.1";
        sha256 = "ec26ba7d159b09be10beacf6242f6ae1bd111e9c738bfbf3cf2f560f48e0fe40";
-       revision = "3";
-       editedCabalFile = "4bb81e61336f3e3a91d3c920937beeee49a178c53d391172c07bb847a68cdbe5";
+       revision = "4";
+       editedCabalFile = "ea04cd0d0f11bbe4ea55608a7a38013d9da6373f25b2cad1e03dfb2c5c83fe18";
        libraryHaskellDepends = [ base http-media lucid servant ];
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "Servant support for lucid";
@@ -158566,6 +159014,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-mock_0_8_1_2" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, bytestring-conversion
+     , hspec, hspec-wai, http-types, QuickCheck, servant, servant-server
+     , transformers, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-mock";
+       version = "0.8.1.2";
+       sha256 = "2a65e62112551633d7d9b1372129b043b0cc35e13960b8222f122d206931d117";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring http-types QuickCheck servant servant-server
+         transformers wai
+       ];
+       executableHaskellDepends = [
+         aeson base QuickCheck servant-server warp
+       ];
+       testHaskellDepends = [
+         aeson base bytestring-conversion hspec hspec-wai QuickCheck servant
+         servant-server wai
+       ];
+       homepage = "http://haskell-servant.readthedocs.org/";
+       description = "Derive a mock server for free from your servant API types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-pandoc" = callPackage
     ({ mkDerivation, base, bytestring, http-media, lens, pandoc-types
      , servant-docs, text, unordered-containers
@@ -158783,36 +159259,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-server_0_9_1_1" = callPackage
+  "servant-server_0_10" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat
-     , base64-bytestring, bytestring, containers, directory, doctest
-     , exceptions, filemanip, filepath, hspec, hspec-wai, http-api-data
-     , http-types, mtl, network, network-uri, parsec, QuickCheck, safe
-     , servant, should-not-typecheck, split, string-conversions
-     , system-filepath, temporary, text, transformers
+     , base64-bytestring, bytestring, Cabal, containers, directory
+     , doctest, exceptions, filemanip, filepath, hspec, hspec-wai
+     , http-api-data, http-types, monad-control, mtl, network
+     , network-uri, parsec, QuickCheck, resourcet, safe, servant
+     , should-not-typecheck, split, string-conversions, system-filepath
+     , temporary, text, transformers, transformers-base
      , transformers-compat, wai, wai-app-static, wai-extra, warp, word8
      }:
      mkDerivation {
        pname = "servant-server";
-       version = "0.9.1.1";
-       sha256 = "1e0683557ece1f7a8a7b11e5c7cd1fd042783777157d95a67e28a0518c91bdd1";
-       revision = "1";
-       editedCabalFile = "0fd5137ad4ab43f5a6fde1a944eb23ce6d75c42fb909e4a82b579ab1c3739771";
+       version = "0.10";
+       sha256 = "99d14d23ea67832401b4bca7e5cb75b8c557e6dc7a8f38870c3b9d701179073d";
        isLibrary = true;
        isExecutable = true;
+       setupHaskellDepends = [ base Cabal directory filepath ];
        libraryHaskellDepends = [
          aeson attoparsec base base-compat base64-bytestring bytestring
-         containers filepath http-api-data http-types mtl network
-         network-uri safe servant split string-conversions system-filepath
-         text transformers transformers-compat wai wai-app-static warp word8
+         containers exceptions filepath http-api-data http-types
+         monad-control mtl network network-uri resourcet safe servant split
+         string-conversions system-filepath text transformers
+         transformers-base transformers-compat wai wai-app-static warp word8
        ];
        executableHaskellDepends = [ aeson base servant text wai warp ];
        testHaskellDepends = [
          aeson base base-compat base64-bytestring bytestring directory
          doctest exceptions filemanip filepath hspec hspec-wai http-types
-         mtl network parsec QuickCheck safe servant should-not-typecheck
-         string-conversions temporary text transformers transformers-compat
-         wai wai-extra warp
+         mtl network parsec QuickCheck resourcet safe servant
+         should-not-typecheck string-conversions temporary text transformers
+         transformers-compat wai wai-extra warp
        ];
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "A family of combinators for defining webservices APIs and serving them";
@@ -158937,6 +159414,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-swagger_1_1_2_1" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, bytestring, Cabal
+     , cabal-doctest, directory, doctest, filepath, hspec, http-media
+     , insert-ordered-containers, lens, QuickCheck, servant, swagger2
+     , text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "servant-swagger";
+       version = "1.1.2.1";
+       sha256 = "302ab03af773ddb3b0a4949b62ca79b81c206a3838864c9ed35cb4e40360f961";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         aeson base bytestring hspec http-media insert-ordered-containers
+         lens QuickCheck servant swagger2 text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base directory doctest filepath hspec lens
+         QuickCheck servant swagger2 text time
+       ];
+       homepage = "https://github.com/haskell-servant/servant-swagger";
+       description = "Generate Swagger specification for your servant API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-swagger-ui" = callPackage
     ({ mkDerivation, aeson, base, base-compat, blaze-markup, bytestring
      , directory, file-embed, filepath, http-media, lens, servant
@@ -158976,8 +159478,8 @@ self: {
        pname = "servant-yaml";
        version = "0.1.0.0";
        sha256 = "c917d9b046b06a9c4386f743a78142c27cf7f0ec1ad8562770ab9828f2ee3204";
-       revision = "12";
-       editedCabalFile = "a8bcb29afce01078d5f6b71503ad0d7d03356a9ebeffb4ec09719a324c314519";
+       revision = "13";
+       editedCabalFile = "dba651f8c89c721a27427895340c9cf6e118ad0f752ca3cd275295a601e58573";
        libraryHaskellDepends = [
          base bytestring http-media servant yaml
        ];
@@ -162163,8 +162665,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting";
-       version = "0.1.1.2";
-       sha256 = "fb4ae79689b64d0749c6de9e16bcd9a31d8195b8ff4945b8e5bfa54140cfb0cf";
+       version = "0.1.1.4";
+       sha256 = "59323288062233fcd38fb6409b3565dd6ee1b2f676d21d56695bca5b35f3b2db";
        libraryHaskellDepends = [
          aeson base blaze-html bytestring case-insensitive containers
          directory filepath hxt mtl regex-pcre-builtin safe text utf8-string
@@ -166018,8 +166520,8 @@ self: {
      }:
      mkDerivation {
        pname = "sproxy2";
-       version = "1.93.0";
-       sha256 = "162c72464a0e4d77201db79ed332d14832a8a145c19246aa64b7156360aadcc9";
+       version = "1.94.0";
+       sha256 = "3affef81be078269b7acbfa761d2e1fde761ee7b4e4fe6182a67e7278ae4a2cb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -176379,8 +176881,8 @@ self: {
      }:
      mkDerivation {
        pname = "threepenny-gui";
-       version = "0.7.0.0";
-       sha256 = "287704d0943895b653381d2546acd3076b477d1ab4be78baaa88cbe816c7156e";
+       version = "0.7.0.1";
+       sha256 = "b5802dbb6c43304d613373f464d6fd16a4f219a5d289be003a28c2c46cae44c8";
        libraryHaskellDepends = [
          aeson async base bytestring containers data-default deepseq
          filepath hashable network-uri safe snap-core snap-server stm
@@ -176409,20 +176911,22 @@ self: {
      }) {};
 
   "thrift" = callPackage
-    ({ mkDerivation, attoparsec, base, binary, bytestring, containers
-     , ghc-prim, hashable, HTTP, network, network-uri, QuickCheck, split
-     , text, unordered-containers, vector
+    ({ mkDerivation, attoparsec, base, base64-bytestring, binary
+     , bytestring, containers, ghc-prim, hashable, hspec, HTTP, network
+     , network-uri, QuickCheck, split, text, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "thrift";
-       version = "0.9.3";
-       sha256 = "dd2cfeec5f6a7142407ccc5d361afc6c45e5c50813e4246ed91137efc5cfbe9f";
-       revision = "1";
-       editedCabalFile = "13842801b74f89050d801a7a9b3b535b27046d3ae5bde986456aeeb46c236777";
+       version = "0.10.0";
+       sha256 = "6706e64419eee8579b9e9330d8c210211c87c86e02c19a3ca856db47cc8c7d07";
        libraryHaskellDepends = [
-         attoparsec base binary bytestring containers ghc-prim hashable HTTP
-         network network-uri QuickCheck split text unordered-containers
-         vector
+         attoparsec base base64-bytestring binary bytestring containers
+         ghc-prim hashable HTTP network network-uri QuickCheck split text
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base bytestring hspec QuickCheck unordered-containers
        ];
        homepage = "http://thrift.apache.org";
        description = "Haskell bindings for the Apache Thrift RPC system";
@@ -179192,6 +179696,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "trifecta_1_6_2_1" = callPackage
+    ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base
+     , blaze-builder, blaze-html, blaze-markup, bytestring, charset
+     , comonad, containers, deepseq, directory, doctest, filepath
+     , fingertree, ghc-prim, hashable, lens, mtl, parsers, profunctors
+     , QuickCheck, reducers, semigroups, transformers
+     , unordered-containers, utf8-string
+     }:
+     mkDerivation {
+       pname = "trifecta";
+       version = "1.6.2.1";
+       sha256 = "bab3724de8ed4f5283deb99013debf2e223e9e2c3c975e7d9b9bd44a9b30fbe5";
+       libraryHaskellDepends = [
+         ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html
+         blaze-markup bytestring charset comonad containers deepseq
+         fingertree ghc-prim hashable lens mtl parsers profunctors reducers
+         semigroups transformers unordered-containers utf8-string
+       ];
+       testHaskellDepends = [
+         base directory doctest filepath parsers QuickCheck
+       ];
+       homepage = "http://github.com/ekmett/trifecta/";
+       description = "A modern parser combinator library with convenient diagnostics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "trimpolya" = callPackage
     ({ mkDerivation, base, bio, bytestring, simpleargs }:
      mkDerivation {
@@ -181338,8 +181869,8 @@ self: {
      }:
      mkDerivation {
        pname = "tz";
-       version = "0.1.2.0";
-       sha256 = "b501251a446d4fe544617eaa41e2442f283f8843dd57d52820d88a9e2ce04d70";
+       version = "0.1.2.1";
+       sha256 = "d187f59e0c1bb452a70cf734de09e0beefb86a6bcbb48f36fc5b32f11727c492";
        libraryHaskellDepends = [
          base binary bytestring containers data-default deepseq
          template-haskell time tzdata vector
@@ -181375,6 +181906,28 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "tzdata_0_1_20161123_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, HUnit
+     , test-framework, test-framework-hunit, test-framework-th, unix
+     , vector
+     }:
+     mkDerivation {
+       pname = "tzdata";
+       version = "0.1.20161123.0";
+       sha256 = "cb99701d6b3ef7a286a9b15dd4fa3ed023917afeaebf4e90be7d9934464dccb6";
+       libraryHaskellDepends = [
+         base bytestring containers deepseq vector
+       ];
+       testHaskellDepends = [
+         base bytestring HUnit test-framework test-framework-hunit
+         test-framework-th unix
+       ];
+       homepage = "https://github.com/nilcons/haskell-tzdata";
+       description = "Time zone database (as files and as a module)";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "u2f" = callPackage
     ({ mkDerivation, aeson, asn1-encoding, asn1-types, base
      , base64-bytestring, binary, bytestring, cryptohash, cryptonite
@@ -185173,8 +185726,8 @@ self: {
     ({ mkDerivation, base, deepseq, finite-typelits, vector }:
      mkDerivation {
        pname = "vector-sized";
-       version = "0.5.0.0";
-       sha256 = "55bb88f7201571b19b55f7ac1d1b2a880ad77b9178593bac84cad58c2dbce22b";
+       version = "0.5.1.0";
+       sha256 = "2116bd082413e6b3ceb2290ac7d3aa2affcbfc76c7bebe22fbbf58e562369ae5";
        libraryHaskellDepends = [ base deepseq finite-typelits vector ];
        homepage = "http://github.com/expipiplus1/vector-sized#readme";
        description = "Size tagged vectors";
@@ -185240,15 +185793,15 @@ self: {
      }:
      mkDerivation {
        pname = "vector-split";
-       version = "1.0.0.0";
-       sha256 = "fda8504ecf87abddaec1fee84d746ed6925e5076ea8f02bcea296a78821b2bdc";
+       version = "1.0.0.2";
+       sha256 = "b4aeeea50fec52e594b2d3c05aca3a112b2095d1e5238ced065cecf2d89bbd16";
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [
          base QuickCheck split tasty tasty-quickcheck vector
        ];
-       homepage = "https://github.com/fhaust/vector-split#readme";
-       description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       homepage = "https://github.com/fhaust/vector-split";
+       description = "Combinator library for splitting vectors";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "vector-static" = callPackage
@@ -192223,18 +192776,17 @@ self: {
      }) {};
 
   "xmonad-vanessa" = callPackage
-    ({ mkDerivation, base, containers, process, tibetan-utils, X11
-     , xmonad, xmonad-contrib, xmonad-extras
+    ({ mkDerivation, base, containers, process, X11, xmonad
+     , xmonad-contrib, xmonad-extras
      }:
      mkDerivation {
        pname = "xmonad-vanessa";
-       version = "0.1.0.1";
-       sha256 = "795192ea6b9510512dd0e7cb1959b6d070089e0fd5c6896218f17af893447290";
+       version = "0.1.0.2";
+       sha256 = "40c23ebf4725488ef6548df811f7fe435d43860d6722cbb8bd59a4ea12f7c647";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers process tibetan-utils X11 xmonad xmonad-contrib
-         xmonad-extras
+         base containers process X11 xmonad xmonad-contrib xmonad-extras
        ];
        executableHaskellDepends = [ base ];
        homepage = "https://github.com/vmchale/xmonad-vanessa#readme";
@@ -193747,22 +194299,18 @@ self: {
      }) {};
 
   "yesod-bootstrap" = callPackage
-    ({ mkDerivation, base, blaze-html, blaze-markup, conduit
-     , conduit-extra, containers, either, email-validate
-     , lens-family-core, lens-family-th, MonadRandom, mtl, persistent
-     , shakespeare, text, time, transformers, yaml, yesod-core
-     , yesod-form, yesod-markdown
+    ({ mkDerivation, base, blaze-html, blaze-markup, bootstrap-types
+     , shakespeare, text, transformers, yesod-core, yesod-elements
      }:
      mkDerivation {
        pname = "yesod-bootstrap";
-       version = "0.3";
-       sha256 = "e40a9276089146ebfdf2a95b2bc3372b1dca7fb29d9d269b39dd3f4528d3ed01";
+       version = "0.4";
+       sha256 = "8c5dbaa3aff6b2ab67fa98654daf4a885e03e4f8a380b461f5f3333871a92a91";
        libraryHaskellDepends = [
-         base blaze-html blaze-markup conduit conduit-extra containers
-         either email-validate lens-family-core lens-family-th MonadRandom
-         mtl persistent shakespeare text time transformers yaml yesod-core
-         yesod-form yesod-markdown
+         base blaze-html blaze-markup bootstrap-types shakespeare text
+         transformers yesod-core yesod-elements
        ];
+       homepage = "https://github.com/andrewthad/haskell-bootstrap";
        description = "Bootstrap widgets for yesod";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -193771,8 +194319,8 @@ self: {
     ({ mkDerivation, base, colonnade, text, yesod-core }:
      mkDerivation {
        pname = "yesod-colonnade";
-       version = "0.1";
-       sha256 = "5e98908136715fadc3f46153bcc99c559affef85ed64bcde4bd2314e962dca79";
+       version = "0.2";
+       sha256 = "92a36ab103779aa8a541910456899fae8e8df6f4da27524200b54134c4b26a21";
        libraryHaskellDepends = [ base colonnade text yesod-core ];
        homepage = "https://github.com/andrewthad/colonnade#readme";
        description = "Helper functions for using yesod with colonnade";

From b5a1783be79d2763c9e161b4e119e186bc6d1d26 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 1 Feb 2017 14:57:16 +0100
Subject: [PATCH 276/899] haskell-servant: update overrides for version 0.10

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 5b8df262877..0266cbe5a37 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1097,13 +1097,13 @@ self: super: {
   http-api-data_0_3_5 = dontCheck super.http-api-data_0_3_5;
 
   # Fix build for latest versions of servant and servant-client.
-  servant_0_9_1_1 = super.servant_0_9_1_1.overrideScope (self: super: {
+  servant_0_10 = super.servant_0_10.overrideScope (self: super: {
     http-api-data = self.http-api-data_0_3_5;
   });
-  servant-client_0_9_1_1 = super.servant-client_0_9_1_1.overrideScope (self: super: {
+  servant-client_0_10 = super.servant-client_0_10.overrideScope (self: super: {
     http-api-data = self.http-api-data_0_3_5;
-    servant-server = self.servant-server_0_9_1_1;
-    servant = self.servant_0_9_1_1;
+    servant-server = self.servant-server_0_10;
+    servant = self.servant_0_10;
   });
 
   # build servant docs from the repository

From 0a756a421623c2eefa35aab735850632ee463ae5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 2 Feb 2017 11:04:49 +0100
Subject: [PATCH 277/899] asymptote: 2.38 -> 2.39

---
 pkgs/tools/graphics/asymptote/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index 2d73a268038..b090ceca02b 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -8,11 +8,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="asymptote";
-    version="2.38";
+    version="2.39";
     name="${baseName}-${version}";
-    hash="1dxwvq0xighqckkjkjva8s0igxfgy1j25z81pbwvlz6jzsrxpip9";
-    url="mirror://sourceforge/project/asymptote/2.38/asymptote-2.38.src.tgz";
-    sha256="1dxwvq0xighqckkjkjva8s0igxfgy1j25z81pbwvlz6jzsrxpip9";
+    hash="187q81yw06x4gv2spfn0hcs1064ym3a8l6mdgawymfhqd60yhrs3";
+    url="https://netcologne.dl.sourceforge.net/project/asymptote/2.39/asymptote-2.39.src.tgz";
+    sha256="187q81yw06x4gv2spfn0hcs1064ym3a8l6mdgawymfhqd60yhrs3";
   };
   buildInputs = [
    ghostscriptX imagemagick fftw

From c726f790234e41ff64e4e7664cdb0521917b0125 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 2 Feb 2017 11:05:04 +0100
Subject: [PATCH 278/899] glusterfs: 3.9.0 -> 3.9.1

---
 pkgs/tools/filesystems/glusterfs/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 5f56b52ea26..e81c3768b25 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -6,11 +6,11 @@ let
   s = # Generated upstream information 
   rec {
     baseName="glusterfs";
-    version="3.9.0";
+    version="3.9.1";
     name="${baseName}-${version}";
-    hash="057vq4f93f1g9sh1sfbqhccsprxrbhwwm898322x25sb8mscc5xl";
-    url="http://download.gluster.org/pub/gluster/glusterfs/3.9/3.9.0/glusterfs-3.9.0.tar.gz";
-    sha256="057vq4f93f1g9sh1sfbqhccsprxrbhwwm898322x25sb8mscc5xl";
+    hash="02p3i1zr0i2fhjhz64wvhdn0z7b6b3hkiqz1bkyhracncspxnvw9";
+    url="http://download.gluster.org/pub/gluster/glusterfs/3.9/3.9.1/glusterfs-3.9.1.tar.gz";
+    sha256="02p3i1zr0i2fhjhz64wvhdn0z7b6b3hkiqz1bkyhracncspxnvw9";
   };
   buildInputs = [
     fuse bison flex_2_5_35 openssl python2 ncurses readline

From 2973d35b9acf8aafd90dce489c2a15b3a1527fec Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 2 Feb 2017 11:05:21 +0100
Subject: [PATCH 279/899] sysdig: 0.13.0 -> 0.14.0

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

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index abe1388e9a5..343e4e80955 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -2,14 +2,14 @@
 let
   inherit (stdenv.lib) optional optionalString;
   baseName = "sysdig";
-  version = "0.13.0";
+  version = "0.14.0";
 in
 stdenv.mkDerivation {
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "https://github.com/draios/sysdig/archive/${version}.tar.gz";
-    sha256 = "0ghxj473v471nnry8h9accxpwwjp8nbzkgw8dniqld0ixx678pia";
+    sha256 = "14wy4p1q8rk3q4s8vczfhkk20z3kz8wvyxpi8qx0xc7px7z5da76";
   };
 
   buildInputs = [
@@ -19,12 +19,6 @@ stdenv.mkDerivation {
   hardeningDisable = [ "pic" ];
 
   patches = [
-    # patch for linux >= 4.9.1
-    # is included in the next release
-    (fetchpatch {
-      url = "https://github.com/draios/sysdig/commit/68823ffd3a76f88ad34c3d0d9f6fdf1ada0eae43.patch";
-      sha256 = "02vgyd70mwrk6mcdkacaahk49irm6vxzqb7dfickk6k32lh3m44k";
-    })
   ];
 
   postPatch = ''

From c7ad684ab55f0aece1aeba8d850b6f207deeb71c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 2 Feb 2017 11:10:05 +0100
Subject: [PATCH 280/899] mcabber: 1.0.4 -> 1.0.5

---
 .../networking/instant-messengers/mcabber/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
index ca752ccf826..2bb0d957942 100644
--- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "mcabber-${version}";
-  version = "1.0.4";
+  version = "1.0.5";
 
   src = fetchurl {
     url = "http://mcabber.com/files/mcabber-${version}.tar.bz2";
-    sha256 = "02nfn5r7cjpnacym95l6bvczii232v3x2gi79gfa9syc7w0brdk3";
+    sha256 = "0ixdzk5b3s31a4bdfqgqrsiq7vbgdzhqr49p9pz9cq9bgn0h1wm0";
   };
 
   buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ];

From 57e7f8ff66d77859db117bcdd8a3ff5eca529545 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 2 Feb 2017 11:10:54 +0100
Subject: [PATCH 281/899] libgphoto2: 2.5.11 -> 2.5.12

---
 pkgs/development/libraries/libgphoto2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix
index 6a7b747f7f9..c498871956a 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
     owner = "gphoto";
     repo = "libgphoto2";
     rev = "${meta.tag}";
-    sha256 = "01nirw0xb8fjjv0jz88bmddv26bgg82w1wg65q51iblmy9z8azfh";
+    sha256 = "0chwnw3d2d1k8g4xidzkpy9f3ci30yz7yvxq1mipp2rbndl1y2am";
   };
 
   patches = [];
@@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
       MTP, and other vendor specific protocols for controlling and transferring data
       from digital cameras.
     '';
-    version = "2.5.11";
-    tag = "libgphoto2-2_5_11-release";
+    version = "2.5.12";
+    tag = "libgphoto2-2_5_12-release";
     # XXX: the homepage claims LGPL, but several src files are lgpl21Plus
     license = stdenv.lib.licenses.lgpl21Plus;
     platforms = with stdenv.lib.platforms; unix;

From 5e753c1a65e106ffaeb71ad3fa66a13b2dfaf5d5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 2 Feb 2017 11:09:40 +0100
Subject: [PATCH 282/899] imagemagick: 6.9.7-0 -> 6.9.7-6 for multiple CVEs

Fixes at least:

  * CVE-2016-10144
  * CVE-2016-10145
  * CVE-2016-10146
  * CVE-2017-5506
  * CVE-2017-5507
  * CVE-2017-5508
  * CVE-2017-5510
  * CVE-2017-5511
---
 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 3364a661e0c..58a88e89681 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -12,8 +12,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "6.9.7-0";
-    sha256 = "0c6ff1am2mhc0dc26h50l78yx6acwqymwpwgkxgx69cb6jfpwrdx";
+    version = "6.9.7-6";
+    sha256 = "17pc3xz8srb9g5a5gkk6q9sjiss77fgm0wxxfmb5qya4rqivjpzn";
     patches = [];
   }
     # Freeze version on mingw so we don't need to port the patch too often.

From 4dae4f86faed8150a922dd9ee618d7d937b155ac Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 2 Feb 2017 11:10:56 +0100
Subject: [PATCH 283/899] imagemagick: 7.0.4-0 -> 7.0.4-6 for multiple CVEs

Fixes at least:

  * CVE-2016-10144
  * CVE-2016-10145
  * CVE-2016-10146
  * CVE-2017-5506
  * CVE-2017-5507
  * CVE-2017-5508
  * CVE-2017-5510
  * CVE-2017-5511
---
 pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index f5c475ef93a..2ee7f3bb160 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -12,8 +12,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "7.0.4-0";
-    sha256 = "0hfkdvfl60f9ksh07c06cpq8ib05apczl767yyvc671gd90n11ds";
+    version = "7.0.4-6";
+    sha256 = "1nm0hjijwhcp6rzcn7zksp2820dxvj4lmblj7kzpzd3s1ds09q0y";
     patches = [];
   };
 in

From 2a63aae2996aca338e9a8491a794a010e6608b79 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 2 Feb 2017 11:13:04 +0100
Subject: [PATCH 284/899] nlohmann_json: 2.0.7 -> 2.1.0

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

diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix
index 15ddbdaedef..a5a808c1f61 100644
--- a/pkgs/development/libraries/nlohmann_json/default.nix
+++ b/pkgs/development/libraries/nlohmann_json/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "nlohmann_json-${version}";
-  version = "2.0.7";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "nlohmann";
     repo = "json";
     rev = "v${version}";
-    sha256 = "03jklvlcsms09p79qz9piqrdy2vhn4rkwidwfgq6cpxm6anqyqjh";
+    sha256 = "116309lx77m31x4krln0g7mra900g0knk9lbkxbpxnmamkagjyl9";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkTarget = "test";
 
+  enableParallelBuilding = true;
+
   crossAttrs = {
     cmakeFlags = "-DBuildTests=OFF";
     doCheck = false;

From 4d5c39611c57ea028d0869c084fe5df08cc688d2 Mon Sep 17 00:00:00 2001
From: Pradeep Chhetri <pradeep.chhetri89@gmail.com>
Date: Wed, 1 Feb 2017 09:08:01 +0530
Subject: [PATCH 285/899] consul-template: 0.14.0 -> 0.18.0

---
 pkgs/tools/system/consul-template/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix
index 772c7e6d34b..ad7222a67e5 100644
--- a/pkgs/tools/system/consul-template/default.nix
+++ b/pkgs/tools/system/consul-template/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "consul-template-${version}";
-  version = "0.14.0";
+  version = "0.18.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/consul-template";
@@ -11,6 +11,14 @@ buildGoPackage rec {
     inherit rev;
     owner = "hashicorp";
     repo = "consul-template";
-    sha256 = "15zsax44g3dwjmmm4fpb54mvsjvjf3b6g3ijskgipvhcy0d3j938";
+    sha256 = "1a1r7jwv0d4l8bcjal9chvr871hmw0ljbihgjqasp6gvjg0hfbx6";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/hashicorp/consul-template/;
+    description = "Generic template rendering and notifications with Consul";
+    platforms = platforms.linux ++ platforms.darwin;
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ pradeepchhetri ];
   };
 }

From b3e6bdbae5376d99e82a4dab673fba9bb0ba2e32 Mon Sep 17 00:00:00 2001
From: Matthew Maurer <matthew.r.maurer@gmail.com>
Date: Wed, 1 Feb 2017 02:26:26 -0500
Subject: [PATCH 286/899] chromium: 55.0.2883.87 -> 56.0.2924.76

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

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 2337cd51cbb..a7e9c0312da 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "00mq90h5kjj3x7asclp97x5mqy6pvcj0vqxcf77djlyjmsy1q10i";
-    sha256bin64 = "1prmj546sp627crnjfj2sxprr6ahb59ajgqp8jwy4wiy1x5c3j88";
-    version = "56.0.2924.28";
+    sha256 = "0f1w9cba99s9hy6fdqkr39yhkay4kid72vdrgs4as5lwdci8xc6g";
+    sha256bin64 = "13hfkkgqywjapz01q3cy0i3ick1s24qhpl40by21c38nwbqplivw";
+    version = "56.0.2924.76";
   };
   dev = {
-    sha256 = "1dnqqlhdxawwy4zdk2p8zn6vg0cpi3hqpl9rf3j0xylvm3knr9a1";
-    sha256bin64 = "1hnmca8jqvammsb3y847p2n9hm93129li5zfi5pacqizqlakmv3z";
-    version = "57.0.2950.4";
+    sha256 = "0vw9l66412b9zd8v5l0i518mvfwf313gvh1ywxkf48lpjpi03qwh";
+    sha256bin64 = "1iagza9qjlr61149g6cmiak82898xrrhvk516xrssap2qkb6kyzp";
+    version = "57.0.2987.19";
   };
   stable = {
-    sha256 = "0n0sp3f3cmac2lblzn3mjkkhm8p6vy34dafr0kpdz14w1lad66z8";
-    sha256bin64 = "1cvp9fvdpd8qrl48lzs7f6k43bqd43gp0sbzz6h7yrpzw1c49r0m";
-    version = "55.0.2883.87";
+    sha256 = "0f1w9cba99s9hy6fdqkr39yhkay4kid72vdrgs4as5lwdci8xc6g";
+    sha256bin64 = "1zy11y649nxs03xldcq8jcpwj0nb3sklmyh3cxw7fajzi739p2y3";
+    version = "56.0.2924.76";
   };
 }

From 1a5cdaf85a02729a25fb05635cf5a5a932b4a9a7 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 11:28:12 +0100
Subject: [PATCH 287/899] fix evaluation

---
 pkgs/servers/inginious/default.nix | 4 ++--
 pkgs/top-level/python-packages.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/inginious/default.nix b/pkgs/servers/inginious/default.nix
index 113b297787b..ae3347c9671 100644
--- a/pkgs/servers/inginious/default.nix
+++ b/pkgs/servers/inginious/default.nix
@@ -4,14 +4,14 @@ with lib;
 let
   pythonPackages = python2Packages;
 
-  docker_1_7_2 = pythonPackages.docker.override rec {
+  docker_1_7_2 = pythonPackages.docker.overrideAttrs (oldAttrs: rec {
     name = "docker-py-1.7.2";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/d/docker-py/${name}.tar.gz";
       sha256 = "0k6hm3vmqh1d3wr9rryyif5n4rzvcffdlb1k4jvzp7g4996d3ccm";
     };
-  };
+  });
 
   webpy-custom = pythonPackages.web.override {
     name = "web.py-INGI";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7a17feccfe7..ecae4906ad1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25431,7 +25431,7 @@ in {
 
     meta = {
       description = "Test utilities for code working with files and commands";
-      license = with lib.licenses; [ mit ];
+      license = licenses.mit;
       homepage = https://github.com/jupyter/testpath;
     };
   };

From c1e29e237b9d25ef3826053749890fe949fcc59a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 2 Feb 2017 11:49:14 +0100
Subject: [PATCH 288/899] pythonPackages: rename fetchers

- fetchpypi -> fetchPypi
- fetchWheel and fetchTarball are no longer public

https://github.com/NixOS/nixpkgs/commit/695ff0dc09b304f2e0575081c52189893c2f38bc#commitcomment-20711584
---
 pkgs/top-level/python-packages.nix | 37 +++++++++++++++---------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ecae4906ad1..1880471bb58 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -37,30 +37,29 @@ let
 
   graphiteVersion = "0.9.15";
 
-  fetchwheel = {pname, version, sha256, python ? "py2.py3", abi ? "none", platform ? "any"}:
-  # Fetch a wheel. By default we fetch an universal wheel.
-  # See https://www.python.org/dev/peps/pep-0427/#file-name-convention for details regarding the optional arguments.
+  fetchPypi = {format ? "setuptools", ... } @attrs:
     let
-      url = "https://files.pythonhosted.org/packages/${python}/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}-${python}-${abi}-${platform}.whl";
-    in pkgs.fetchurl {inherit url sha256;};
+      fetchWheel = {pname, version, sha256, python ? "py2.py3", abi ? "none", platform ? "any"}:
+      # Fetch a wheel. By default we fetch an universal wheel.
+      # See https://www.python.org/dev/peps/pep-0427/#file-name-convention for details regarding the optional arguments.
+        let
+          url = "https://files.pythonhosted.org/packages/${python}/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}-${python}-${abi}-${platform}.whl";
+        in pkgs.fetchurl {inherit url sha256;};
 
-  fetchtarball = {pname, version, sha256}:
-  # Fetch a tarball.
-    let
-      url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz";
-    in pkgs.fetchurl {inherit url sha256;};
-
-  fetchpypi = {format ? "setuptools", ... } @attrs:
-    let
-      fetcher = (if format == "wheel" then fetchwheel
-        else if format == "setuptools" then fetchtarball
+      fetchSource = {pname, version, sha256}:
+      # Fetch a source tarball.
+        let
+          url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz";
+        in pkgs.fetchurl {inherit url sha256;};
+      fetcher = (if format == "wheel" then fetchWheel
+        else if format == "setuptools" then fetchSource
         else throw "Unsupported kind ${kind}");
     in fetcher (builtins.removeAttrs attrs ["format"]);
 
 in {
 
   inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k mkPythonDerivation buildPythonPackage buildPythonApplication;
-  inherit fetchwheel fetchtarball fetchpypi;
+  inherit fetchPypi;
 
   # helpers
 
@@ -6631,7 +6630,7 @@ in {
     name = "${pname}-${version}";
     format = "wheel";
 
-    src = fetchpypi {
+    src = fetchPypi {
       inherit pname version format;
       sha256 = "0a0685962ee5ac303f470acbb659f0f97aef5b9deb6b85d059691c706ef6e45e";
     };
@@ -25424,7 +25423,7 @@ in {
     #  ${python.interpreter} -m unittest discover
     #'';
     format = "wheel";
-    src = fetchpypi {
+    src = fetchPypi {
       inherit pname version format;
       sha256 = "f16b2cb3b03e1ada4fb0200b265a4446f92f3ba4b9d88ace34f51c54ab6d294e";
     };
@@ -30804,7 +30803,7 @@ EOF
     pname = "pandocfilters";
     name = pname + "-${version}";
 
-    src = fetchpypi{
+    src = fetchPypi{
       inherit pname version;
       sha256 = "ec8bcd100d081db092c57f93462b1861bcfa1286ef126f34da5cb1d969538acd";
     };

From f08bbb90c0e55a7e36751d0d139fd16bd47af58f Mon Sep 17 00:00:00 2001
From: Pierre Radermecker <pradermecker@cirb.brussels>
Date: Thu, 2 Feb 2017 13:17:52 +0100
Subject: [PATCH 289/899] haskell-swagger2: don't haddock to fix haddock build
 error

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0266cbe5a37..37d3373103a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -162,6 +162,7 @@ self: super: {
   shakespeare-js = dontHaddock super.shakespeare-js;
   shakespeare-text = dontHaddock super.shakespeare-text;
   swagger = dontHaddock super.swagger;  # http://hydra.cryp.to/build/2035868/nixlog/1/raw
+  swagger2 = dontHaddock super.swagger2;
   wai-test = dontHaddock super.wai-test;
   zlib-conduit = dontHaddock super.zlib-conduit;
 

From 787c1add0ba40ba8094b0ed4001de10c7d05c033 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 2 Feb 2017 13:44:41 +0100
Subject: [PATCH 290/899] qt4: fixup missing space between flags on Darwin

Since 9aae2991f24, /cc @globin.
---
 pkgs/development/libraries/qt-4.x/4.8/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index cfb4ac61459..4215404a9f6 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -154,7 +154,7 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-std=gnu++98"
     + optionalString (stdenv.isFreeBSD || stdenv.isDarwin)
-      "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"
+      " -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"
     + optionalString stdenv.isDarwin " -I${libcxx}/include/c++/v1";
 
   NIX_LDFLAGS = optionalString (stdenv.isFreeBSD || stdenv.isDarwin)

From 98f8cd601709cbec17fd0a07409b19658869e62b Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 2 Feb 2017 08:00:49 -0500
Subject: [PATCH 291/899] elpa-packages: 2017-02-01

---
 .../editors/emacs-modes/elpa-generated.nix    | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 9aa66d12fdc..817d7f62924 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -1021,10 +1021,10 @@
       }) {};
     let-alist = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
         pname = "let-alist";
-        version = "1.0.4";
+        version = "1.0.5";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/let-alist-1.0.4.el";
-          sha256 = "07312bvvyz86lf64vdkxg2l1wgfjl25ljdjwlf1bdzj01c4hm88x";
+          url = "https://elpa.gnu.org/packages/let-alist-1.0.5.el";
+          sha256 = "0r7b9jni50la1m79kklml11syg8d2fmdlr83pv005sv1wh02jszw";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1377,10 +1377,10 @@
       }) {};
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20161224";
+        version = "20170124";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-20161224.tar";
-          sha256 = "0b10bjypn0w5ja776f8sxl1qpvb61iyz1n3c74jx6fqwypv7dmgi";
+          url = "https://elpa.gnu.org/packages/org-20170124.tar";
+          sha256 = "0mcnjwvily0xv1xl11dj18lg38llvrxja2j9mwn6vql8n5y1srxi";
         };
         packageRequires = [];
         meta = {
@@ -1468,6 +1468,19 @@
           license = lib.licenses.free;
         };
       }) {};
+    psgml = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "psgml";
+        version = "1.3.4";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/psgml-1.3.4.tar";
+          sha256 = "1pgg9g040zsnvilvmwa73wyrvv9xh7gf6w1rkcx57qzg7yq4yaaj";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/psgml.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "python";

From 89cbe137c333ea06eae48141b3a72d70e637e970 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 2 Feb 2017 08:01:16 -0500
Subject: [PATCH 292/899] melpa-stable-packages: 2017-02-01

Removals:
  ttrss - removed from melpa
---
 .../emacs-modes/melpa-stable-generated.nix    | 346 +++++++++++-------
 1 file changed, 205 insertions(+), 141 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 125b53b2e08..2e546092c6b 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -1795,12 +1795,12 @@
     auto-compile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }:
     melpaBuild {
         pname = "auto-compile";
-        version = "1.3.2";
+        version = "1.4.0";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "auto-compile";
-          rev = "1526e59ea8aaa1738c53b24673d62605dbbb5c96";
-          sha256 = "05bzknh0fhl22r2klqqrgs7wpx18p5kzwxmg916smbvyk1fzfgva";
+          rev = "0cbebd8fd22c88a57a834797e4841900ea1bae1c";
+          sha256 = "1sngafab6sssidz6w1zsxw8i6k4j13m0073lbmp7gq3ixsqdxbr7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e00dcd4f8c59c748cc3c85af1607dd19b85d7813/recipes/auto-compile";
@@ -4731,12 +4731,12 @@
     company-ngram = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-ngram";
-        version = "0.7.9";
+        version = "0.8.0";
         src = fetchFromGitHub {
           owner = "kshramt";
           repo = "company-ngram";
-          rev = "98491c830d0867c211b773818610ace51f243640";
-          sha256 = "196c870n7d46n4yhppq5np8mn9i0i74aykkbfk33kr4mgilss4cw";
+          rev = "d15182df3eac72b29772802759b77c9eafef5066";
+          sha256 = "05108s2a3c857n9j3c34hdni3fyq149pva4m3f51lis4wqrm4zv7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/937e6a23782450525c4a90392c414173481e101b/recipes/company-ngram";
@@ -4842,12 +4842,12 @@
     company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }:
     melpaBuild {
         pname = "company-sourcekit";
-        version = "0.1.7";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "nathankot";
           repo = "company-sourcekit";
-          rev = "14d503d96fe595a688a3f162ae5739e4b08da24b";
-          sha256 = "1ynyxrpl9qd2l60dpn9kb04zxgq748fffb0yj8pxvm9q3abblf3m";
+          rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b";
+          sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/company-sourcekit";
@@ -4965,22 +4965,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
+    composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, seq }:
     melpaBuild {
         pname = "composer";
-        version = "0.0.7";
+        version = "0.0.8";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "composer.el";
-          rev = "47d840e03412da5db13ae2b962576f0166517581";
-          sha256 = "1vw1im39c4jvsaw3ghvwvya9l5h7jiysfhry3p22gdng0l2n4008";
+          rev = "2d16d3bb65c53e9e26f4b7b22ad38590a4a48ee1";
+          sha256 = "1zxqqd12p1db75icbwbdj51fvp8zzhivi8ssnxda1r5y5crbiqdv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer";
           sha256 = "1gwgfbb0fqn87s7jscr9xy47h239wy74n3hgpk4i16p2g6qinpza";
           name = "composer";
         };
-        packageRequires = [ emacs f request s ];
+        packageRequires = [ emacs f request s seq ];
         meta = {
           homepage = "https://melpa.org/#/composer";
           license = lib.licenses.free;
@@ -7847,12 +7847,12 @@
     elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elfeed";
-        version = "2.0.1";
+        version = "2.1.0";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "a3b2acd760385a800f04652f15dfd0e7f825dfef";
-          sha256 = "0a9xvfnp3pwh0q1k05q8xnray53a1aihqbxnnrfdfxx0s8rah90i";
+          rev = "ac258aa1956a5ce29c1a50d7ce8b1da55cd23192";
+          sha256 = "04y0l4rjsn21a5li43ixw4y9v9cxh26q1ix4zsy41l8wjzbn1hlz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -7868,12 +7868,12 @@
     elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }:
     melpaBuild {
         pname = "elfeed-web";
-        version = "2.0.1";
+        version = "2.1.0";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "a3b2acd760385a800f04652f15dfd0e7f825dfef";
-          sha256 = "0a9xvfnp3pwh0q1k05q8xnray53a1aihqbxnnrfdfxx0s8rah90i";
+          rev = "ac258aa1956a5ce29c1a50d7ce8b1da55cd23192";
+          sha256 = "04y0l4rjsn21a5li43ixw4y9v9cxh26q1ix4zsy41l8wjzbn1hlz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -8096,15 +8096,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, yasnippet }:
+    elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
     melpaBuild {
         pname = "elpy";
-        version = "1.13.0";
+        version = "1.14.1";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "5c900ff6b5524e216247f52ed4085734d815dacb";
-          sha256 = "1h0k3nvxy84wjsiiwpxd8xnwnvbiqld26ndv6wmxqpwsjav186ik";
+          rev = "9afc370f7044d4e5c5a47e7080b43468ff2a4e28";
+          sha256 = "1ynranqi0lv9nhap4ydqns3znpqpc0q69qyb22i93pkd505ryyf8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -8116,6 +8116,7 @@
           find-file-in-project
           highlight-indentation
           pyvenv
+          s
           yasnippet
         ];
         meta = {
@@ -8772,12 +8773,12 @@
     eopengrok = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, s }:
     melpaBuild {
         pname = "eopengrok";
-        version = "0.4.0";
+        version = "0.5.0";
         src = fetchFromGitHub {
           owner = "youngker";
           repo = "eopengrok.el";
-          rev = "0bf07c636f8d29a98e9776243ec9496875ddff51";
-          sha256 = "0pmawjfyihqygqz7y0nvyrs6jcvckqzkq9k6z6yanpvkd2x5g13x";
+          rev = "11c99f7e1e2c1c7d70cbda496cb5b6c7f6e4082a";
+          sha256 = "1c5kzq3h7gr0459z364dyq5m8vq0ydclw5wphqj9fyg28mxjj6ns";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2b87ea158a6fdbc6b4e40fd7c0f6814d135f8545/recipes/eopengrok";
@@ -8814,12 +8815,12 @@
     epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "epkg";
-        version = "2.1.0";
+        version = "2.2.0";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "epkg";
-          rev = "6e1d989fbfa357a7c268ea30fe8b3e3cefafc36d";
-          sha256 = "0avlmqcbm07692ir5z04gy4klhyan3h25ni4l4k4p0dszjsqmdi0";
+          rev = "f2daeceb98766914548bf9a3c8206ae64850e395";
+          sha256 = "06j07j0gfg4ahjklxlk7m7w53arpl42ynf1diphqn02jy7ycdlh6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
@@ -9044,12 +9045,12 @@
     erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "19.2.1";
+        version = "19.2.2";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "bca5bf5a2d68a0e9ca681363a8943809c4751950";
-          sha256 = "1bxksxp2ggzskmrzh4k66w27ckh77jjjriq85xfz52n963al9crr";
+          rev = "51faafa9a20c4afa7944b8089b26f22c774bed19";
+          sha256 = "0shy3ckxw9scsg3j8brzk5r3p0rdpfbr9ys7akmdp2pq88d867i9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -10303,12 +10304,12 @@
     eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eziam-theme";
-        version = "0.1.1";
+        version = "0.3";
         src = fetchFromGitHub {
           owner = "thblt";
           repo = "eziam-theme-emacs";
-          rev = "794ff00f27c31c7b43b7dc62da6295cd9db36ad4";
-          sha256 = "0j94k3bhynhrigk127b40ljqcdqsqa5gix5ds3b0hb38wfcq8byk";
+          rev = "e0ca54afdec6eeaf275fa5130a90ed77b0b72277";
+          sha256 = "1m64clhwcwwry76imqcwbsz1bm8blpqynzmpqwcsmhsjqp0yb620";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
@@ -12353,12 +12354,12 @@
     fxrd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "fxrd-mode";
-        version = "0.7";
+        version = "0.8";
         src = fetchFromGitHub {
           owner = "msherry";
           repo = "fxrd-mode";
-          rev = "f53240c92f80760fbfb2e0dcf2e68064145cec33";
-          sha256 = "0yx4p081960zwgjlw9yiq4jkc7czfvwbsc8z20pg394lx9nkrgr5";
+          rev = "8a1a0d5a08527ec8dee9bbe135803ed7ad297d9d";
+          sha256 = "1yzw0fnlqilpx4xl84hpr75l86y9iiqyh13r1hskmwb79s2niw1m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/796eb6b2126ec616c0de6af6abb7598900557c12/recipes/fxrd-mode";
@@ -12605,12 +12606,12 @@
     ghc = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "ghc";
-        version = "5.6.0.0";
+        version = "5.7.0.0";
         src = fetchFromGitHub {
           owner = "DanielG";
           repo = "ghc-mod";
-          rev = "deef7036d06072fbccb6c17369ac7e28ad341482";
-          sha256 = "1kq3ynnjs57pgs99a2m4hh6nc692lf8j9ydmn5wync75r2pyh0jc";
+          rev = "c3d0a681a19261817cf928685f7b96878fe51e91";
+          sha256 = "1d2hsfmshh29g5bvd701py9n421hmz49hk0zjx5m09s8znjkvgx3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -12794,12 +12795,12 @@
     git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "git-commit";
-        version = "2.10.0";
+        version = "2.10.1";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "9cc74bfc9804918d1b296424bc0fb0aca6d65a59";
-          sha256 = "1dr4c0vv6mb1jmqg6s8yml58sg9yx3da1kqbsv97gv4vasd0s0dn";
+          rev = "acba806a823977108bae60438466da71f773a7c8";
+          sha256 = "1b1z700ngd2mchaw7w3h4bmywg5inrcsl2b0r8lcrz2di1hkxk6n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -13508,12 +13509,12 @@
     go-impl = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "go-impl";
-        version = "0.13";
+        version = "0.14";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-go-impl";
-          rev = "1827d2efe1f6023cf3954c0056aaa531124c41c1";
-          sha256 = "1rcqrsvw74lrzs03bg9zslmkf5ka4a3h06b5hhdgiv4iimapz5sq";
+          rev = "69f0d0ef05771487e15abec500cd06befd171abf";
+          sha256 = "1rmik6g3l9q1bqavmqx1fhcadz4pwswgfnkbaxl6c5b6g2sl26iq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aa1a0845cc1a6970018b397d13394aaa8147e5d0/recipes/go-impl";
@@ -13550,12 +13551,12 @@
     go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }:
     melpaBuild {
         pname = "go-playground";
-        version = "1.2";
+        version = "1.3";
         src = fetchFromGitHub {
           owner = "grafov";
           repo = "go-playground";
-          rev = "97be0b3a19d7b8476663c9b16148c4dfd9783cfe";
-          sha256 = "0wz79iwcfql8kfq5q9b0fccj9590giqlzd2kzjaj0fl89n0sx9gq";
+          rev = "eebb1fec2177bc85b746b948beac873a77bea4a2";
+          sha256 = "0ixpcms4f0q8327jyp2k48x03vjxwmzdsq76vg4j0kmjs9dfad1v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/900aabb7bc2350698f8740d72a5fad69c9219c33/recipes/go-playground";
@@ -14333,6 +14334,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    hacker-typer = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hacker-typer";
+        version = "1.0.1";
+        src = fetchFromGitHub {
+          owner = "therockmandolinist";
+          repo = "emacs-hacker-typer";
+          rev = "de208bb6d69f6f45eca8522d41012c7f729b8c9f";
+          sha256 = "0lhsj9j17sd43w96zk84ssfvk5q518znbp1zkb5znl2q7ky8cwrg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/561661965a7a500f24671454b3b680816457e180/recipes/hacker-typer";
+          sha256 = "0i9kkxcz0fz4yviksl3f0ggh9kpwr9sidg7945r46bmblni3f0j9";
+          name = "hacker-typer";
+        };
+        packageRequires = [ async ];
+        meta = {
+          homepage = "https://melpa.org/#/hacker-typer";
+          license = lib.licenses.free;
+        };
+      }) {};
     hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "hackernews";
@@ -14671,12 +14693,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "2.5.0";
+        version = "2.5.1";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "bbdf2c18edc75478e2c7e8ee39b5c30dbb7bf42e";
-          sha256 = "1qqyrqhsy7xacckg5faj45pvs0vpg242sp2073i5grvgb3l9lvqj";
+          rev = "b54d937634986dbebe97c0283137bcde07ed2275";
+          sha256 = "0cq4pcx0rn9kzf55pbad1lcn1xq58vcdng9sx50485wdxqr0bxzc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -14920,6 +14942,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-codesearch = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "helm-codesearch";
+        version = "0.4.0";
+        src = fetchFromGitHub {
+          owner = "youngker";
+          repo = "helm-codesearch.el";
+          rev = "e80e76e492f626659b88dbe362b11aa0a3b0a116";
+          sha256 = "16njr3xcvpzg4x6qq2pwk80pca9pxhc6vjvfy3dzy4hi9nxryrs6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0a992824e46a4170e2f0915f7a507fcb8a9ef0a6/recipes/helm-codesearch";
+          sha256 = "1v21zwcyx73bc1lcfk60v8xim31bwdk4p06g9i4qag3cijdlli9q";
+          name = "helm-codesearch";
+        };
+        packageRequires = [ cl-lib dash helm s ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-codesearch";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-commandlinefu = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, json ? null, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-commandlinefu";
@@ -14944,12 +14987,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "2.5.0";
+        version = "2.5.1";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "bbdf2c18edc75478e2c7e8ee39b5c30dbb7bf42e";
-          sha256 = "1qqyrqhsy7xacckg5faj45pvs0vpg242sp2073i5grvgb3l9lvqj";
+          rev = "b54d937634986dbebe97c0283137bcde07ed2275";
+          sha256 = "0cq4pcx0rn9kzf55pbad1lcn1xq58vcdng9sx50485wdxqr0bxzc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -19484,12 +19527,12 @@
     live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "live-py-mode";
-        version = "2.13.0";
+        version = "2.14.0";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "469ed0ccf146deab8c2ebbb162be7be31709da0a";
-          sha256 = "1qv6v27fjfq0h3i7d2nry752r9fwqf5llilngy5l3yimqddm2k4d";
+          rev = "51b1e177f115ab527cc47baf98abe09d43d9a95f";
+          sha256 = "0rcxrq3r4vbr9zb844andy1zj246gs8s1ksqp1f092fiiyqpllnx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -19778,12 +19821,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "2.10.0";
+        version = "2.10.1";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "9cc74bfc9804918d1b296424bc0fb0aca6d65a59";
-          sha256 = "1dr4c0vv6mb1jmqg6s8yml58sg9yx3da1kqbsv97gv4vasd0s0dn";
+          rev = "acba806a823977108bae60438466da71f773a7c8";
+          sha256 = "1b1z700ngd2mchaw7w3h4bmywg5inrcsl2b0r8lcrz2di1hkxk6n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -19932,12 +19975,12 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "2.10.0";
+        version = "2.10.1";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "9cc74bfc9804918d1b296424bc0fb0aca6d65a59";
-          sha256 = "1dr4c0vv6mb1jmqg6s8yml58sg9yx3da1kqbsv97gv4vasd0s0dn";
+          rev = "acba806a823977108bae60438466da71f773a7c8";
+          sha256 = "1b1z700ngd2mchaw7w3h4bmywg5inrcsl2b0r8lcrz2di1hkxk6n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -20538,22 +20581,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    meghanada = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
+    meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "0.4.0";
+        version = "0.5.0";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "04112dc5db30a98d2ec1dae41d8c6ed1c7aff0be";
-          sha256 = "0f14b1h6zv0v8hn99bqmidndh36mrsckmcirrrffm591ksf4l0zd";
+          rev = "6b1b514ca3424c08301325f99608510130365cd1";
+          sha256 = "1pl65186k696mx6lm6lnn2jm86kwky780rph97cqb1dy506qpqxf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
           sha256 = "10f1fxma3lqcyv78i0p9mjpi79jfjd5lq5q60ylpxqp18nrql1s4";
           name = "meghanada";
         };
-        packageRequires = [ cl-lib company emacs flycheck yasnippet ];
+        packageRequires = [ company emacs flycheck yasnippet ];
         meta = {
           homepage = "https://melpa.org/#/meghanada";
           license = lib.licenses.free;
@@ -21968,12 +22011,12 @@
     no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "no-littering";
-        version = "0.5.3";
+        version = "0.5.4";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "no-littering";
-          rev = "e161c328d248f861bb56991492182f20e60b6b41";
-          sha256 = "0ka7gbiarhc1r8rynxq2vf0k5p4044bm1jc92ca1hav34mqfg2xp";
+          rev = "87fffa1973376bd1837fcf84277cd16db9c96957";
+          sha256 = "1nfllm98d0893wk49fkijc071pg3v3qmpy4apyppj88k6m58y573";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
@@ -23065,12 +23108,12 @@
     org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-journal";
-        version = "1.11.2";
+        version = "1.12.0";
         src = fetchFromGitHub {
           owner = "bastibe";
           repo = "org-journal";
-          rev = "5f1445e9bafa252c8708b3bc223f30032f5ae82b";
-          sha256 = "0aip4krrl5cyaa2agmmzipqw139zar3j6594vba93axalfdx9i9z";
+          rev = "24313870fa682a53e7f3f916b0e853a731868886";
+          sha256 = "0nc3jl7sgqc8swi89rdk1yapmqxp8vaxm7390iqxy7a1sng4jydh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal";
@@ -24214,12 +24257,12 @@
     packed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "packed";
-        version = "1.0.0";
+        version = "2.0.0";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "packed";
-          rev = "765cd52712f0daf40c45d169cc062b6bc94aa807";
-          sha256 = "1kjcb6z08bj5ysxrykgz3x6bz2122yycpjhbv875ppc5ihls88xl";
+          rev = "d2f01bffc987b226f618dda0663a1e233161518d";
+          sha256 = "16xwgi0zkbbvkbxf0ld6g4xlfd95j45sca57h162wld6l27jrv4f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee9e95c00f791010f77720068a7f3cd76133a1c/recipes/packed";
@@ -25047,22 +25090,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    php-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "php-mode";
-        version = "1.17.0";
+        version = "1.18.1";
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "php-mode";
-          rev = "f3201eebfebf1757cf6a636fe3c7a3b810ab6612";
-          sha256 = "0pwhw59ki19f9rkgvvnjzhby67s0y9hpsrg6cwqxakjlm66w96q3";
+          rev = "349b85c1a9c79505d218b43940470c862dcdff32";
+          sha256 = "15mlzk7mvv3wfz73k30a7syb274myls6d44nibwg00r794drr57g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
           sha256 = "1lc4d3fgxhanqr3b8zr99z0la6cpzs2rksj806lnsfw38klvi89y";
           name = "php-mode";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/php-mode";
           license = lib.licenses.free;
@@ -26034,12 +26077,12 @@
     protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "protobuf-mode";
-        version = "3.2.0pre2";
+        version = "3.2.0";
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "6eeb5c7d0fc84c9c5d562ae54b3bdc088ec62129";
-          sha256 = "15mb2ybam1pnyig60zlspw0cn9wl5iwywp35fx67qvg9nadln11d";
+          rev = "593e917c176b5bc5aafa57bf9f6030d749d91cd5";
+          sha256 = "120g0bg7ichry74allgmqnh7k0z2sdnrrfklb58b7szzn4zcdz14";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -26622,12 +26665,12 @@
     railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "railscasts-reloaded-theme";
-        version = "1.3.0";
+        version = "1.4.0";
         src = fetchFromGitHub {
           owner = "thegeorgeous";
           repo = "railscasts-reloaded-theme";
-          rev = "de3fea4fdd32db6cbea124dfeb2fa4f213d79063";
-          sha256 = "1kl3wn35pcyslggy5wxm81bjjsj3smzjsf54iy4y844iyf4mgp5j";
+          rev = "318c9a812d53884da1a9d67206fcfd9ded4d320f";
+          sha256 = "1al62r2fys6z1ja8zbh6yskprp1iq03l2jbnwbx8i3gd2w0ib7qk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme";
@@ -27249,22 +27292,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    request = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    request = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "request";
-        version = "0.2.0";
+        version = "0.3.0";
         src = fetchFromGitHub {
           owner = "tkf";
           repo = "emacs-request";
-          rev = "efbe231346f368a3079bf185ce25997ac6104d9c";
-          sha256 = "0rpw9is8sx2gmbc7l6mv5qdd0jrh497lyj5f0zx0lqwjl8imw401";
+          rev = "a3d080e57eb8be606fbf39d1baff94e1b16e1fb8";
+          sha256 = "0wyxqbb35yqf6ci47531lk32d6fppamx9d8826kdz983vm87him7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request";
           sha256 = "0h4jqg98px9dqqvjp08vi2z1lhmk0ca59lnrcl96bi7gkkj3jiji";
           name = "request";
         };
-        packageRequires = [ cl-lib emacs ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/request";
           license = lib.licenses.free;
@@ -27273,12 +27316,12 @@
     request-deferred = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "request-deferred";
-        version = "0.2.0";
+        version = "0.3.0";
         src = fetchFromGitHub {
           owner = "tkf";
           repo = "emacs-request";
-          rev = "efbe231346f368a3079bf185ce25997ac6104d9c";
-          sha256 = "0rpw9is8sx2gmbc7l6mv5qdd0jrh497lyj5f0zx0lqwjl8imw401";
+          rev = "a3d080e57eb8be606fbf39d1baff94e1b16e1fb8";
+          sha256 = "0wyxqbb35yqf6ci47531lk32d6fppamx9d8826kdz983vm87him7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request-deferred";
@@ -27312,22 +27355,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    resize-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "resize-window";
-        version = "0.2.0";
+        version = "0.4.0";
         src = fetchFromGitHub {
           owner = "dpsutton";
           repo = "resize-window";
-          rev = "dec035ff44fdb743bb2dc82274114dc6ea1851f9";
-          sha256 = "1ps9l6q6hgzzaywkig0gjjdlsir9avxghynzx9a3q6h0fpdkpgrj";
+          rev = "27364959798de0f019da799975027842c07e7829";
+          sha256 = "0x92s4cv9k566rc248zrcmh507df7d19p7b3vcfd0dlfpbqc0qnv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window";
           sha256 = "0h1hlj50hc97wxqpnmvg6w3qhdd9nbnb8r8v39ylv87zqjcmlp8l";
           name = "resize-window";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/resize-window";
           license = lib.licenses.free;
@@ -28075,8 +28118,8 @@
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-scala-mode";
-          rev = "7e6300231143133252e6ed1f3d5c86ea4e625e33";
-          sha256 = "081bw6gkrww7bqi7pwj4sifmqscr5sbpl3zl1rw86npv5fpyjq9j";
+          rev = "730e16d254478d6f63f62cb04d47c137c9002f2d";
+          sha256 = "1aq1bfv8jz53zp365awqk43ysjwkpj51pcy6fyp87j8bbb02mgq9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode";
@@ -29347,6 +29390,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    socyl = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
+    melpaBuild {
+        pname = "socyl";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "nlamirault";
+          repo = "socyl";
+          rev = "09ea9d1ea02060ccdb17b80ad88f912c08045c5b";
+          sha256 = "09zdknrg4ar38nbhvz4407x78i3lngmnrcijr7a4x1ybs5x61zis";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/774b3006f5b6b781594257f1d9819068becbbcc1/recipes/socyl";
+          sha256 = "00b7x247cyjh4gci101fq1j6708vbcz1g9ls3845w863wjf6m5sz";
+          name = "socyl";
+        };
+        packageRequires = [ dash pkg-info s ];
+        meta = {
+          homepage = "https://melpa.org/#/socyl";
+          license = lib.licenses.free;
+        };
+      }) {};
     solarized-theme = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "solarized-theme";
@@ -29452,22 +29516,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    sourcekit = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    sourcekit = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "sourcekit";
-        version = "0.1.7";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "nathankot";
           repo = "company-sourcekit";
-          rev = "14d503d96fe595a688a3f162ae5739e4b08da24b";
-          sha256 = "1ynyxrpl9qd2l60dpn9kb04zxgq748fffb0yj8pxvm9q3abblf3m";
+          rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b";
+          sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/sourcekit";
           sha256 = "1lvk3m86awlinivpg89h6zvrwrdqa5ljdp563k3i4h9384w82pks";
           name = "sourcekit";
         };
-        packageRequires = [ dash dash-functional emacs ];
+        packageRequires = [ dash dash-functional emacs request ];
         meta = {
           homepage = "https://melpa.org/#/sourcekit";
           license = lib.licenses.free;
@@ -30313,12 +30377,12 @@
     swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "swift-mode";
-        version = "2.2.1";
+        version = "2.2.2";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "swift-mode";
-          rev = "6cd2948589771d926e545d8cbe054705eebce18f";
-          sha256 = "1zz5jv2qgcnhidyhnw3wbcpqb80jqqbs74kpa66assfigyvivyj6";
+          rev = "42669da0b68bba2d12f9d5fc38f30def118bb999";
+          sha256 = "0l7f7mm4a7qrw0i6fnakgy7payghjgmamln9ldbdx593hg1jjzr8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
@@ -31257,12 +31321,12 @@
     toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "toc-org";
-        version = "1.0.0";
+        version = "1.0.1";
         src = fetchFromGitHub {
           owner = "snosov1";
           repo = "toc-org";
-          rev = "114dcc9813e2d8784b8c21165c95408c1b26d86e";
-          sha256 = "084nqdrpzgg1qpbqgvi893iglmz9dk3r0vwqxjkyxa3z3a0f5v17";
+          rev = "a0e8ca05e806e5074b8603985da7f18b92c15856";
+          sha256 = "1sv9y5dln4ai9w3mgg8p4a3s05hflfqh0k7k8isjqikydbv85m2k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org";
@@ -31442,27 +31506,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    ttrss = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "ttrss";
-        version = "1.7.5";
-        src = fetchFromGitHub {
-          owner = "pedros";
-          repo = "ttrss.el";
-          rev = "3b1e34518294a1fa6fa29355fd4e141f3fcaf3b6";
-          sha256 = "060jksd9aamqx1n4l0bb9v4icsf7cr8jkyw0mbhgyz32nmxh3v6g";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d918a5aa26c890fd138323ac6a446c0722e8b4c6/recipes/ttrss";
-          sha256 = "08921cssvwpq33w87v08dafi2rz2rl1b3bhbhijn4bwjqgxi9w7z";
-          name = "ttrss";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/ttrss";
-          license = lib.licenses.free;
-        };
-      }) {};
     tuareg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tuareg";
@@ -32204,6 +32247,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    virtualenvwrapper = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "virtualenvwrapper";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "porterjamesj";
+          repo = "virtualenvwrapper.el";
+          rev = "5649028ea0c049cb7dfa2105285dee9c00d189fb";
+          sha256 = "1xcjjs394vlaz94xh52kqaq94gkbmmjqmxlg7wly8vfn9vh34mws";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/virtualenvwrapper";
+          sha256 = "0rn5vwncx8z69xp8hspr06nzkf28l9flchpb2936c2nalmhx6m8i";
+          name = "virtualenvwrapper";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "https://melpa.org/#/virtualenvwrapper";
+          license = lib.licenses.free;
+        };
+      }) {};
     visible-mark = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "visible-mark";
@@ -33046,12 +33110,12 @@
     with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "with-editor";
-        version = "2.5.9";
+        version = "2.5.10";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "with-editor";
-          rev = "2248a63f6eb6e7720881b508639d9a00d2db9ea0";
-          sha256 = "0g5ch1a5myrmazxcbbak01q4k3x8yp3kbn73d2h26j2jmsqvdy1n";
+          rev = "8ae3c7aed92842f5988671c1b3350c65c58857e0";
+          sha256 = "1jy5jxkr99a9qp7abmncaphp0xd3y6m3fflvj3fq1wp33i3f7cfn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";

From 711a22096cfd16582c4556fee7d18a9b38a2dcc6 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 2 Feb 2017 08:03:15 -0500
Subject: [PATCH 293/899] melpa-packages: 2017-02-01

Removals:
  meacupla-theme - removed from melpa
  rustfmt - removed from melpa
  ttrss - removed from melpa
---
 .../editors/emacs-modes/melpa-generated.nix   | 1475 ++++++++++-------
 1 file changed, 864 insertions(+), 611 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 598143ab15c..49af6c23177 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -23,12 +23,12 @@
     _0xc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "_0xc";
-        version = "20161027.2140";
+        version = "20170125.1953";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
           repo = "0xc";
-          rev = "1f449d3c08bc87fd82d23a3cab71abfe6debb401";
-          sha256 = "0nh06xvngckr6didb1br2c8v15v1a0rrraqhal1xmpl6xg76fxc6";
+          rev = "31890af88234e4e098f1c340a5990515b934c7f7";
+          sha256 = "1yp3wm0h6rkzxw950fnhw310npn56s9vl294sw8nyij85s2hw5qk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fbb2c86a50a8df9a3967787fc10f33beab2c933/recipes/0xc";
@@ -127,12 +127,12 @@
     abl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "abl-mode";
-        version = "20160823.314";
+        version = "20170130.105";
         src = fetchFromGitHub {
           owner = "afroisalreadyinu";
           repo = "abl-mode";
-          rev = "b6d32f5e711929e8a1a2249498a3156d86dcbff6";
-          sha256 = "06lbpy75gli15gfabh38hhzr8c761j70igq2rvdvw78gacanblfi";
+          rev = "478ad2570f763b63a7369cc9f243b4f952a546bf";
+          sha256 = "0xcj8vr9fcxf6cpck5gdb7vddlsk4vswl0wdwmxv6rwv459j5war";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/70a52edb381daa9c4dcc9f7e511175b38fc141be/recipes/abl-mode";
@@ -380,8 +380,8 @@
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "5b7d58c783f6453442570ae8cedd489a0659a58e";
-          sha256 = "16bgzyrj5y4k43hm2hfn2bggiixap3samq69cxw8k376w8yqmsyh";
+          rev = "3b5ce79b5ed80f9ce7ca1fa10f0c314516300d6b";
+          sha256 = "1gxsixg2rp09myqrcq7plk84bhhd8aaz68a09xfsbdia41q3vaa7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim";
@@ -1444,12 +1444,12 @@
     alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "alda-mode";
-        version = "20170124.956";
+        version = "20170125.1720";
         src = fetchFromGitHub {
           owner = "jgkamat";
           repo = "alda-mode";
-          rev = "9921298b36de4ed621d370beb0633b322a3b83e4";
-          sha256 = "011i3pfgjs9f181l7gp6yfw8z6pdrgw3rv4i8zq8yc7hrm721ffg";
+          rev = "deeb659b1b1c6ec57a38875e9daf1f76f9b5c013";
+          sha256 = "1z462b2cvfqz1pdrba89ag4v9mvw1dzsrzc219fz06f2xcpyz2v2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode";
@@ -1745,12 +1745,12 @@
     android-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "android-mode";
-        version = "20160408.523";
+        version = "20170131.2347";
         src = fetchFromGitHub {
           owner = "remvee";
           repo = "android-mode";
-          rev = "da93ff7d92bb5b9fcf52c755eb2389ef4c262829";
-          sha256 = "1cg35nb4hhibsk9d6daszs2khadqb3gzyzaxjsykxsgmpfh27ikv";
+          rev = "76711e73b459de1ee639a49733e4f3f245b8fb41";
+          sha256 = "1z0pw5h5yqpszr07jg7hqlfphhy0g6p2hqjyd9ds68p987v35vz0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77633aa340803a433570327943fbe31b396f4355/recipes/android-mode";
@@ -2081,11 +2081,11 @@
     anything = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "anything";
-        version = "20170123.1543";
+        version = "20170125.1710";
         src = fetchgit {
           url = "http://repo.or.cz/r/anything-config.git";
-          rev = "5a3f76a4fdd3a42b26e7d41d3a9738c86bf63b85";
-          sha256 = "17yd7r8l3q57w2p156ly8068z247fva14k555fypnc5a884rdafw";
+          rev = "9e2259fc779eef1a3e947e74cc7d301d1cea0ca6";
+          sha256 = "1rl60k9imk5wma2xnx1s0av7rzgjjbaw7nkb539vwk4pwj1kmqqq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1700e86cb35617178f5d7c61c88718ac7849f9b/recipes/anything";
@@ -3029,12 +3029,12 @@
     auto-compile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }:
     melpaBuild {
         pname = "auto-compile";
-        version = "20160711.1012";
+        version = "20170130.1017";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "auto-compile";
-          rev = "1526e59ea8aaa1738c53b24673d62605dbbb5c96";
-          sha256 = "05bzknh0fhl22r2klqqrgs7wpx18p5kzwxmg916smbvyk1fzfgva";
+          rev = "0cbebd8fd22c88a57a834797e4841900ea1bae1c";
+          sha256 = "1sngafab6sssidz6w1zsxw8i6k4j13m0073lbmp7gq3ixsqdxbr7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e00dcd4f8c59c748cc3c85af1607dd19b85d7813/recipes/auto-compile";
@@ -3050,12 +3050,12 @@
     auto-complete = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "auto-complete";
-        version = "20161029.643";
+        version = "20170124.1845";
         src = fetchFromGitHub {
           owner = "auto-complete";
           repo = "auto-complete";
-          rev = "297e2f77a35dba222c24dd2e3eb0a5d8d0d1ee09";
-          sha256 = "0185d1dc0fld06fk5n77q06wrmrphffs9xz3a6c2clyxf8mfx2vy";
+          rev = "2e83566ddfa758c69afe50b8a1c62a66f47471e3";
+          sha256 = "1rkqjq7wr4aavg08i8mq13w85z14xdhfmpbipj5mhwlpyrrci4bk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/083fb071191bccd6feb3fb84569373a597440fb1/recipes/auto-complete";
@@ -3509,12 +3509,12 @@
     auto-virtualenv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pyvenv, s }:
     melpaBuild {
         pname = "auto-virtualenv";
-        version = "20161107.1001";
+        version = "20170125.1117";
         src = fetchFromGitHub {
           owner = "marcwebbie";
           repo = "auto-virtualenv";
-          rev = "d352bc4c9d76cb2e1680846f13bae940931d8380";
-          sha256 = "1yb1g8xmh5mgkszcch2z7rzmrywl8zyyy7j8ff1agvz0ic4b9893";
+          rev = "3826db66b417788e2b2eb138717255b1f52a55c3";
+          sha256 = "12691m4z0zr3prmdhmjlpcx0ajj1ddrbj9gy827xmgr0vaqbr7b2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ccb91515d9a8195061429ed8df3471867d211f9a/recipes/auto-virtualenv";
@@ -4322,11 +4322,11 @@
       }) {};
     bbdb = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "bbdb";
-        version = "20161001.2212";
+        version = "20170129.2224";
         src = fetchgit {
           url = "git://git.savannah.nongnu.org/bbdb.git";
-          rev = "2ee0d69610808f84b958f868c3268b75a24aced0";
-          sha256 = "0azkjnspn97y0fx4k37spvmxxy7p3g106prcbkmsaqm8jkkxc0qj";
+          rev = "8998b3416b36873f4e49454879f2eed20c31b384";
+          sha256 = "086ivc9j7vninb46kzparg7zjmdsv346gqig6ki73889wym1m7xn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6b6801fe29cb6fb6183f0babf528375d14f966b3/recipes/bbdb";
@@ -4510,12 +4510,12 @@
     bbyac = callPackage ({ browse-kill-ring, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bbyac";
-        version = "20150316.301";
+        version = "20170127.516";
         src = fetchFromGitHub {
           owner = "baohaojun";
           repo = "bbyac";
-          rev = "8dc5a7c0ada7ac729a87343149970ced139bb659";
-          sha256 = "1cdm4d6fjf3m495phynq0dzvv0wc0gfsw6fdq4d47iyxs0p4q2dl";
+          rev = "4dfb1f7c7f0402a0abf45e00007edc2c7f98a25a";
+          sha256 = "0vm83ccr9q93z4cvnrzz0al5rpxm8zh9yysn5lja6g2474nm01wy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4409df77dca17b3f9556666a62ee924cb8794364/recipes/bbyac";
@@ -4693,22 +4693,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    better-shell = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    better-shell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "better-shell";
-        version = "20160830.1451";
+        version = "20170130.2222";
         src = fetchFromGitHub {
           owner = "killdash9";
           repo = "better-shell";
-          rev = "1c0ddbba888b47fb5f66f5f39f5faee230bf207a";
-          sha256 = "1q4dgrqsia3pbggl0yfjx013w2rm7wb4ddclybxqw5v56bvb8ldc";
+          rev = "43e43d43f049d8eafb7508b5cd3cccbb2eac4a68";
+          sha256 = "1s31rjfq50lh2d2bs7afzwqi2282d9kwl2vpf5r9q10dvc0xb4bp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc553c9fb6de69dafe9fbe44a955b307f4d9507f/recipes/better-shell";
           sha256 = "1mr39xz8chnc28zw1rrw5yqf44v44pby7ki22yyz6rp1j5ishp4v";
           name = "better-shell";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/better-shell";
           license = lib.licenses.free;
@@ -5176,12 +5176,12 @@
     blog-admin = callPackage ({ cl-lib ? null, ctable, f, fetchFromGitHub, fetchurl, lib, melpaBuild, names, s }:
     melpaBuild {
         pname = "blog-admin";
-        version = "20170110.751";
+        version = "20170126.458";
         src = fetchFromGitHub {
           owner = "CodeFalling";
           repo = "blog-admin";
-          rev = "f01c9ed030a85800b4ebdce8ec71b195db446ee9";
-          sha256 = "1jlbxa9qw56rhqm72sqmz5isjmaidmh7p08vlbr8qsxi0kjaipv9";
+          rev = "bcf4302dd158e6a7b9e4a57d739818987e039e76";
+          sha256 = "0dc27df1cph67ygvsvjjskc21flsa055hzxc2j00sk5078gp7a9y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/blog-admin";
@@ -5322,7 +5322,7 @@
       }) {};
     bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "bookmark-plus";
-        version = "20170123.921";
+        version = "20170129.1207";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/bookmark+.el";
           sha256 = "02akakw7zfjx8bjb3sjlf8rhbh1xzx00h3dz7cp84f7jy9xak5v1";
@@ -5941,12 +5941,12 @@
     bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bui";
-        version = "20170113.124";
+        version = "20170125.14";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "bui.el";
-          rev = "8d0c5e3dd6bcd11943dd23615be9b89367eabade";
-          sha256 = "1h1jzpq1rq9jvvihq9n7agsdr86ppwgs38wmmi8qn6w2p99r6k5p";
+          rev = "2742bd1cd9e232cac68d5843e05c043827a2669f";
+          sha256 = "00v0v00izzy749h0l22z0g0df96g3s4rbn06dvdara7h01599v00";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui";
@@ -6008,8 +6008,8 @@
         src = fetchFromGitHub {
           owner = "EricCrosson";
           repo = "bury-successful-compilation";
-          rev = "565a6f9cad7f7d5ef161eb9c7f2305bae9971c02";
-          sha256 = "0mirb3yvs4aq6n53lx690k06zllyzr29ms0888v5svjirxjazvh8";
+          rev = "2b673a6df1513d976836087259e35384d94a9bed";
+          sha256 = "11bhpad8h9pmmm84ps95wdnaxn76wz4wm4l04mhcps5fsj7x15by";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f66e2e23c7a1fa0ce6fa8a0e814242b7c46c299c/recipes/bury-successful-compilation";
@@ -6907,8 +6907,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "f234413322b67688ded1073a9649a292178f1ac2";
-          sha256 = "0wv5y3q4iypi9fwvkqmmv8xmlj2227rm6zyhaiq8hcphn0g1r04m";
+          rev = "84c81f4701a2e8e8f8f5473377ae858dc9c40597";
+          sha256 = "0wkz94al5jnavz5lpq5kr91yb2zqkini69i7zq1x91z6zy3i0wlr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -6944,11 +6944,11 @@
       }) {};
     cg = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "cg";
-        version = "20160801.615";
+        version = "20170201.347";
         src = fetchsvn {
           url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "11953";
-          sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl";
+          rev = "11991";
+          sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a275ee794b0aa30b1348bb3a984114eef8dfc808/recipes/cg";
@@ -7069,12 +7069,12 @@
     cheatsheet = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cheatsheet";
-        version = "20170124.330";
+        version = "20170126.1350";
         src = fetchFromGitHub {
           owner = "darksmile";
           repo = "cheatsheet";
-          rev = "5648341515ed1565aeb89c2dfdb63aa852ac8d08";
-          sha256 = "16m7h5bbsaqlsdn27f1ljaqdmxxfnn1pc6dq6k5ggp8h9hwkpb4k";
+          rev = "e4f8e0110167ea16a17a74517d1f10cb7ff805b8";
+          sha256 = "1vy2qmx9872hfrfcycpsmy0si481rwv4q4gwiy8f2w04zb92szbn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d2cd657fcadb2dd3fd12864fe94a3465f8c9bd7/recipes/cheatsheet";
@@ -7528,12 +7528,12 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "20170122.2028";
+        version = "20170129.1941";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "240c6ed236d98c7e27b8c85bd1fdb9e845882e8b";
-          sha256 = "1kvph9f19m1hvkr27bc3n1fm5nwpwfl6kiz08l673pp0qxvgj965";
+          rev = "eb1bc430288af6e666e385c634c434a863a4ef8b";
+          sha256 = "137rkssq1gkf9djg0x5vwnsf8z64yvjigp05zkkxrdfwcgs2gria";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -7804,8 +7804,8 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "293003";
-          sha256 = "1w7jd9qz2qd75jp1r44ynp9bj85cv5wzpqqhpi5rllyxh1i8g6cl";
+          rev = "293835";
+          sha256 = "13516xv7ypswhlarh4sd97sc17zar10snbmrcn14wd53jgxx440y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format";
@@ -8007,15 +8007,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    clj-refactor = callPackage ({ cider, clojure-mode, dash, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, yasnippet }:
+    clj-refactor = callPackage ({ cider, clojure-mode, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, seq, yasnippet }:
     melpaBuild {
         pname = "clj-refactor";
-        version = "20170124.624";
+        version = "20170126.118";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clj-refactor.el";
-          rev = "735df406401c735de3448f8879a2b328571f73d2";
-          sha256 = "089yfn6r9nlmbvsqbr9gkxg2b6903d1k9qim4jlcki4hip4xqkc2";
+          rev = "0fb72efc1cb9a2a688e324e7fdc51f258a86e36d";
+          sha256 = "0sibcrsygaxk60f2rrjbmsp7cjfgqkj7a40psal19nf1ygcy634y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor";
@@ -8025,7 +8025,6 @@
         packageRequires = [
           cider
           clojure-mode
-          dash
           edn
           emacs
           hydra
@@ -8033,6 +8032,7 @@
           multiple-cursors
           paredit
           s
+          seq
           yasnippet
         ];
         meta = {
@@ -8274,12 +8274,12 @@
     clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "clomacs";
-        version = "20161227.131";
+        version = "20170128.850";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clomacs";
-          rev = "6d8a3eb84f1c65724680f4a0dcef3d1d0a29f4e6";
-          sha256 = "082y5acfxbbihfxvzbps9f6k5p08nnrk604yvpi2m8hkyspyy4cb";
+          rev = "d35f139dfff1f0a7aafbc8ade36a97f894c29922";
+          sha256 = "19zsz8yabs77zk0b2509g7rkgv3a1lkzgqyc7b80rqlpsrlki3d0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs";
@@ -8421,12 +8421,12 @@
     cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "cmake-ide";
-        version = "20161229.138";
+        version = "20170130.451";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "cmake-ide";
-          rev = "393d6e9affa6f9978600b6c0ef8a4fe8bf73d813";
-          sha256 = "0lg6ky9h4a96w8mma668kxfv9dffw97h1swjq33cvhv5pp3p9rrr";
+          rev = "7cea81b31d73e84084d4eec4134556f501911eaf";
+          sha256 = "0q2zxnkr4l9dqf29rgc4877x6wmqx3j5q0ky2b77079mp160ljy4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide";
@@ -8446,8 +8446,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "3270f763b28195de83c8b762dba5fb366b714b30";
-          sha256 = "1gjdidsgg73hciipnirnr6lp5xrx1kb72qkmx4hksvlfq4f6c9kh";
+          rev = "2d357ea267a5ab0f54f7b411befbadc583dd41d7";
+          sha256 = "08sz807iclkjav2fzrapc5h4m4nc7jb7k64ywar9dpq7944z7zkj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8504,10 +8504,10 @@
       }) {};
     cmds-menu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "cmds-menu";
-        version = "20170102.917";
+        version = "20170124.1824";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/cmds-menu.el";
-          sha256 = "0zkqpv7n4idzqkayildxkgaqsy1rjkmsf5ppkjld3jk1j53kacfc";
+          sha256 = "1mcrgfwpckrx0k82waqyd80x72mxzv42jg878rkycf4qpa0wxjh4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/de6366e4b3e72a5e68b960d6bf4bab2683ad6800/recipes/cmds-menu";
@@ -8877,12 +8877,12 @@
     color-theme-buffer-local = callPackage ({ color-theme, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-theme-buffer-local";
-        version = "20151012.1628";
+        version = "20170125.2201";
         src = fetchFromGitHub {
           owner = "vic";
           repo = "color-theme-buffer-local";
-          rev = "ca8470bc34c65a026a6bca1707d95240bfd019af";
-          sha256 = "0gvc9jy34a8wvzwjpmqhshbx2kpk6ckmdrdj5v00iya7c4afnckx";
+          rev = "faf7415c99e132094f1f09c6b6974ec118a18d87";
+          sha256 = "1zk5clvkrq2grmm1bws2l5vbv1ycp41978bb902c563aws2rb8c0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e43060d80b3345ef4e8df9f5a9d66af8a44a9c41/recipes/color-theme-buffer-local";
@@ -9299,22 +9299,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-bibtex = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, regexp-opt }:
+    company-bibtex = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }:
     melpaBuild {
         pname = "company-bibtex";
-        version = "20161210.1223";
+        version = "20170125.2135";
         src = fetchFromGitHub {
           owner = "gbgar";
           repo = "company-bibtex";
-          rev = "9b236cb9527ec69d73101193e6b53ad6080ea333";
-          sha256 = "19f6npkd4im9dp48h2kp2kw6d6pvw4i4qn404ca949z77v87ibjj";
+          rev = "2cea36c24c35c1e9fafce7526781f119a48b5e82";
+          sha256 = "0l4xnqhk3a4szwcfyw90naxasbca8nrnjhnaqiw8zyixhakdbhxz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7c366ac2949eae48766fce70a7b01bbada6fcc27/recipes/company-bibtex";
           sha256 = "14s3hxm7avpw59v4sz0d3drjzin745rczp93rcv4s7i3a7kdmn30";
           name = "company-bibtex";
         };
-        packageRequires = [ cl-lib company parsebib regexp-opt ];
+        packageRequires = [ cl-lib company parsebib ];
         meta = {
           homepage = "https://melpa.org/#/company-bibtex";
           license = lib.licenses.free;
@@ -9365,12 +9365,12 @@
     company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "company-coq";
-        version = "20161201.631";
+        version = "20170110.1633";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
           repo = "company-coq";
-          rev = "20f3ede0ca3a90a68b700704bff830ca18598f73";
-          sha256 = "0fdpxd2lh3y5iyhwphpcdv29bm5v8pcwhbj4xhbky7dn28kbl9c4";
+          rev = "84eae262728392ae1d077e0435ebbd2e75c3bdeb";
+          sha256 = "0cxvrlal884pmk7hf0c5dn0b93jd6wchag1a9vwh9x458hm9h4gy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq";
@@ -9481,8 +9481,8 @@
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "5b7d58c783f6453442570ae8cedd489a0659a58e";
-          sha256 = "16bgzyrj5y4k43hm2hfn2bggiixap3samq69cxw8k376w8yqmsyh";
+          rev = "3b5ce79b5ed80f9ce7ca1fa10f0c314516300d6b";
+          sha256 = "1gxsixg2rp09myqrcq7plk84bhhd8aaz68a09xfsbdia41q3vaa7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim";
@@ -9792,12 +9792,12 @@
     company-ngram = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-ngram";
-        version = "20161013.805";
+        version = "20170129.1113";
         src = fetchFromGitHub {
           owner = "kshramt";
           repo = "company-ngram";
-          rev = "98491c830d0867c211b773818610ace51f243640";
-          sha256 = "196c870n7d46n4yhppq5np8mn9i0i74aykkbfk33kr4mgilss4cw";
+          rev = "d15182df3eac72b29772802759b77c9eafef5066";
+          sha256 = "05108s2a3c857n9j3c34hdni3fyq149pva4m3f51lis4wqrm4zv7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/937e6a23782450525c4a90392c414173481e101b/recipes/company-ngram";
@@ -9817,8 +9817,8 @@
         src = fetchFromGitHub {
           owner = "travisbhartwell";
           repo = "nix-emacs";
-          rev = "89b9356d32b16e0dc0794c323a4661a01c3b83de";
-          sha256 = "11pcp09z0vy6k81wghqq4rxlkfsc5bpgyacpl7bmxanj3qaa7ga5";
+          rev = "ace629f7645d12778c96ff7b5cf4b1e41a98af29";
+          sha256 = "11infdrdjc30kxvfg5rh1zn4idvkhf9s0c6v60qn441m1d5bnavq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/company-nixos-options";
@@ -9984,30 +9984,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-sourcekit = callPackage ({ company, dash, dash-functional, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, sourcekit }:
+    company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }:
     melpaBuild {
         pname = "company-sourcekit";
-        version = "20170122.636";
+        version = "20170126.353";
         src = fetchFromGitHub {
           owner = "nathankot";
           repo = "company-sourcekit";
-          rev = "3286a0dceea6f68b155dd4608db3ccf555f00938";
-          sha256 = "0xxwy5nahaafk5w3ybr1g898fiz6r7hjwr445z64v5pg862r8lkl";
+          rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b";
+          sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/company-sourcekit";
           sha256 = "0hr5j1ginf43h4qf3fvsh3z53z0c7w5a9lhrvdwmlzj396qhqmzs";
           name = "company-sourcekit";
         };
-        packageRequires = [
-          company
-          dash
-          dash-functional
-          deferred
-          emacs
-          request-deferred
-          sourcekit
-        ];
+        packageRequires = [ company dash dash-functional emacs sourcekit ];
         meta = {
           homepage = "https://melpa.org/#/company-sourcekit";
           license = lib.licenses.free;
@@ -10163,12 +10155,12 @@
     composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, seq }:
     melpaBuild {
         pname = "composer";
-        version = "20161115.1102";
+        version = "20170127.1745";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "composer.el";
-          rev = "2ea50be23557ce50de2c5a517fcd4abc980969b1";
-          sha256 = "0ir0a3i7bvnf80als7bwjvr604jvhpk0gwln88kqgksvy1bh1nky";
+          rev = "2d16d3bb65c53e9e26f4b7b22ad38590a4a48ee1";
+          sha256 = "1zxqqd12p1db75icbwbdj51fvp8zzhivi8ssnxda1r5y5crbiqdv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer";
@@ -10477,12 +10469,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20170119.859";
+        version = "20170201.726";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "75f9cebc6a44cc5aff51f403bae4774736ea52bd";
-          sha256 = "09xdlgwl40cb9kf622nnadh0g14g78p78yqmxfgy1wm3vbp0id99";
+          rev = "dbcee946f462e0fe2aa26f2a9e7ff4784c9e0e70";
+          sha256 = "199wg32ai117zkww4nzanksvdvzhmnnrn4cmp7l74z8i18cn2j2p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -11021,12 +11013,12 @@
     csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "csharp-mode";
-        version = "20170111.1133";
+        version = "20170127.1100";
         src = fetchFromGitHub {
           owner = "josteink";
           repo = "csharp-mode";
-          rev = "bc6a4190194f27cba46aa019d62d5e602b6d891e";
-          sha256 = "1xx9nls695gf6fd4dxqxgvcwvwvkwzw3gm5vnc74h3hcfk05msij";
+          rev = "8ab3cc8d0143c878cab0f3424916cd9c0edc3217";
+          sha256 = "1p1q56399bfmdmzm453y18wkvxva5i1glkd4s5173dswgw9kh2gg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode";
@@ -11618,12 +11610,12 @@
     dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "dante";
-        version = "20170119.1319";
+        version = "20170201.1425";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "dante";
-          rev = "1220ad91d78abc57e191215d5985729f14c66c84";
-          sha256 = "05ms8j4vm2qghq0w7w6vw9v74xb8i04fqzm35ndhp0fq1phrh47h";
+          rev = "385dd8114bb9eaba44943f00f9f7aea71af7bf34";
+          sha256 = "1jkdq9li3vqzdmmznpaxak7mf9y9vlk0abdb7ffzvvlry19dvgs8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
@@ -11828,12 +11820,12 @@
     dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "dart-mode";
-        version = "20161218.1548";
+        version = "20170127.1652";
         src = fetchFromGitHub {
           owner = "nex3";
           repo = "dart-mode";
-          rev = "e6635b390235cf16a8081763768cf925ca2d9133";
-          sha256 = "1cwwwxmv7d1blv88c6nlm0z94gjfdgw2ri1libzyfzirincyicdx";
+          rev = "b3808189cf6c5165499d3f67540f550e49b26aa2";
+          sha256 = "1bs3p72gxlcviz0l2dl1h92708j0c3ly0kwpdbr370i2hdv0l8ys";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d9cb763cb8e929d9442be8d06e9af02de90714a/recipes/dart-mode";
@@ -12393,12 +12385,12 @@
     demo-it = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "demo-it";
-        version = "20161103.1337";
+        version = "20170126.739";
         src = fetchFromGitHub {
           owner = "howardabrams";
           repo = "demo-it";
-          rev = "830a1f10982abe586c9d13685007d191eda6fbdc";
-          sha256 = "0fkwzx681df0p4a8f2z6lh5j94vln0i6cvrfzym5v8cdhyhd0p80";
+          rev = "f61f336c8c291208d9feef2ce495e8c659052f77";
+          sha256 = "1wb7n4k2qwl3m7y22zag6rdzi1gqb8a5lj7crpkkn5ryycbxbbpi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1dec5877db00c29d81d76be0ee2504399bad9cc4/recipes/demo-it";
@@ -13079,12 +13071,12 @@
     dired-launch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-launch";
-        version = "20160914.756";
+        version = "20170131.1740";
         src = fetchFromGitHub {
           owner = "thomp";
           repo = "dired-launch";
-          rev = "8766ab5ed59b7b5105ca5818fa85004447ced1cb";
-          sha256 = "13q1xd2ycs1c6ybizykzhb42x3j3mx2g9dxy8h1nr7bb7393hs64";
+          rev = "acf8a3dec14e68934d7d7ef0b867e347ce5d81e9";
+          sha256 = "0wsas576mk5n13wmb2rpazgys3sxgl3ds936gr8yy1sb43mv21r4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c9a4945d65aa6afc371c447a572284d38d4d71/recipes/dired-launch";
@@ -13755,12 +13747,12 @@
     dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dix";
-        version = "20170123.523";
+        version = "20170201.316";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "dix";
-          rev = "86880826a0cc878e2e5d50bc835eed5c8e2f001a";
-          sha256 = "00qyzpqdw4im7c4bqqpiayv4kr9iqlm6mhsziazjvrjsvvi0p9ij";
+          rev = "43a2d386b6c6c314db2a1ab8e772ee68d8256806";
+          sha256 = "0qkh35widg3b6cfyv651xx9xyq35r7zjfygcp9wv3w3wcvxdaznk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix";
@@ -13780,8 +13772,8 @@
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "dix";
-          rev = "86880826a0cc878e2e5d50bc835eed5c8e2f001a";
-          sha256 = "00qyzpqdw4im7c4bqqpiayv4kr9iqlm6mhsziazjvrjsvvi0p9ij";
+          rev = "43a2d386b6c6c314db2a1ab8e772ee68d8256806";
+          sha256 = "0qkh35widg3b6cfyv651xx9xyq35r7zjfygcp9wv3w3wcvxdaznk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil";
@@ -14225,12 +14217,12 @@
     doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom-themes";
-        version = "20170111.2138";
+        version = "20170131.2109";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-theme";
-          rev = "bb1e7d7ad7bb8cfe3dccf6499076941a08169e9d";
-          sha256 = "024am5z7ihibkr5pbavdybxdq9q1pnsxhnfppwlzl8kaijqmmzs4";
+          rev = "2c843fd80d91bb7bd9de9a6bd820998689854fac";
+          sha256 = "0dcln2z63j7wpz6yczpsfmhb68gvak7y66g56373fsv2i3n4ydz0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes";
@@ -14673,7 +14665,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1780132";
+          rev = "1781330";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -15362,8 +15354,8 @@
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "5b7d58c783f6453442570ae8cedd489a0659a58e";
-          sha256 = "16bgzyrj5y4k43hm2hfn2bggiixap3samq69cxw8k376w8yqmsyh";
+          rev = "3b5ce79b5ed80f9ce7ca1fa10f0c314516300d6b";
+          sha256 = "1gxsixg2rp09myqrcq7plk84bhhd8aaz68a09xfsbdia41q3vaa7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim";
@@ -15974,12 +15966,12 @@
     ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20170119.927";
+        version = "20170201.751";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "3412470b61998613f0a2c724d6be6aa4604cb14e";
-          sha256 = "12qm5x6kkaxgsf7y9i8zwak14bn33w2s4sla1hjpzs0mjhds5x8q";
+          rev = "0ede9e7ef64017039748b8f47de4df834b0443ed";
+          sha256 = "03fm7lhfzrhn4dddlhqx6v1dqfgz6rj352y0znnfdaskzychw1sa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -16037,12 +16029,12 @@
     ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }:
     melpaBuild {
         pname = "ejc-sql";
-        version = "20170120.901";
+        version = "20170201.734";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "ejc-sql";
-          rev = "a7515139b396bffe9c329b6b69c8d0658ef4a564";
-          sha256 = "19mqi20gyxmadlycizg6wpzxf7jbvsfnnisazf11m9nf5bc97avb";
+          rev = "f9bb4917058a71f92f4a22703d90eecc17354d97";
+          sha256 = "14s40q1jf73dql09a1mzpk2q14kl5m4x7y7j4iazh2lca9kf61lz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql";
@@ -16083,8 +16075,8 @@
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "a6510f13c15d9811b51ccb1a96293bbe05162dbb";
-          sha256 = "03i8ma0npxfixlbn4g5ffycpk1fagfjgsl4qg4hkrj9l0dmnm7qq";
+          rev = "71717d7d3ac575045f215ab27dd8a86e80b44c9d";
+          sha256 = "1k95szxx0f8ksa8lr8hs3rcyrg86whnv0x5pd8d3wnf1vxyhgcqs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -16163,12 +16155,12 @@
     el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-patch";
-        version = "20170123.1735";
+        version = "20170129.2111";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "el-patch";
-          rev = "6dc16442ef309b04624c0cc0c64bf22c3d03d903";
-          sha256 = "1zrngnc3rnwjr6hl16ilcy99sia702qawsv4b4n4vp5ybqqjcrnm";
+          rev = "787b320080043de457a953f05915ed8e83334492";
+          sha256 = "1ki15pl2snf3qvdcdjgfpsa48frksx3j5ygckaylfyrfs1yikp8q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -16514,12 +16506,12 @@
     elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elfeed";
-        version = "20170116.1128";
+        version = "20170125.1905";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "3be3ff04438eec593f058d0f948dfc9f85a0ad47";
-          sha256 = "1siviasw7863prsyxw7ggb0n71b32kzq647f60jnx75y69s05zds";
+          rev = "caa3679a4af386c73d01cabf7c114a5abb40ea3d";
+          sha256 = "0af65imbh2lp4i7n4k44pr5sl4035rh61zngn4fznwcgs6kjk7d4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -16584,12 +16576,12 @@
     elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }:
     melpaBuild {
         pname = "elfeed-web";
-        version = "20161030.1731";
+        version = "20170125.1846";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "3be3ff04438eec593f058d0f948dfc9f85a0ad47";
-          sha256 = "1siviasw7863prsyxw7ggb0n71b32kzq647f60jnx75y69s05zds";
+          rev = "caa3679a4af386c73d01cabf7c114a5abb40ea3d";
+          sha256 = "0af65imbh2lp4i7n4k44pr5sl4035rh61zngn4fznwcgs6kjk7d4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -17025,12 +17017,12 @@
     elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
     melpaBuild {
         pname = "elpy";
-        version = "20161229.1103";
+        version = "20170201.629";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "d93ad53fb55c1ff2cbbafcc8c85bddc30484bc80";
-          sha256 = "1ii3p81hn84f155mywz906pnjkp5qca501qrplh96c5d0xkzz14l";
+          rev = "ff0277013bf1319c72759d3f6eb001f2317cb52b";
+          sha256 = "13wdw9y78gwdlz83zgbbhkmk2q3wvf569pgnlcpy330fxmalbj6v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -18092,12 +18084,12 @@
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "20170121.1214";
+        version = "20170128.359";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "524d11e490094fa03d5c3a9dcdf0efa81f3d05c2";
-          sha256 = "11br1hy1f4z9x674argdqb8sz1g0q9wzvi5hjh248w3v7lmvjzyh";
+          rev = "ee16c7a91b9ac1585be287ecf94e4b20aaaea3f5";
+          sha256 = "15ldbviaxd9nlb11c3aw7dnp8xxyldm67dmbnsv6f3rpafy1gmzv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -18205,12 +18197,12 @@
     epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "epkg";
-        version = "20161231.850";
+        version = "20170131.627";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "epkg";
-          rev = "6e1d989fbfa357a7c268ea30fe8b3e3cefafc36d";
-          sha256 = "0avlmqcbm07692ir5z04gy4klhyan3h25ni4l4k4p0dszjsqmdi0";
+          rev = "f2daeceb98766914548bf9a3c8206ae64850e395";
+          sha256 = "06j07j0gfg4ahjklxlk7m7w53arpl42ynf1diphqn02jy7ycdlh6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
@@ -18733,8 +18725,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "7400b93124572af795c8d7356e22e3bf1f1f2a09";
-          sha256 = "1c494xrn26j0m9wx69pb1zqdhv4mnwjffp42y0irxf061jy3z1jp";
+          rev = "2896c966d9456721a0b9c11dbd8a14c474a3ace0";
+          sha256 = "0pk5847m8mxlsmhysd482wlr0lzbrs2svr9nkv6lghr4a4rg0l2p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19418,12 +19410,12 @@
     esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "esup";
-        version = "20160818.2130";
+        version = "20170125.43";
         src = fetchFromGitHub {
           owner = "jschaf";
           repo = "esup";
-          rev = "7ab0f4cb39398528e7dee5200a7ccf7eb8f0a3db";
-          sha256 = "1lcmim8vv04dgmmq8fznb9brvqsk78a4dclk5gkrxk63nli68d9m";
+          rev = "a63ab0cd57a37317256b15a3f5f30c2b11d92c25";
+          sha256 = "07bpcihmzaf7av2sbzs0pr0cw21xqr3nnalj3cwxv7d6yhc8g4qf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup";
@@ -20210,12 +20202,12 @@
     evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-mc";
-        version = "20170113.19";
+        version = "20170131.2119";
         src = fetchFromGitHub {
           owner = "gabesoft";
           repo = "evil-mc";
-          rev = "d5b50be73b4288400d418abe86f92504081ea32d";
-          sha256 = "13wvjif6479c1l6hvyhm7jhf41kdh4c56n4rmnncc9cw5z9z7fcb";
+          rev = "3ab7942cec9bd8afbc64349ab24f9558934810d5";
+          sha256 = "1nyak4vp0h2cjls12sqcgvk07iap6m88zrrlq65702jpcqp9hycj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc";
@@ -20588,12 +20580,12 @@
     evil-swap-keys = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-swap-keys";
-        version = "20160909.1407";
+        version = "20170125.452";
         src = fetchFromGitHub {
           owner = "wbolster";
           repo = "evil-swap-keys";
-          rev = "54aed57b464905d18bfcf52e3d0e7e5f939aa133";
-          sha256 = "03ii6hj226aq6qbhias41miyv59aij24byw8637dbhb68gpff8v1";
+          rev = "1f137e85fc092cf5a1bd8abbd8e8fda0f4cd024b";
+          sha256 = "0vx4gsyhcb050q8bh6d016ybjkji1mfpp9m000s4kq1k04nm4cwb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2abff8e3d54ac13c4fe90692a56437844accca25/recipes/evil-swap-keys";
@@ -21132,12 +21124,12 @@
     eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eziam-theme";
-        version = "20170124.340";
+        version = "20170130.834";
         src = fetchFromGitHub {
           owner = "thblt";
           repo = "eziam-theme-emacs";
-          rev = "e30ce488c6e2f9899af584bf637f436fc3fa4ec2";
-          sha256 = "1nqdnzn5qc6i5bnnd0raxilnpggfgmskz120nhs7y5j0zhipvrgk";
+          rev = "97e2b9d551e92d47a5baf78d6b5399e45eea2ae8";
+          sha256 = "0pxxzb2szp0bw7ayj65yfzy5h59dci541k7fs5m7xkzakyyx0b8i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
@@ -21270,12 +21262,12 @@
     faceup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "faceup";
-        version = "20150215.1348";
+        version = "20170126.1305";
         src = fetchFromGitHub {
           owner = "Lindydancer";
           repo = "faceup";
-          rev = "70fa6be83768adf78f20425d0d76fe809dc44d79";
-          sha256 = "0sjmjydapfnv979dx8dwiz67wffamiaf41s4skkwa0wn2h4p6wja";
+          rev = "688b487ad0a78c8707c5aded50e1d85551270034";
+          sha256 = "1wmmj69wgzgac5y7gnrz84dvwjzd45h3rr434vv4dxnam0j0lj40";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a10bf2928b93c3908e89ca8ad9649bb468ebca05/recipes/faceup";
@@ -21786,10 +21778,10 @@
       }) {};
     find-dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "find-dired-plus";
-        version = "20170101.938";
+        version = "20170127.943";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/find-dired+.el";
-          sha256 = "1ll1qr9kkx3fy0j7s5zz95gwsfj0j925cgkcs5ic5rds474881q0";
+          sha256 = "1d0h5bcvk6x20apkvi8ywq961y9zvs4qj8p4n9n8yhm5sznrksyc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c8f884334b7eb83647146e7e8be028935ba12ce/recipes/find-dired+";
@@ -22846,6 +22838,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-dialyxir = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-dialyxir";
+        version = "20170124.2319";
+        src = fetchFromGitHub {
+          owner = "aaronjensen";
+          repo = "flycheck-dialyxir";
+          rev = "7e79dc33a12b8aded7a86d64d302072eed522cb4";
+          sha256 = "1ylg8v1khh2bph6hscib7diw039z0nxfh28b9mhgyi6s33jyq618";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fa49551b8f726c235e03ea377bb09a8be37b9f32/recipes/flycheck-dialyxir";
+          sha256 = "0pacxidpgwp7wij17c5r0fm5w3nga3lp4mcim365k3y5r4ralc0c";
+          name = "flycheck-dialyxir";
+        };
+        packageRequires = [ flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-dialyxir";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-dialyzer = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-dialyzer";
@@ -22888,6 +22901,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-dogma = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-dogma";
+        version = "20170124.2321";
+        src = fetchFromGitHub {
+          owner = "aaronjensen";
+          repo = "flycheck-dogma";
+          rev = "7e14207a7da67dc5524a8949cb37a3d11de1db6e";
+          sha256 = "1f3wn48am7920s6pm7ds1npfbj1w2pb8k790rl79rvc398g1pyyr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1dd7601c55206fd0b9b59f98e861c52b9d640278/recipes/flycheck-dogma";
+          sha256 = "0mpmmz0ssdd3a4fnqzy5kf9r3ddcs9kcl0chhilkw5k8480j3dcy";
+          name = "flycheck-dogma";
+        };
+        packageRequires = [ flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-dogma";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-elixir = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-elixir";
@@ -22951,22 +22985,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-flow";
-        version = "20161123.136";
+        version = "20170126.1007";
         src = fetchFromGitHub {
           owner = "lbolla";
           repo = "emacs-flycheck-flow";
-          rev = "0748aa26a03437d36bf7083e6fc1af8f382dd1a3";
-          sha256 = "1mmgahrq0v77i9w95jcg2n3aqqrvzd2s4w3b2mr70i23wq5y5wqy";
+          rev = "da2d0834e1d7b2f1157f579e3ee157db325caae7";
+          sha256 = "0nsi5km1f0p6l25i4kylvnzfxz4wi9108k2zsspfshw3b6bbk7mf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d18fb21d8ef9b33aa84bc26f5918e636c5771e5/recipes/flycheck-flow";
           sha256 = "0p4vvk09vjgk98dwzr2qzldvij3v6af56pradssi6sm3shbqhkk3";
           name = "flycheck-flow";
         };
-        packageRequires = [ flycheck ];
+        packageRequires = [ flycheck json ];
         meta = {
           homepage = "https://melpa.org/#/flycheck-flow";
           license = lib.licenses.free;
@@ -23308,22 +23342,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-pkg-config = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    flycheck-pkg-config = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "flycheck-pkg-config";
-        version = "20160610.1335";
+        version = "20170129.1315";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "flycheck-pkg-config";
-          rev = "6884b0636f4bfe5648d5f4e3db288b7643d91111";
-          sha256 = "1b3b240hlr5jkfzbj814hiblp32r6bahqs1zjcj045pb7cg2cxxm";
+          rev = "c85f543a682cdda1f8c9a2e255c8230257715cb4";
+          sha256 = "02xv8w5pgsara2wf6zp6992n52a363kw2xiqdv5kcz8y1bxcliz1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b2e88f2f126c9ff8b4261d6adb4c0d8d3049f33/recipes/flycheck-pkg-config";
           sha256 = "0w7h4fa4mv8377sdbkilqcw4b9qda98c1k01nxic7a8i3iyq02d6";
           name = "flycheck-pkg-config";
         };
-        packageRequires = [ cl-lib dash s ];
+        packageRequires = [ dash s ];
         meta = {
           homepage = "https://melpa.org/#/flycheck-pkg-config";
           license = lib.licenses.free;
@@ -23542,12 +23576,12 @@
     flycheck-swift = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-swift";
-        version = "20160921.1921";
+        version = "20170128.2149";
         src = fetchFromGitHub {
           owner = "swift-emacs";
           repo = "flycheck-swift";
-          rev = "822d1415eabfd464adc52063f9c44da1c87f0ff9";
-          sha256 = "0gf7cxrsrf62kamm4xy1fi4v264szm6qk607ifg4bi5dmdc10b0k";
+          rev = "c6c416a1b7a7d346e5c040e4e4065abc68d3a844";
+          sha256 = "0wa60i99jh0dsks30jssg7l17bcmr6jzkwmkjg8brl756p593zp5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fd99bea06079c4231363c37e3361bd9e5b1ba490/recipes/flycheck-swift";
@@ -23983,16 +24017,16 @@
     flymake-lua = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "flymake-lua";
-        version = "20140310.230";
+        version = "20170128.1754";
         src = fetchFromGitHub {
           owner = "sroccaserra";
-          repo = "emacs";
-          rev = "ee23c427a8eb01773c87e215d0e61cd8b5b5fe76";
-          sha256 = "1fz7kywp1y2nhp50b2v961wz604sw1gzqcid4k8igz9aii3ygxcv";
+          repo = "flymake-lua";
+          rev = "84589f20066921a5b79cf3a1f914a223a2552d2a";
+          sha256 = "1f4nigl65g1g5w15ddf33ypk2b07xph964pkdq1bw81451vmvzhn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/eece02633c870db4aacd7b0cd2b7f2424fa3f192/recipes/flymake-lua";
-          sha256 = "0pa66ymhazcfgd9jmxizq5w2sgj008hph42wsa9ljr2rina1gai6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/63889df90a8cd4a39871cc43ccc559eff7b8dd5f/recipes/flymake-lua";
+          sha256 = "05q6bifr1ywirk6sdn0pr812nlrzsi79bpbgn6ay4jyzmhhfi9z0";
           name = "flymake-lua";
         };
         packageRequires = [];
@@ -24463,6 +24497,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    fn = callPackage ({ cl-lib ? null, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fn";
+        version = "20170130.1745";
+        src = fetchFromGitHub {
+          owner = "troyp";
+          repo = "fn.el";
+          rev = "463cd9b82aec7c90a529a98c4fcad636069fd978";
+          sha256 = "0pwic988mp4x0x1icklsvkxy8nw72ljz93j8s3cimmic7dslnmza";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6d2929604b6dd21d6cf425643927a9c216801dc1/recipes/fn";
+          sha256 = "0cb98rxdb6sd0kws6bc4pa536kiyw3yk0hlfqcm3ps81hcgqjhhn";
+          name = "fn";
+        };
+        packageRequires = [ cl-lib dash dash-functional emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/fn";
+          license = lib.licenses.free;
+        };
+      }) {};
     focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "focus";
@@ -24631,12 +24686,12 @@
     font-lock-studio = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "font-lock-studio";
-        version = "20141201.1658";
+        version = "20170127.1251";
         src = fetchFromGitHub {
           owner = "Lindydancer";
           repo = "font-lock-studio";
-          rev = "35d510e4b16939621d7200bf67021f773cdb4ae5";
-          sha256 = "04n32rgdz7m24jji8p0j42zmf2r60sdbbr4mkr6435fqyvmdd20k";
+          rev = "12c35967b31233e06946c70627aa3152dacfe261";
+          sha256 = "0q0s6f5vi3sfifj7vq2nnsmgyyivp1sd3idk32858md5ri71qif0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8046fef1ac09cac1113dd5d0a6e1bf8e0c77bb1/recipes/font-lock-studio";
@@ -24998,6 +25053,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    frames-only-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
+    melpaBuild {
+        pname = "frames-only-mode";
+        version = "20170129.120";
+        src = fetchFromGitHub {
+          owner = "davidshepherd7";
+          repo = "frames-only-mode";
+          rev = "5a2947d797a5d6f74d3a9c97f8c0ab6cff115b28";
+          sha256 = "0y0sdjixaxvywrlp2sw51wnczhk51q1svl5aghbk9rkxpwv9ys9v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode";
+          sha256 = "17p04l16ghz9kk096xk37yjpi4rmla86gp7c8ysjf6q6nyh0608h";
+          name = "frames-only-mode";
+        };
+        packageRequires = [ emacs seq ];
+        meta = {
+          homepage = "https://melpa.org/#/frames-only-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     framesize = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }:
     melpaBuild {
         pname = "framesize";
@@ -25159,8 +25235,8 @@
         version = "20170107.626";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "1613bdfed2a35f97a49cb2a46dc100ececf8803e";
-          sha256 = "02zlc9fcf2kb0k5c7v7s9nj2hnfjcmc1zk91i8l61fnn9ywmi076";
+          rev = "39811fc7e745a7081b6e03b3743d36148f849f76";
+          sha256 = "15ppa89x78wpbq5d8rnz0by74p82vfq2bwxxiwy3nxbmcdygzlf7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -25173,6 +25249,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    fuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
+    melpaBuild {
+        pname = "fuff";
+        version = "20170201.1515";
+        src = fetchFromGitHub {
+          owner = "joelmo";
+          repo = "fuff";
+          rev = "d25e084f1f870046dd98b38de00d6ad468a91ebc";
+          sha256 = "0xnjk59572m3hqbjfi8za59gw24hfhdss9pxapp764q81656dv36";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4d0fc6d19559a9ea1bb7fce0c26a2dd65fc71603/recipes/fuff";
+          sha256 = "080a2lz6mv629c68z44qrrww080gy2iggfzajdq54rr8i23y14vf";
+          name = "fuff";
+        };
+        packageRequires = [ seq ];
+        meta = {
+          homepage = "https://melpa.org/#/fuff";
+          license = lib.licenses.free;
+        };
+      }) {};
     full-ack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "full-ack";
@@ -25359,12 +25456,12 @@
     fxrd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "fxrd-mode";
-        version = "20170124.1428";
+        version = "20170125.228";
         src = fetchFromGitHub {
           owner = "msherry";
           repo = "fxrd-mode";
-          rev = "f53240c92f80760fbfb2e0dcf2e68064145cec33";
-          sha256 = "0yx4p081960zwgjlw9yiq4jkc7czfvwbsc8z20pg394lx9nkrgr5";
+          rev = "8a1a0d5a08527ec8dee9bbe135803ed7ad297d9d";
+          sha256 = "1yzw0fnlqilpx4xl84hpr75l86y9iiqyh13r1hskmwb79s2niw1m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/796eb6b2126ec616c0de6af6abb7598900557c12/recipes/fxrd-mode";
@@ -25504,12 +25601,12 @@
     geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "geben";
-        version = "20170119.400";
+        version = "20170125.1937";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "geben";
-          rev = "006e101f458a218891606e7b43bb69aa9fb2d4e1";
-          sha256 = "0vc09k1mndd904yjijqpf38i06jkxwhrrhrq6lv75s66a3v2r52p";
+          rev = "cf0a28c1f43c2d01f4b4a408de4f7a915b11076e";
+          sha256 = "1hkdch2pj6vbj3j4hfazn2dvfhsgilqqn5r8m7ipj8sw1598rv0r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben";
@@ -25567,12 +25664,12 @@
     geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "geiser";
-        version = "20170116.1834";
+        version = "20170201.1455";
         src = fetchFromGitHub {
           owner = "jaor";
           repo = "geiser";
-          rev = "46b4c82278029d7193176b72ed3f0d3b1fa8899a";
-          sha256 = "16hvw10xg3nd8scybn95szppa1p5v30hdawxl1wzvafnfz83yf2r";
+          rev = "166593c68b66276e36c7d91a9653bb1c44650afc";
+          sha256 = "0r7m1blswgkm8zkb703ksa74jy296i1vj4rfq5lw2f4ixdvkyq2h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser";
@@ -26033,8 +26130,8 @@
         src = fetchFromGitHub {
           owner = "10sr";
           repo = "git-command-el";
-          rev = "a2c192aa779f81a99a10f0eb6dd018f13b2ff949";
-          sha256 = "1irqmypgc4l1jlzj4g65ihpic3ffnnkcg1hlysj7qpip5nbflqgl";
+          rev = "dce465ca1cd80e16df0f8dce8e427a76e9edc3b7";
+          sha256 = "0nnh5y0px7aa9yai9f149v7pjcjp7i3f35cfihs9n3r6bnrmgp4h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a55d697bc95a7026c7788c13e4765e1b71075e3/recipes/git-command";
@@ -26050,12 +26147,12 @@
     git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "git-commit";
-        version = "20170112.334";
+        version = "20170128.745";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "85db4aeebd2c66604c031c91d3f6bf4ce72f3449";
-          sha256 = "19b5fgwnb4m9v285jwdc72m9zgphkb3hassx4ks3zg6yij7g98hq";
+          rev = "e34f4e8eb00f292e8c475489fa7caa286857a421";
+          sha256 = "02kk093bg1vjnqfl3qy9h8zs50xzxbkay78qizav0h5myv4mjy10";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -26092,12 +26189,12 @@
     git-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-dwim";
-        version = "20100718.1436";
+        version = "20170126.414";
         src = fetchFromGitHub {
           owner = "rubikitch";
           repo = "emacs-git-dwim";
-          rev = "ad488a48551f57fd2b36fdf59fe2c27c73aca2d9";
-          sha256 = "12k0bh0mrwlkrsfhc0pm9b1xvdks20smarsmvzg4zi5060ds1pzg";
+          rev = "485c732130686c2f28a026e385366006435394b9";
+          sha256 = "0rcrsjx4ifa9y3rd5l4498kvqkh58zx21gl7mqp053jdsqqq1yrx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/git-dwim";
@@ -26327,8 +26424,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "git-modes";
-          rev = "af4ff3222f38daa0d352afdf3d20741b4fab2e79";
-          sha256 = "0nn5mj29airjacckzxkh4q12wnk2pq6mp1wlzxzxdwijmkk52dbr";
+          rev = "0be857ef001adb9b58770bd4e70d3103d2557277";
+          sha256 = "0b7c0dkrm7szvk83945ribdj5k9mxs7pmbillgh2b51rsrkk16rz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b4e2ddd2a80875afc0fc654052e6cbff2f3777f/recipes/gitattributes-mode";
@@ -26369,8 +26466,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "git-modes";
-          rev = "af4ff3222f38daa0d352afdf3d20741b4fab2e79";
-          sha256 = "0nn5mj29airjacckzxkh4q12wnk2pq6mp1wlzxzxdwijmkk52dbr";
+          rev = "0be857ef001adb9b58770bd4e70d3103d2557277";
+          sha256 = "0b7c0dkrm7szvk83945ribdj5k9mxs7pmbillgh2b51rsrkk16rz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitconfig-mode";
@@ -26558,8 +26655,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "git-modes";
-          rev = "af4ff3222f38daa0d352afdf3d20741b4fab2e79";
-          sha256 = "0nn5mj29airjacckzxkh4q12wnk2pq6mp1wlzxzxdwijmkk52dbr";
+          rev = "0be857ef001adb9b58770bd4e70d3103d2557277";
+          sha256 = "0b7c0dkrm7szvk83945ribdj5k9mxs7pmbillgh2b51rsrkk16rz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitignore-mode";
@@ -26890,12 +26987,12 @@
     gnus-desktop-notify = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "gnus-desktop-notify";
-        version = "20170104.1240";
+        version = "20170130.543";
         src = fetchFromGitHub {
           owner = "wavexx";
           repo = "gnus-desktop-notify.el";
-          rev = "6eea368514eb38bc36aee0bc5d948a214784a90c";
-          sha256 = "1bakg8maf626r9q8b8j022s63gip90qpz97iz4x7h3s9055i1dxr";
+          rev = "66bfa697c49973f3bbc47bcde2304b1f16d30309";
+          sha256 = "1xa9bqr1pbdx8zan81d6phyv473ihlvm8lif594m630hn68b5yw9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/gnus-desktop-notify";
@@ -27181,12 +27278,12 @@
     go-impl = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "go-impl";
-        version = "20170124.801";
+        version = "20170125.752";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-go-impl";
-          rev = "e5f8fd794282db7dfe5f740efd0764a5b5207035";
-          sha256 = "0l7bh1a6vr3v2ii2v94b0ddqzj4wpg9jh8rf69zmablzv6ggcg4z";
+          rev = "69f0d0ef05771487e15abec500cd06befd171abf";
+          sha256 = "1rmik6g3l9q1bqavmqx1fhcadz4pwswgfnkbaxl6c5b6g2sl26iq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aa1a0845cc1a6970018b397d13394aaa8147e5d0/recipes/go-impl";
@@ -27223,12 +27320,12 @@
     go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }:
     melpaBuild {
         pname = "go-playground";
-        version = "20161227.1105";
+        version = "20170126.1240";
         src = fetchFromGitHub {
           owner = "grafov";
           repo = "go-playground";
-          rev = "8365cac2f5bc2a71c454fe60856da0f97745ef65";
-          sha256 = "1pb5k05x02ccfk52rj97wbf5q2wrcrs60h7ds9j5ri4r1v6baflq";
+          rev = "eebb1fec2177bc85b746b948beac873a77bea4a2";
+          sha256 = "0ixpcms4f0q8327jyp2k48x03vjxwmzdsq76vg4j0kmjs9dfad1v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/900aabb7bc2350698f8740d72a5fad69c9219c33/recipes/go-playground";
@@ -27661,6 +27758,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    goose-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "goose-theme";
+        version = "20160828.545";
+        src = fetchFromGitHub {
+          owner = "thwg";
+          repo = "goose-theme";
+          rev = "acd017b50ab25a75fd1331eb3de66467e2042e9c";
+          sha256 = "1mmdvjsgnwgs6akhyj96fgj30mz53djdq85dl5q4cmiznlbma7hy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/818b526f3e633cf9922c011f3db5d3db7e17ee5d/recipes/goose-theme";
+          sha256 = "18kfz61mhf8pvp3z5cdvjklla9p840p1dazylrgjb1g5hdwqw0n9";
+          name = "goose-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/goose-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     gore-mode = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "gore-mode";
@@ -27812,8 +27930,8 @@
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "ba9e3f4422c2b82e0ce601ff43be4f419f06ac9a";
-          sha256 = "07ajraqpkd9v5g2h84dqq6xa5384hywagwivl6b64bxjf3a3pp3l";
+          rev = "0a28e595c8e9e99879e8d2f796e82c5a68202ff0";
+          sha256 = "1raknv2iv4hxdv8c8vxwrf1q90b9q4b5vgkbhmcfv08ii6s5dxn5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -27850,12 +27968,12 @@
     grab-mac-link = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "grab-mac-link";
-        version = "20160625.2258";
+        version = "20170131.254";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "grab-mac-link.el";
-          rev = "e5a720d6aa173939c35cab836a31651b184c11e6";
-          sha256 = "0pas60sib23vv1gkprp10jzksgchl5caqj565akg358a0iay7ax4";
+          rev = "d428ce46eaf4243510955f05f0890250b74b1837";
+          sha256 = "0zmvd6j21fynmyjzmychpghy23r800zmaj4naqz4jcand8skd79z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4cc8a72a9f161f024ed9415ad281dbea5f07a18/recipes/grab-mac-link";
@@ -28465,12 +28583,12 @@
     guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "guix";
-        version = "20170119.311";
+        version = "20170131.1037";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "guix.el";
-          rev = "9cb08e77e840495786860ece37006d302ee79926";
-          sha256 = "1z6cafmzfz8rlpwi9wgcvjb5wsq7ikdhr8jn4ykdkbqfkk1fp33f";
+          rev = "fbb16f39951dbcb1f185cd24b07063e166a1cc2d";
+          sha256 = "1pwq9yipycgn3v32yiz8r59g02z5l9hsab8ng3zbgrv42ivddd2j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -28588,6 +28706,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    hacker-typer = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hacker-typer";
+        version = "20170131.822";
+        src = fetchFromGitHub {
+          owner = "therockmandolinist";
+          repo = "emacs-hacker-typer";
+          rev = "809987b4da8b7350e42abf3783eaabd06c2ce559";
+          sha256 = "137hkjfyx0nw7lql3snm8vfx35464g9jn901wc75p61777a7x970";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/561661965a7a500f24671454b3b680816457e180/recipes/hacker-typer";
+          sha256 = "0i9kkxcz0fz4yviksl3f0ggh9kpwr9sidg7945r46bmblni3f0j9";
+          name = "hacker-typer";
+        };
+        packageRequires = [ async ];
+        meta = {
+          homepage = "https://melpa.org/#/hacker-typer";
+          license = lib.licenses.free;
+        };
+      }) {};
     hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "hackernews";
@@ -29195,12 +29334,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170123.2253";
+        version = "20170131.2356";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "6363905a78f101dd214d00bd9c0ca09d5b600d3e";
-          sha256 = "1dvaypwxgkp98i5g95m1nzvj9wzr2w8gxdpibpalj05i9lrhi73i";
+          rev = "74a0c4d17a970ebd2271453681d5633e55c3b00b";
+          sha256 = "0id3zn627j7lfv0fqynvdr72r59ngbwrhg2sw8pq0jza4yhg9n4n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -29279,12 +29418,12 @@
     helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ag";
-        version = "20161203.523";
+        version = "20170127.2155";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-ag";
-          rev = "997107a53abd3bda06d52e7021c87527c5747389";
-          sha256 = "1fj2s5jfbaw948kww64k8ksxa6pxfpb30fx93x182bq6sl8fqlwg";
+          rev = "c925ab0d3e50c100c7a1ffa54c724f39df1ae526";
+          sha256 = "0m5cap2ssp2yklvxlrfp3p5admaz3qhhakh81743r4klgkxv0kdk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag";
@@ -29531,12 +29670,12 @@
     helm-c-yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "helm-c-yasnippet";
-        version = "20160823.611";
+        version = "20170128.742";
         src = fetchFromGitHub {
           owner = "emacs-jp";
           repo = "helm-c-yasnippet";
-          rev = "5bf2c2adc0afe38c17c7cbf8c5d8a0604c4ee51f";
-          sha256 = "1yb4swbx1i90fbfhkcvbvqvnbbfing7cgxz1dcyfbnazkdlfryhh";
+          rev = "65ca732b510bfc31636708aebcfe4d2d845b59b0";
+          sha256 = "1cbafjqlzxbg19xfdqsinsh7afq58gkf44rsg1qxfgm8g6zhr7f8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2fc20598a2cd22efb212ba43159c6728f0249e5e/recipes/helm-c-yasnippet";
@@ -29594,12 +29733,12 @@
     helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "helm-cider";
-        version = "20170120.1913";
+        version = "20170125.2048";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "helm-cider";
-          rev = "a24ef274e382c1a158a76eae2570f1f007031cb8";
-          sha256 = "062abfb4sfpcc6fx3nrf3j0bisglrhyrg7rxwhhcqm9jhalksmdl";
+          rev = "9544babe63a14557594c5effc0b55db381776506";
+          sha256 = "0g6z3xy6hf2xy68qqa03ai4rl6aa6hd1wd62jrpx1iimyxbxjfdw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31d3cd618f2ac88860d0b11335ff81b6e2973982/recipes/helm-cider";
@@ -29678,12 +29817,12 @@
     helm-cmd-t = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-cmd-t";
-        version = "20150823.1157";
+        version = "20170125.659";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-cmd-t";
-          rev = "684dfb764e0e3660c053cb465f115e21c5ee4f80";
-          sha256 = "18d2fgxyij31rffh9qbgbaf42par9nami4pi1yfvbw9a5z5w2yxi";
+          rev = "7fa3d4a9f7271512e54c5de999079b27c9eec6bf";
+          sha256 = "06jdvkgnmwrgsdh9y2bwzdng7hy4331v3lh11jvdy4704w4khmak";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/helm-cmd-t";
@@ -29762,12 +29901,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170122.250";
+        version = "20170131.754";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "6363905a78f101dd214d00bd9c0ca09d5b600d3e";
-          sha256 = "1dvaypwxgkp98i5g95m1nzvj9wzr2w8gxdpibpalj05i9lrhi73i";
+          rev = "74a0c4d17a970ebd2271453681d5633e55c3b00b";
+          sha256 = "0id3zn627j7lfv0fqynvdr72r59ngbwrhg2sw8pq0jza4yhg9n4n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -30941,8 +31080,8 @@
         src = fetchFromGitHub {
           owner = "travisbhartwell";
           repo = "nix-emacs";
-          rev = "89b9356d32b16e0dc0794c323a4661a01c3b83de";
-          sha256 = "11pcp09z0vy6k81wghqq4rxlkfsc5bpgyacpl7bmxanj3qaa7ga5";
+          rev = "ace629f7645d12778c96ff7b5cf4b1e41a98af29";
+          sha256 = "11infdrdjc30kxvfg5rh1zn4idvkhf9s0c6v60qn441m1d5bnavq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/helm-nixos-options";
@@ -31189,12 +31328,12 @@
     helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "helm-projectile";
-        version = "20170113.209";
+        version = "20170125.1815";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "helm-projectile";
-          rev = "6d750dee69befb97bda1e8b6045973e5a5eca233";
-          sha256 = "0dsc8k7qk24qvk8msxla9z3r4299rrcwmm4k5fslplh66h0b8z85";
+          rev = "afb825b1eee559e11b0d950d4f3918d3a5663862";
+          sha256 = "0nlmhzgcyv3xqzfgbj1fzkg8by5lsy0rq3wdr5m5riqh4nza5ahr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile";
@@ -32947,12 +33086,12 @@
     hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "hledger-mode";
-        version = "20170101.650";
+        version = "20170201.858";
         src = fetchFromGitHub {
           owner = "narendraj9";
           repo = "hledger-mode";
-          rev = "a9d6377b15999718462e96c079503594940507ef";
-          sha256 = "163k8crlyvgzag9mwb8q5cx40jlislxz533yr7nkh3ks6ricsj31";
+          rev = "95e07b837706d86792649299fc13790248248139";
+          sha256 = "1gcq6cr3b502z1gjx57qkf65i74xklgbi7hxvgvywv2bzimwigxp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode";
@@ -33737,7 +33876,7 @@
       }) {};
     icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "icicles";
-        version = "20170118.2321";
+        version = "20170201.1015";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/icicles.el";
           sha256 = "072pxihvwpj6zkzrgw8bq9z71mcx5f6xsjr95bm42xqh4ag2qq0x";
@@ -35250,6 +35389,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    inline-docs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "inline-docs";
+        version = "20170130.1434";
+        src = fetchFromGitHub {
+          owner = "stardiviner";
+          repo = "inline-docs.el";
+          rev = "4e94a62f6b02c37c1497f34b36fe36f04cc23405";
+          sha256 = "0851jgh5v36d7lq9pwlmigqpqrfbrqqssib4id7s4c8j4sh4c03g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/48f0262ec568a3dd53dcc48f11e473b30c7e6ab1/recipes/inline-docs";
+          sha256 = "1a45a5bxm719fr4xvn26mraph3a19d53c2l74y1jrxhaksgl3n1j";
+          name = "inline-docs";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/inline-docs";
+          license = lib.licenses.free;
+        };
+      }) {};
     inlineR = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inlineR";
@@ -35961,8 +36121,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "75f9cebc6a44cc5aff51f403bae4774736ea52bd";
-          sha256 = "09xdlgwl40cb9kf622nnadh0g14g78p78yqmxfgy1wm3vbp0id99";
+          rev = "dbcee946f462e0fe2aa26f2a9e7ff4784c9e0e70";
+          sha256 = "199wg32ai117zkww4nzanksvdvzhmnnrn4cmp7l74z8i18cn2j2p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -36045,8 +36205,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "75f9cebc6a44cc5aff51f403bae4774736ea52bd";
-          sha256 = "09xdlgwl40cb9kf622nnadh0g14g78p78yqmxfgy1wm3vbp0id99";
+          rev = "dbcee946f462e0fe2aa26f2a9e7ff4784c9e0e70";
+          sha256 = "199wg32ai117zkww4nzanksvdvzhmnnrn4cmp7l74z8i18cn2j2p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -38196,8 +38356,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "a9d5d75609524597142b62a35640ecf8f2766d9b";
-          sha256 = "07w2azv3yyxs32b7d2cgwschqw47nvz83hjhhzmi6rvl9yr8ia4d";
+          rev = "309ac127558f13f3c1c0d1aa8713392f56d2246c";
+          sha256 = "13gmmvx6mc2r96jgpshhb11vwndid2d95ijy2vlrhjfkznkiqimd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -38634,8 +38794,8 @@
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "latex-extra";
-          rev = "d5b759fa61da968c3ca998ba0d2ef4a73647e5fd";
-          sha256 = "07aavdr1dlw8hca27l8a0i8cs5ga1wqqdf1v1iyvjz61vygld77a";
+          rev = "9e89c5548298394aa47a5087a8e79655105a6f3d";
+          sha256 = "1gz2zay2wah56s0gkkfnhfmm0wr1w4gjz51pb1q72br0n4r01xq9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/latex-extra";
@@ -39070,12 +39230,12 @@
     leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "leuven-theme";
-        version = "20170114.617";
+        version = "20170129.1131";
         src = fetchFromGitHub {
           owner = "fniessen";
           repo = "emacs-leuven-theme";
-          rev = "fa5f6105a18d08727172e6b9200cd0dec737d4ba";
-          sha256 = "0pmhg22rx6yd431lfcvyai1cahiljs1dr670i9i6m5ckdakcl1f4";
+          rev = "98c8e660f24d9e4873aa5cee00f47437ac301084";
+          sha256 = "10fwz2zlyvvlwnjb2dxdb8gfvcfb1y0j0qkagbk5lkyb6j65yayl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme";
@@ -39134,8 +39294,8 @@
         src = fetchFromGitHub {
           owner = "rvirding";
           repo = "lfe";
-          rev = "ec0ad79e17920ce28e32e2beb9fea872bf80762c";
-          sha256 = "047qnnwh46zmj7flkv53wdrq53cil76v0i6hx71xpyiykzm1dnq9";
+          rev = "fefa5e03592513d0e435650df52a53f861ce7b04";
+          sha256 = "0sxlcy19bds9yjpcsx731h69w8q2xs8gl3vbk33h2qq5imhd0q18";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
@@ -39190,12 +39350,12 @@
     lice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "lice";
-        version = "20151225.1022";
+        version = "20170131.1601";
         src = fetchFromGitHub {
           owner = "buzztaiki";
           repo = "lice-el";
-          rev = "d8572d997f54f4022f245dcf7c38fef6919a474a";
-          sha256 = "11c3vmxyddx7zm8fpxmzhq2xygyijbszinfiwllgb4l738bxwljb";
+          rev = "e6f7f827bcf5246aff25f52d6185c9bed91beeba";
+          sha256 = "1kjai3kvzn0flakjzrarh676ja6x6v0wbjxr69wqw9nvicvww7zx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2508699ebfc846742940c5e4356b095b540e2405/recipes/lice";
@@ -39447,12 +39607,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20170124.218";
+        version = "20170201.1201";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "6e64df1bc9f8d74c052bdf49c6971679170aaebe";
-          sha256 = "02fgi9rajsgyjxlmhkl6xi5zidcrrabb1llkjbr9b7qmlaqxhhcg";
+          rev = "68a11104caf14054d018043ca1545c189d9e65af";
+          sha256 = "12gsbg1v5jbd3bfig9h75sa55vvdg1hfagydrl5sp3n3xkh0jgh1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -39760,12 +39920,12 @@
     live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "live-py-mode";
-        version = "20170119.2209";
+        version = "20170125.2135";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "884d6b38b41f0ea6749361aab773d950cb6b8d27";
-          sha256 = "1g2bv9kaxlpfd3rxh67rp2gs0vcj1k49fhxs4ikqw5a1yfnnpcaq";
+          rev = "8c9db327dcd89ff4abf0dd8f0396d7efd66c0aca";
+          sha256 = "15h37r3nhcjsx8z963s5ic5gcagnw9apy3hdnri57mvfg8h1k6s6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -39847,8 +40007,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "d367f44048534bdb4d2d976c088bbad9fb125c0a";
-          sha256 = "1sbi3h6g5p5fc3ly3kyvwsrlzszr38vj54ikqpvqsp022757rf9i";
+          rev = "a1d4ee75a4d2e148a47febd36c88f41d5ccb4ca8";
+          sha256 = "1i294wmg7p111agmirmgyvirm849qy9kdgsiw7h06vxyy4wdvs4q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -39889,8 +40049,8 @@
         src = fetchFromGitHub {
           owner = "vic";
           repo = "color-theme-buffer-local";
-          rev = "ca8470bc34c65a026a6bca1707d95240bfd019af";
-          sha256 = "0gvc9jy34a8wvzwjpmqhshbx2kpk6ckmdrdj5v00iya7c4afnckx";
+          rev = "faf7415c99e132094f1f09c6b6974ec118a18d87";
+          sha256 = "1zk5clvkrq2grmm1bws2l5vbv1ycp41978bb902c563aws2rb8c0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/load-theme-buffer-local";
@@ -40073,12 +40233,12 @@
     logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "logview";
-        version = "20170114.1515";
+        version = "20170127.1107";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "logview";
-          rev = "c22ac44d14de8aaad532e47ea60c21c24d661a50";
-          sha256 = "02842gbxlq6crvd3817aqvj5irshls5km675vmhk0qd4cqg38abv";
+          rev = "bbed5a7651042594340de7e15ac96150097f1555";
+          sha256 = "0iks3451x6nf2hhhw6nvnh4y9gigjp3rd38sp7m60vsz9ggmninh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -40238,12 +40398,12 @@
     lua-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "lua-mode";
-        version = "20161101.1340";
+        version = "20170130.435";
         src = fetchFromGitHub {
           owner = "immerrr";
           repo = "lua-mode";
-          rev = "d7596990cdd197d3db682c4b2ca5410a4b522574";
-          sha256 = "06i2p0b5pcv9c4b6blxxh5sn7fgzglpl2bw2i27vyrh1szapq8mb";
+          rev = "652e299cb967fccca827dda381d61a9c144d97de";
+          sha256 = "1had9sj3pbbmdb66mw1dxs7i866ck0af7pak3wi6213v5vip7w6b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/lua-mode";
@@ -40421,6 +40581,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    madhat2r-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "madhat2r-theme";
+        version = "20170130.1431";
+        src = fetchFromGitHub {
+          owner = "madhat2r";
+          repo = "madhat2r-theme";
+          rev = "b7def53611d83cec80be22f8dbf76df49d2d17b1";
+          sha256 = "0vralm3a6qbf92zbvv9383rd79i5zwlz41c2p5qvb9qlr6x4bf7r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/44a382a388821908306c0b8350fba91218515e1b/recipes/madhat2r-theme";
+          sha256 = "0y588skd6c2ykyp54d38ibwrqglnaanr15d45d51cvcvp9k7x508";
+          name = "madhat2r-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/madhat2r-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     mag-menu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, splitter }:
     melpaBuild {
         pname = "mag-menu";
@@ -40487,12 +40668,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170119.1803";
+        version = "20170201.254";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "85db4aeebd2c66604c031c91d3f6bf4ce72f3449";
-          sha256 = "19b5fgwnb4m9v285jwdc72m9zgphkb3hassx4ks3zg6yij7g98hq";
+          rev = "e34f4e8eb00f292e8c475489fa7caa286857a421";
+          sha256 = "02kk093bg1vjnqfl3qy9h8zs50xzxbkay78qizav0h5myv4mjy10";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -40662,12 +40843,12 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "20170104.924";
+        version = "20170128.745";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "85db4aeebd2c66604c031c91d3f6bf4ce72f3449";
-          sha256 = "19b5fgwnb4m9v285jwdc72m9zgphkb3hassx4ks3zg6yij7g98hq";
+          rev = "e34f4e8eb00f292e8c475489fa7caa286857a421";
+          sha256 = "02kk093bg1vjnqfl3qy9h8zs50xzxbkay78qizav0h5myv4mjy10";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -40869,6 +41050,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    major-mode-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "major-mode-icons";
+        version = "20170130.108";
+        src = fetchFromGitHub {
+          owner = "stardiviner";
+          repo = "major-mode-icons";
+          rev = "278e11182c900ea5bed7004e015ef18e383e40bb";
+          sha256 = "13dfm08w2l8fxmb77pz33yf410hmb1606fy8avslsflaczdm67kw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c8f551bec8bdc5dee4b31edea0c2f92b3c77ec56/recipes/major-mode-icons";
+          sha256 = "02p5h9q2j7z3wcmvkbqbbzzk3lyfdq43psppy9x9ypic9fij8j95";
+          name = "major-mode-icons";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/major-mode-icons";
+          license = lib.licenses.free;
+        };
+      }) {};
     make-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "make-color";
@@ -41103,12 +41305,12 @@
     mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }:
     melpaBuild {
         pname = "mandoku";
-        version = "20170122.2132";
+        version = "20170131.506";
         src = fetchFromGitHub {
           owner = "mandoku";
           repo = "mandoku";
-          rev = "12e55ba09155470c43ebb073f2594425949d2745";
-          sha256 = "16p9j5dymilmn2qmg9cp0ns28ywfckd72xy9v7bxp8jd0dxj8nwk";
+          rev = "bc7cb4b4dcc8b3f176f09345ccbaf843ae9dc41f";
+          sha256 = "0n10d6kdaw0cdjyafk5xzmjriig4nqc9gjcdmif38sqrcm5pwrkp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -41774,27 +41976,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    meacupla-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "meacupla-theme";
-        version = "20151027.1517";
-        src = fetchFromGitLab {
-          owner = "jtecca";
-          repo = "meacupla-theme";
-          rev = "f57542222a3a43af9aae665e05a84a61637ab22a";
-          sha256 = "136lh39hakwx46rd1gsmsfhsj78mrpamid766v2vjx9rkkprk0zv";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/397ea693de4bdc7499e86af273cbc4152c04035e/recipes/meacupla-theme";
-          sha256 = "09q88q2xghj5vn5y3mjrcparfwdzavkgjyg2ay55h7wf5f2zpw2d";
-          name = "meacupla-theme";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/meacupla-theme";
-          license = lib.licenses.free;
-        };
-      }) {};
     mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mediawiki";
@@ -41816,22 +41997,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    meghanada = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
+    meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "20170124.1559";
+        version = "20170131.627";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "04112dc5db30a98d2ec1dae41d8c6ed1c7aff0be";
-          sha256 = "0f14b1h6zv0v8hn99bqmidndh36mrsckmcirrrffm591ksf4l0zd";
+          rev = "6b1b514ca3424c08301325f99608510130365cd1";
+          sha256 = "1pl65186k696mx6lm6lnn2jm86kwky780rph97cqb1dy506qpqxf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
           sha256 = "10f1fxma3lqcyv78i0p9mjpi79jfjd5lq5q60ylpxqp18nrql1s4";
           name = "meghanada";
         };
-        packageRequires = [ cl-lib company emacs flycheck yasnippet ];
+        packageRequires = [ company emacs flycheck yasnippet ];
         meta = {
           homepage = "https://melpa.org/#/meghanada";
           license = lib.licenses.free;
@@ -42661,6 +42842,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    mmm-jinja2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }:
+    melpaBuild {
+        pname = "mmm-jinja2";
+        version = "20170128.416";
+        src = fetchFromGitHub {
+          owner = "glynnforrest";
+          repo = "mmm-jinja2";
+          rev = "f39a9bfe9e3001b0141ed3d6a156fbb60a76e25c";
+          sha256 = "0p83i4ikd1bj4r0hahwnlj2gliwcgfql5rzvv7phl3nhjinclj55";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/721b9a6f16fb8efd4d339ac7953cc07d7a234b53/recipes/mmm-jinja2";
+          sha256 = "0zg4psrgikb8644x3vmsns0id71ni9fcpm591zn16b4j64llvgsi";
+          name = "mmm-jinja2";
+        };
+        packageRequires = [ mmm-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/mmm-jinja2";
+          license = lib.licenses.free;
+        };
+      }) {};
     mmm-mako = callPackage ({ fetchhg, fetchurl, lib, melpaBuild, mmm-mode }:
     melpaBuild {
         pname = "mmm-mako";
@@ -42873,12 +43075,12 @@
     mode-icons = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mode-icons";
-        version = "20170116.1230";
+        version = "20170131.1751";
         src = fetchFromGitHub {
           owner = "ryuslash";
           repo = "mode-icons";
-          rev = "60d5b4dbbb07d2515f195f8ffe75f12f0913a3d7";
-          sha256 = "0ck7v4pzhzymq0cjwyl0iv721k9m0cx36m8ff7lw0bmgbzdi8izn";
+          rev = "da41bb7ba35a4ce0a4e02e1ce2fa7fe4190b1bf9";
+          sha256 = "0p4jm7klfh27g1wbsa8qm7vlmpqs57pdk2phxq2qwbim095fsp0l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/mode-icons";
@@ -43140,12 +43342,12 @@
     monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "monroe";
-        version = "20170103.1555";
+        version = "20170126.1821";
         src = fetchFromGitHub {
           owner = "sanel";
           repo = "monroe";
-          rev = "7a72255d1b271ff11ad8e66c26a476aa4542c8f7";
-          sha256 = "16laq4q8mc85kc658ni6kflcfinyxl446fdih2llmg7dji0xarpl";
+          rev = "03e09ff0c4ae9fb4b0d1d436ca56f36b63e21b7c";
+          sha256 = "1cxng7gi2ik57w11li9fl12cp9hiv98ynpm6nr0mw80rvb9qxhak";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe";
@@ -43782,11 +43984,11 @@
     multi-project = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "multi-project";
-        version = "20161204.223";
+        version = "20170128.1236";
         src = fetchhg {
           url = "https://bitbucket.com/ellisvelo/multi-project";
-          rev = "8c1ef1ca48e0";
-          sha256 = "1xfix5184gach3w89c5xcp9ww9cfblm7syx9ibwp5a2pjicw5vql";
+          rev = "1b4aa85d1e65";
+          sha256 = "0pgj1kkv7ddbg3zk4b6q4d6r4xw8dhsj4wwg9ydxd9ahdlbb6i66";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project";
@@ -44406,8 +44608,8 @@
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "names";
-          rev = "00862c57ae6363ba86d1e5ce138929a1b6d5c7e6";
-          sha256 = "0m82g27gwf9mvicivmcilqghz5b24ijmnw0jf0wl2skfbbg0sydh";
+          rev = "65b577b1215c4cfaee1ed5e98b0545e9ef7b9964";
+          sha256 = "13r1qmibjikx6hz36m6xf79wap6fci2x7jz7rac5s52hq2hdj2wk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/names";
@@ -44780,8 +44982,8 @@
         src = fetchFromGitHub {
           owner = "rsdn";
           repo = "nemerle";
-          rev = "ccf1483da01d77185f3df63c6d41be59b9bc6f20";
-          sha256 = "02znwh2qg4a31ljg8h9yd8nlk3qmdq5q0vr2c2zfrcrx3z7njamb";
+          rev = "2f76c26353062ba6578914113ca26c53f5abcdb7";
+          sha256 = "1nn6kfg84g5aplis76q7r6wx74rj6r3n6kcdghvsyih77r4r32jl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle";
@@ -44815,22 +45017,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    neotree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "neotree";
-        version = "20170110.321";
+        version = "20170201.712";
         src = fetchFromGitHub {
           owner = "jaypei";
           repo = "emacs-neotree";
-          rev = "d2ae6ac8a919f164f34c589f2f46ddd140a79f81";
-          sha256 = "0xqcrxmpk2z4pd9scqn2nannqy0a76mkkqv9bz037a36w8v481nd";
+          rev = "b7479d0d96e44983917c7e3546bee2e215bb4a30";
+          sha256 = "09cjnybyd9mgvy9vn1hd3r0fzmxla5ijpa83mx5ddjbig10wrva1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree";
           sha256 = "05smm1xsn866lsrak0inn2qw6dvzy24lz6h7rvinlhk5w27xva06";
           name = "neotree";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "https://melpa.org/#/neotree";
           license = lib.licenses.free;
@@ -45116,8 +45318,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "4e6a2fbc561f3e692a5644b3816a205ba769f39e";
-          sha256 = "1z0jsckzskx9jgshilfhf0ybqx9lkk61r0ww2hk7pqxd2bhd4caq";
+          rev = "7a65b2470eb53a320749d76746fbf65790183d9d";
+          sha256 = "0h0x8qxyqg1n9z8p9l66bqlw2b0ihimkic645b1xndiqrv3lxnvm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -45133,12 +45335,12 @@
     nix-sandbox = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "nix-sandbox";
-        version = "20160914.1324";
+        version = "20170131.241";
         src = fetchFromGitHub {
           owner = "travisbhartwell";
           repo = "nix-emacs";
-          rev = "89b9356d32b16e0dc0794c323a4661a01c3b83de";
-          sha256 = "11pcp09z0vy6k81wghqq4rxlkfsc5bpgyacpl7bmxanj3qaa7ga5";
+          rev = "ace629f7645d12778c96ff7b5cf4b1e41a98af29";
+          sha256 = "11infdrdjc30kxvfg5rh1zn4idvkhf9s0c6v60qn441m1d5bnavq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/66be755a6566e8c0cfb5aafa50de29b434023c7a/recipes/nix-sandbox";
@@ -45158,8 +45360,8 @@
         src = fetchFromGitHub {
           owner = "travisbhartwell";
           repo = "nix-emacs";
-          rev = "89b9356d32b16e0dc0794c323a4661a01c3b83de";
-          sha256 = "11pcp09z0vy6k81wghqq4rxlkfsc5bpgyacpl7bmxanj3qaa7ga5";
+          rev = "ace629f7645d12778c96ff7b5cf4b1e41a98af29";
+          sha256 = "11infdrdjc30kxvfg5rh1zn4idvkhf9s0c6v60qn441m1d5bnavq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/nixos-options";
@@ -45238,12 +45440,12 @@
     no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "no-littering";
-        version = "20170122.357";
+        version = "20170122.942";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "no-littering";
-          rev = "e161c328d248f861bb56991492182f20e60b6b41";
-          sha256 = "0ka7gbiarhc1r8rynxq2vf0k5p4044bm1jc92ca1hav34mqfg2xp";
+          rev = "87fffa1973376bd1837fcf84277cd16db9c96957";
+          sha256 = "1nfllm98d0893wk49fkijc071pg3v3qmpy4apyppj88k6m58y573";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
@@ -45382,11 +45584,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "20161215.457";
+        version = "20170127.1808";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "4a2ce7b5706b53cdd30c474d556f18d731c21bb5";
-          sha256 = "1hhdaapyj6kg9zys7fw5rh7rqc4540wyh3c5dkhb4b9jlbzslj40";
+          rev = "08343d3da03a11e7a575981fac20ab10426f19be";
+          sha256 = "0bbfp7mgcp48qvcxwznncaskihxxf99j8mhsiqww4ll1pfpi1w3q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -46091,12 +46293,12 @@
     ob-prolog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ob-prolog";
-        version = "20170102.953";
+        version = "20170126.921";
         src = fetchFromGitHub {
           owner = "ljos";
           repo = "ob-prolog";
-          rev = "7e94309d3a21d7e265f3a85b41801397f286af00";
-          sha256 = "0qxpgnjrx04dl43i949vcwv70sc7i23ivyvfk82hdvl8c2lwfd7w";
+          rev = "e70a9f9b96fd0fedcc30de7768c870f4b0ee1ae9";
+          sha256 = "0vpxnvvmfxqwq1i6wl1gv76dgavcl4sg3f1ma42sq2bldpdn8am7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fb87868cd74325f0a4a38c5542c264501000951d/recipes/ob-prolog";
@@ -46154,12 +46356,12 @@
     ob-sagemath = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, sage-shell-mode }:
     melpaBuild {
         pname = "ob-sagemath";
-        version = "20170105.516";
+        version = "20170130.1833";
         src = fetchFromGitHub {
           owner = "stakemori";
           repo = "ob-sagemath";
-          rev = "dfa6cf72a0e38d7d4f0f130c6f2f0f367f05a8ea";
-          sha256 = "1scyjca5niiv1ccr18ninpb0fmgyqklbn6z9pja84a2wb1w9r6mm";
+          rev = "1d99614509624d7bfd457325ca52f3bf1059f4d5";
+          sha256 = "11qsh0lfb1kqiz0cfx7acfpyw0a90bh7r86a4h31d4xl1xfq94sx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc074af316a09906a26ad957a56e3dc272cd813b/recipes/ob-sagemath";
@@ -47380,8 +47582,8 @@
         src = fetchFromGitHub {
           owner = "dfeich";
           repo = "org-clock-convenience";
-          rev = "d4f98e95d75d78822ddfab6b67bc971516f9773c";
-          sha256 = "0s69jqadrgsmlv74386i900gr6xr3kgr5x1n75gqf4rsdmhx4s5d";
+          rev = "dc8054d0d9ab5ef659c56c27bdd125c8b850b36f";
+          sha256 = "0wbij5inn5wy0jhghnba32h537ff3xy8wwy7jaf495hcws4gnag8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a80ed929181cdd28886ca598a0c387a31d239b2e/recipes/org-clock-convenience";
@@ -47394,22 +47596,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-clock-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    org-clock-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
     melpaBuild {
         pname = "org-clock-csv";
-        version = "20160906.1047";
+        version = "20170130.2213";
         src = fetchFromGitHub {
           owner = "atheriel";
           repo = "org-clock-csv";
-          rev = "62acbb8673cafc9db00fde7ea1804cde6a781cd0";
-          sha256 = "16gq2yyjzfyra0gzabcd9pclickqy4hal0kgx2xmdfxpxchfk0gs";
+          rev = "59482e800700e66db5381661c1e6b3edb2c03a34";
+          sha256 = "099mjbd0n7azv4v3i4a7fw3f85c16ck334sqv2l92k0dpsjdmnrx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv";
           sha256 = "02spjrzdf1kmvyvqkzg7nnmq9kqv75zwxn5ifqmg0f7a1gw28f0l";
           name = "org-clock-csv";
         };
-        packageRequires = [];
+        packageRequires = [ org s ];
         meta = {
           homepage = "https://melpa.org/#/org-clock-csv";
           license = lib.licenses.free;
@@ -47900,12 +48102,12 @@
     org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-journal";
-        version = "20170104.648";
+        version = "20170126.234";
         src = fetchFromGitHub {
           owner = "bastibe";
           repo = "org-journal";
-          rev = "008ef4549135a5daa2382e57a4d04a439d22cdc6";
-          sha256 = "1m0fmyj4rzc8hdxjmfzianzna6929p5xfrwj0azybv9cmcwfyw8w";
+          rev = "24313870fa682a53e7f3f916b0e853a731868886";
+          sha256 = "0nc3jl7sgqc8swi89rdk1yapmqxp8vaxm7390iqxy7a1sng4jydh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal";
@@ -47966,8 +48168,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "2348d1834351b57d5ff9bbdb2c74c3e69ed60cfb";
-          sha256 = "1pg47pg3rb4rcf94wj1hgznswc10x5zm8qr47bxw196c4m1imjkb";
+          rev = "f157283c127729c681ac363daa3f411b68da7c3c";
+          sha256 = "0cqsahn5ghcivfx0qsa29ij5bviykmq4zx32ssckwp8za5pswfl6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -47986,8 +48188,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "2348d1834351b57d5ff9bbdb2c74c3e69ed60cfb";
-          sha256 = "1pg47pg3rb4rcf94wj1hgznswc10x5zm8qr47bxw196c4m1imjkb";
+          rev = "f157283c127729c681ac363daa3f411b68da7c3c";
+          sha256 = "0cqsahn5ghcivfx0qsa29ij5bviykmq4zx32ssckwp8za5pswfl6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -48135,6 +48337,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-parser = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-parser";
+        version = "20170129.1041";
+        src = fetchhg {
+          url = "https://bitbucket.com/zck/org-parser.el";
+          rev = "02aab579be3f";
+          sha256 = "0yb8zkq6iizpkp331wg6l9ksvy1z88pq3g12ya7ral992yn5yb8z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/28d55005cbce276cda21021a8d9368568cb4bcc6/recipes/org-parser";
+          sha256 = "06yb78mf486b986dhvqg3avflfyi271vykyars465qpk0v8ahq8h";
+          name = "org-parser";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/org-parser";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-password-manager = callPackage ({ fetchgit, fetchurl, lib, melpaBuild, org, s }:
     melpaBuild {
         pname = "org-password-manager";
@@ -48353,12 +48575,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20170120.630";
+        version = "20170130.1818";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "b94f812ad63cc3e3a12e2cd94aeba7bf959531c4";
-          sha256 = "0d2ckbw4qv5vpglhh1bcm866y8ngv7idbchhlch809gvcc2imjns";
+          rev = "ad34032f07a8eac49f091824ac80b7752e8bdf74";
+          sha256 = "03869nki9c0msmqclm7mgsqnhdbkp0xahnpk8h9d7zldqiqck0x7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -48853,12 +49075,12 @@
     organic-green-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "organic-green-theme";
-        version = "20161222.232";
+        version = "20170125.606";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "organic-green-theme";
-          rev = "dc66586b8581b35a723f68211fb1efeb7f00ffef";
-          sha256 = "012s9m3cysnfbr0s2l53inm3k06k7ra8jlp68cdnslhb41az2kp7";
+          rev = "5f8ce452d16f1acbd18a6963f2c042851968dd8d";
+          sha256 = "0irkcjb6vxb7kf9fr4s4ap6lighhh7h6mwfamcwcacgwfvs4zs7y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9383ef5f0372724b34f4bb9173ef8ccbb773e19e/recipes/organic-green-theme";
@@ -49042,12 +49264,12 @@
     origami = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "origami";
-        version = "20160924.218";
+        version = "20170129.805";
         src = fetchFromGitHub {
           owner = "gregsexton";
           repo = "origami.el";
-          rev = "a77d7f16345296bbbccc4f3d0fe45587c3907493";
-          sha256 = "13w5mcdxvjzbixbg5kszlqrzrd5l51ddx1z65ir8zjp4xnbf9ysn";
+          rev = "5630536d04613476e13b413fe05fd0bbff4107ca";
+          sha256 = "1w6cyyvjw6x4x0a7mbybw37f70cdnwajv8snvmnrqd73vggm70fd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b816be227dfc7330292a50346c4bb37394d3e998/recipes/origami";
@@ -49466,8 +49688,8 @@
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "94713fe129cd723f26b066158ac0e061be77d22e";
-          sha256 = "1gqvw2130725sdg1g6binpqb5m73klrczniwkj3dfyd65mcynxy7";
+          rev = "e633abf5fc953e88e3629e9a5d7ca9bdf47a29cd";
+          sha256 = "0fasg280qza87dsmpsgyclk50nrr5jmm2vf6jxpzkccm7m1ar8w6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -49966,12 +50188,12 @@
     package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-lint";
-        version = "20161124.1615";
+        version = "20170127.1538";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "package-lint";
-          rev = "633fbff47fd4872d55d672029300c043e13e966e";
-          sha256 = "0mr0yry397777gmvqj3z7b9zy47k3k3ghr03jyjafra4kjm85x00";
+          rev = "f1b0f6237613a680dfdcddc1c096dc870a8efaa5";
+          sha256 = "0wrqsjcs3dvbay7z3zw73hys259yz9chblrvcnfqgmjl5n693gnf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -50050,12 +50272,12 @@
     packed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "packed";
-        version = "20160523.600";
+        version = "20170130.1015";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "packed";
-          rev = "765cd52712f0daf40c45d169cc062b6bc94aa807";
-          sha256 = "1kjcb6z08bj5ysxrykgz3x6bz2122yycpjhbv875ppc5ihls88xl";
+          rev = "d2f01bffc987b226f618dda0663a1e233161518d";
+          sha256 = "16xwgi0zkbbvkbxf0ld6g4xlfd95j45sca57h162wld6l27jrv4f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee9e95c00f791010f77720068a7f3cd76133a1c/recipes/packed";
@@ -50465,12 +50687,12 @@
     parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "parinfer";
-        version = "20170113.956";
+        version = "20170126.2111";
         src = fetchFromGitHub {
           owner = "DogLooksGood";
           repo = "parinfer-mode";
-          rev = "a91b1ee5392c6a98c102ddba2f0c15ab67f8ad1b";
-          sha256 = "09337fpv492rzd2ah7d8kxyv5spcgwf58xr943ya09sgi2invkbx";
+          rev = "12f54f661180f894be9bc0fd956b30a69b3f39e0";
+          sha256 = "0w44w2qgvbv1m5dwyqa7863r1r32fva5rgc0w14srpak41nn3bj2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer";
@@ -51072,12 +51294,12 @@
     pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }:
     melpaBuild {
         pname = "pdf-tools";
-        version = "20170119.1442";
+        version = "20170130.300";
         src = fetchFromGitHub {
           owner = "politza";
           repo = "pdf-tools";
-          rev = "9dafe31ce233eb549f402ccd7abed495c81ab152";
-          sha256 = "1kwnac2v0pr3iirq7bhbzb61z3pficybv23i6bcsrxjp3vfahpfx";
+          rev = "3a32d2420cc40ed864215f75aae4f6d868dc1cd2";
+          sha256 = "15j8ll2rna5f0a4zq2bflbn888c6yp852i405qlcxcjvs3jalxcy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools";
@@ -51785,12 +52007,12 @@
     php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "php-mode";
-        version = "20161217.537";
+        version = "20170131.1741";
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "php-mode";
-          rev = "a6c998937341f49138f07c15050efe7e5809be23";
-          sha256 = "1g0m9vsx0n2rzph4ipyab8fl6bv26y2dmyrgkici545k2mhhhiqp";
+          rev = "349b85c1a9c79505d218b43940470c862dcdff32";
+          sha256 = "15mlzk7mvv3wfz73k30a7syb274myls6d44nibwg00r794drr57g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -52247,12 +52469,12 @@
     plan9-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "plan9-theme";
-        version = "20161102.1954";
+        version = "20170129.553";
         src = fetchFromGitHub {
           owner = "john2x";
           repo = "plan9-theme.el";
-          rev = "6f1aaa35f57fc451e4c06164e74f61e17ce1cacf";
-          sha256 = "0cfs7qxz16aiz43pk4dcg3nvhs5r64fgy3476wpy0fac0fm275rl";
+          rev = "db36861907144674a2526fed3ff733c53489b7f5";
+          sha256 = "1sxx749xwxxab3k98wb4gpvy723kw5lcm7zhvvbjbgxr43lk6d05";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cdc4c2bafaa09e38edd485a9091db689fbda2fe6/recipes/plan9-theme";
@@ -53716,12 +53938,12 @@
     projectile-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, sr-speedbar }:
     melpaBuild {
         pname = "projectile-speedbar";
-        version = "20160630.947";
+        version = "20170127.810";
         src = fetchFromGitHub {
           owner = "anshulverma";
           repo = "projectile-speedbar";
-          rev = "a00c6c0e52acd2223997b1a7a996cd786e68f6f2";
-          sha256 = "0bsk1336ak5bq9v26m2ql61yvhv15gyh8wrc6j4c655lxysbq9gs";
+          rev = "1b9b3ae7624ca58a41ca7e0d0eb37556d3105c44";
+          sha256 = "0src453yf63j5dhndrqjx6gh6nfm5c83y2xj2ibk3sj61x9daxj2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eda8cb5a175258404c347ffa30fca002504467a0/recipes/projectile-speedbar";
@@ -53951,8 +54173,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "0aa5af3e68940325a1c4ef9a8cacb3d072ba4baa";
-          sha256 = "03wk1hqm7xzxq20a8klc630219sja6z26lzgzhcf6af1s1cn9x8p";
+          rev = "39756643df2f88805649595e651b719c8f5a4dea";
+          sha256 = "012d27q0b9cw1jahi47k0473w96l1wp6sr4rcm5ywa29nxrirgg0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -53965,22 +54187,32 @@
           license = lib.licenses.free;
         };
       }) {};
-    psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "psc-ide";
-        version = "20170122.333";
+        version = "20170131.23";
         src = fetchFromGitHub {
           owner = "epost";
           repo = "psc-ide-emacs";
-          rev = "5224da8df475fbd374ebc0e0690cee4a53a42477";
-          sha256 = "01xjmqb2mc4q1pf9gc9jf7gasn46b5ny5jg0w4mkl9llh2p3p8fw";
+          rev = "4a78aac90d84ea7aef6219497bd75c3ead988806";
+          sha256 = "04qckg29wgzcr4z696s5wm4w8lrq3m799p447l87z5i23gk4hw7j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide";
           sha256 = "1f8bphrbksz7si9flyhz54brb7w1lcz19pmn92hjwx7kd4nl18i9";
           name = "psc-ide";
         };
-        packageRequires = [ cl-lib company dash dash-functional emacs s ];
+        packageRequires = [
+          cl-lib
+          company
+          dash
+          dash-functional
+          emacs
+          flycheck
+          let-alist
+          s
+          seq
+        ];
         meta = {
           homepage = "https://melpa.org/#/psc-ide";
           license = lib.licenses.free;
@@ -54094,12 +54326,12 @@
     pug-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pug-mode";
-        version = "20161221.1154";
+        version = "20170127.1949";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-pug-mode";
-          rev = "8967d57715ad303b9c987f4390a18c51c2f30cb3";
-          sha256 = "0kk5i7dynxg53g7wx5k6lkk1015pqphxzanqw0m6nhvv1p56w84x";
+          rev = "83599129c0de6f9f5082d019373c3d9347150191";
+          sha256 = "17fwl967kw0kykakvga9vk7i294y5iysff263ir4y6vsnca3syn8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode";
@@ -54684,8 +54916,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "5b1b24a4b40f2a885cca2c4550d326fe40839600";
-          sha256 = "0jy0avk7x7r8ljjiyv5hbsamjsnl7vkr6w5ksbyf2nfgb7f3fjlq";
+          rev = "7daed7b8982480c868b0f642a5251f00ffb253c6";
+          sha256 = "1sa21sylx5hvp1m28vx823hmk1lnp1ygg9pl22jjv318iks6f2vj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -55142,12 +55374,12 @@
     quickrun = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "quickrun";
-        version = "20170114.645";
+        version = "20170129.650";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-quickrun";
-          rev = "70e93e06778f44113f405aedec6187b925311d57";
-          sha256 = "0swbgsidq11w7vyjhf06dn8vsj06j9scj8n2dm9m7fasj0yh3ghw";
+          rev = "572869b70f8987306f4d938badf37bbf5c08b518";
+          sha256 = "0zw3hyydqs616r96snns5mwxcn2il5hldiy8jpbyqh32mlam8w8f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/quickrun";
@@ -55226,12 +55458,12 @@
     racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "racket-mode";
-        version = "20170104.754";
+        version = "20170129.1015";
         src = fetchFromGitHub {
           owner = "greghendershott";
           repo = "racket-mode";
-          rev = "351aa58d75491c789280a3703786f35c8be28bec";
-          sha256 = "1dfmjfw0sz0mfqry65nq7811fv4lydqvl8v47k9jw7prw4g29hhr";
+          rev = "bb61c8d3026c598fc6c52f742ca7898a9f7c22c7";
+          sha256 = "0gxdclp8mg90v30wb30ksx6xr1r1kjyrqnr9r16cplqvkac1lz0x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode";
@@ -55310,12 +55542,12 @@
     railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "railscasts-reloaded-theme";
-        version = "20170120.434";
+        version = "20170124.1912";
         src = fetchFromGitHub {
           owner = "thegeorgeous";
           repo = "railscasts-reloaded-theme";
-          rev = "9ff7a3223213637c77622a695f98b9b0ac0ff91a";
-          sha256 = "08yg5g6d9a971zq71mxci3228mayr6k7s1b0b78nx55qmkzh6409";
+          rev = "318c9a812d53884da1a9d67206fcfd9ded4d320f";
+          sha256 = "1al62r2fys6z1ja8zbh6yskprp1iq03l2jbnwbx8i3gd2w0ib7qk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme";
@@ -55898,12 +56130,12 @@
     realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }:
     melpaBuild {
         pname = "realgud";
-        version = "20170117.415";
+        version = "20170128.727";
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "emacs-dbgr";
-          rev = "20b8d5dd7bd96f4e8d143596a6435d84fb8d4125";
-          sha256 = "0ckd7jya4368qin90x20dqf5kh3300n03f9g2qb54s93d430n0yi";
+          rev = "df6921b587f2e14876ee7bf106b5c1fad81da2dc";
+          sha256 = "1sssq5q89qn4jcsl6hmmbq008b23hpaa7jga88wlc867dd5f66d8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud";
@@ -56275,12 +56507,12 @@
     redtick = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "redtick";
-        version = "20161103.1157";
+        version = "20170129.1428";
         src = fetchFromGitHub {
           owner = "ferfebles";
           repo = "redtick";
-          rev = "ac8b213cf3dbd43a86910a152426b14576fbece0";
-          sha256 = "1c1hllznnrypbh0cp162kbdcm0vrcsws5nx5l32c6h89n9dm397g";
+          rev = "618255aa1100948af29d76d54aca7554fd66aede";
+          sha256 = "0zbx9g91xrh7ppaa8lq9mh1ax6k9yv3xsyjiyan9zsji3qzh59qv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3187bd436541e2a5c2b28de67c62f5d5165af737/recipes/redtick";
@@ -56730,22 +56962,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    request = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    request = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "request";
-        version = "20170120.414";
+        version = "20170131.1747";
         src = fetchFromGitHub {
           owner = "tkf";
           repo = "emacs-request";
-          rev = "2d9b4cd49a4b0196f23ce07dc0a4af7b0b724d3b";
-          sha256 = "060mz0jzpyd741pi9ynk7pmfz85gkkjbk7jngc8h4ksj27pi3ia2";
+          rev = "a3d080e57eb8be606fbf39d1baff94e1b16e1fb8";
+          sha256 = "0wyxqbb35yqf6ci47531lk32d6fppamx9d8826kdz983vm87him7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request";
           sha256 = "0h4jqg98px9dqqvjp08vi2z1lhmk0ca59lnrcl96bi7gkkj3jiji";
           name = "request";
         };
-        packageRequires = [ cl-lib emacs ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/request";
           license = lib.licenses.free;
@@ -56758,8 +56990,8 @@
         src = fetchFromGitHub {
           owner = "tkf";
           repo = "emacs-request";
-          rev = "2d9b4cd49a4b0196f23ce07dc0a4af7b0b724d3b";
-          sha256 = "060mz0jzpyd741pi9ynk7pmfz85gkkjbk7jngc8h4ksj27pi3ia2";
+          rev = "a3d080e57eb8be606fbf39d1baff94e1b16e1fb8";
+          sha256 = "0wyxqbb35yqf6ci47531lk32d6fppamx9d8826kdz983vm87him7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request-deferred";
@@ -56814,22 +57046,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    resize-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "resize-window";
-        version = "20160511.2005";
+        version = "20170130.1926";
         src = fetchFromGitHub {
           owner = "dpsutton";
           repo = "resize-window";
-          rev = "dec035ff44fdb743bb2dc82274114dc6ea1851f9";
-          sha256 = "1ps9l6q6hgzzaywkig0gjjdlsir9avxghynzx9a3q6h0fpdkpgrj";
+          rev = "27364959798de0f019da799975027842c07e7829";
+          sha256 = "0x92s4cv9k566rc248zrcmh507df7d19p7b3vcfd0dlfpbqc0qnv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window";
           sha256 = "0h1hlj50hc97wxqpnmvg6w3qhdd9nbnb8r8v39ylv87zqjcmlp8l";
           name = "resize-window";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/resize-window";
           license = lib.licenses.free;
@@ -57336,12 +57568,12 @@
     rope-read-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rope-read-mode";
-        version = "20161003.610";
+        version = "20170131.217";
         src = fetchFromGitHub {
           owner = "marcowahl";
           repo = "rope-read-mode";
-          rev = "442886655166e9c9472d6aebad27aaf2fed3f3e0";
-          sha256 = "1f4wp85j691sgc1yx3l73bdm5lvqgvgms2ic9yg3g0v5n8drgn1k";
+          rev = "a3810cf223c92353338418058153a466657a2dca";
+          sha256 = "1i6dk80h6f4crw55iwbi5qxj15pr46j8cbd3b5nxcsvhl32900by";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14a674559aa485e92357a8b941304ae8167b9c3e/recipes/rope-read-mode";
@@ -57462,12 +57694,12 @@
     rspec-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
     melpaBuild {
         pname = "rspec-mode";
-        version = "20161129.1525";
+        version = "20170125.732";
         src = fetchFromGitHub {
           owner = "pezra";
           repo = "rspec-mode";
-          rev = "8e05e95548da58c63d8b805d4516eb892621f8e3";
-          sha256 = "1n93vjzjmbs7yna74rpn57ckps903fdam2ljh6jm5a9ivsxnc2mn";
+          rev = "2096d8c7c98aeb19eeb028082d4c9374168971d1";
+          sha256 = "1xlxpnhs9k2pch6abkgblr18j8k41wbzyn1k86jl3ka72vmv4wlm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd83e61b10da20198de990aa081b47d3b0b44d43/recipes/rspec-mode";
@@ -57487,8 +57719,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "14e5d3acf3f5c50fb81ed0fc0b69d290263c3c97";
-          sha256 = "1ryyf9kpv6rmsz1j4d1mlsgp10yj1cinxp6xd8qc558a2v4mnar4";
+          rev = "a979685278d465b5426ae952e3b502b987ac1ae4";
+          sha256 = "11db2kiwg8y3x6wjyziqy74mzq60jw2r11v20zwxkj2za0q3q60k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
@@ -57549,7 +57781,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57415";
+          rev = "57494";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -57629,7 +57861,7 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57415";
+          rev = "57494";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -57916,27 +58148,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    rustfmt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "rustfmt";
-        version = "20160217.542";
-        src = fetchFromGitHub {
-          owner = "fbergroth";
-          repo = "emacs-rustfmt";
-          rev = "45efd68ee602d9ed7a07ff0ef045d78cacd57e89";
-          sha256 = "0c22cxa4f6plz67vxmp1zgaylkfrky313cj0zybn9akrbcxpbc34";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/9fffa9bf34c161f28187b1296dfc98287817abcc/recipes/rustfmt";
-          sha256 = "1znav2pbax0rsvdl85mmbgbmxy7gnrm4nx54ij1ff6yd831r5jyl";
-          name = "rustfmt";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/rustfmt";
-          license = lib.licenses.free;
-        };
-      }) {};
     rvm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rvm";
@@ -58084,6 +58295,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    salt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }:
+    melpaBuild {
+        pname = "salt-mode";
+        version = "20170128.424";
+        src = fetchFromGitHub {
+          owner = "glynnforrest";
+          repo = "salt-mode";
+          rev = "28e72f05f2159f94d7fa3270eb35bfc1f06965df";
+          sha256 = "1dksmfvvza277dm245s9l8ydnbdqvl054hxsybynx05yb5c3sfgh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode";
+          sha256 = "1n7i9d6qpjsdcgbzmbf63y4c7ggxh5wsim8fd0casnrq9bl7ssym";
+          name = "salt-mode";
+        };
+        packageRequires = [ mmm-jinja2 mmm-mode yaml-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/salt-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     sane-term = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sane-term";
@@ -58234,12 +58466,12 @@
     sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sbt-mode";
-        version = "20161202.227";
+        version = "20170201.246";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-sbt-mode";
-          rev = "6caabd4e68fb878e743a29d16356a2c2c3bd7637";
-          sha256 = "0fq70lwwv5q0mzxli9x1m244i30nkc457mib07qypax9n51vfqyv";
+          rev = "c8fb801958e7c628ae618e8e1e4e04434ca41110";
+          sha256 = "0acbsf5srdpk7gl27wyqkqg56akbg0xff3wzi07yw4hwaspcbm0s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode";
@@ -58259,8 +58491,8 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "53bc30ca76b4650373df80953fe81ffdc58eaf90";
-          sha256 = "1xbbfizd5i3fd05q7paxp383i53ahgny7yc32zrp8wjnmxzk1lsp";
+          rev = "ea53e85c7983592c600ecd4a9cb08ae2760cf41e";
+          sha256 = "135is6zqca3ca1vkzpicqnf4jbxal2z5a93bflgbiha16i6485nn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -58297,12 +58529,12 @@
     scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "scala-mode";
-        version = "20170118.558";
+        version = "20170131.2121";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-scala-mode";
-          rev = "7e6300231143133252e6ed1f3d5c86ea4e625e33";
-          sha256 = "081bw6gkrww7bqi7pwj4sifmqscr5sbpl3zl1rw86npv5fpyjq9j";
+          rev = "730e16d254478d6f63f62cb04d47c137c9002f2d";
+          sha256 = "1aq1bfv8jz53zp365awqk43ysjwkpj51pcy6fyp87j8bbb02mgq9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode";
@@ -59272,12 +59504,12 @@
     shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shackle";
-        version = "20160830.2343";
+        version = "20170201.1322";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "shackle";
-          rev = "fcd9f53cd044ad169a240e3d12a2cf2d65485db6";
-          sha256 = "10lgafsck2r9x7997gdl3v1wn4sig0pm6jarip9496ka58z95mjb";
+          rev = "4ccacf92d0bfd7729388a3e698c1ded55e7f2b92";
+          sha256 = "0lmclwhv3wic0b5dxnjggi7191r63iv2gwn2k50c7ldm526qld0c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle";
@@ -59314,12 +59546,12 @@
     shader-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shader-mode";
-        version = "20151030.704";
+        version = "20170130.623";
         src = fetchFromGitHub {
           owner = "midnightSuyama";
           repo = "shader-mode";
-          rev = "5d5fcbc614f8d7e9226730dd587faf14115b0e6f";
-          sha256 = "0l094nrrvan8v6j1xdgb51cbjvwicvxih29b7iyga13adb9dy9j4";
+          rev = "76539359418d3d3cd4d2714a189b1bb777c2c15c";
+          sha256 = "0mq2073cwmxlvn222dzjpi3hhskfm5f39g60zf6xx1q3l0n4hhwd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4396f3c10a38f91d5f98684efbeb02812e479209/recipes/shader-mode";
@@ -59644,11 +59876,11 @@
     shm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shm";
-        version = "20170119.135";
+        version = "20170126.420";
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "structured-haskell-mode";
-          rev = "65910d24db7eb85890cce76baca419efc7d8fb5a";
+          rev = "074c8696f52253af24a74e4b3a99edf9c0993aa9";
           sha256 = "1cn2kh5ccp09mg6y743vh2y9m96m0zbnh9w5infl9nj9xbidza72";
         };
         recipeFile = fetchurl {
@@ -59936,8 +60168,8 @@
         src = fetchFromGitHub {
           owner = "mswift42";
           repo = "silkworm-theme";
-          rev = "53e0614660d653d146a4d36ceab169f6e4bb3554";
-          sha256 = "0vzkgrc54j4a3g90jxc7vxkqwqi3047gnn7gng65pfar0i76lzlb";
+          rev = "7951b53e5caf9daf6a5a15a57ae3a668cb78bd7b";
+          sha256 = "1q21886qsam8y3s60zlfh48w0jl67q14qg9pzda7j2jcbj1q6r91";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9451d247693c3e991f79315868c73808c0a664d4/recipes/silkworm-theme";
@@ -60016,12 +60248,12 @@
     simple-httpd = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "simple-httpd";
-        version = "20160902.1800";
+        version = "20170125.1910";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacs-web-server";
-          rev = "ff1c0b661d1b5b8abdb4bea2efec5efe8485dd1f";
-          sha256 = "054mi7plsyk79kc2iqmgp1w8frvlyg1pywm3fzcyg8qa461d35dw";
+          rev = "348483efea6ec2752bc5aa4028a16087d19b2809";
+          sha256 = "191aq4zhg5a8g6ypkbh20rnqyk76lhxfhnq5ww0g5hzpig8srxaa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/simple-httpd";
@@ -60938,8 +61170,8 @@
         src = fetchFromGitHub {
           owner = "ainame";
           repo = "smart-newline.el";
-          rev = "f5f5ff033645aea0652aa375b034746754a38b1e";
-          sha256 = "1q74b0mbhly84g252a0arbyxc720rgs9a3yqf8b8s2fpfkzb95sg";
+          rev = "0553a9e4be7188352de1a28f2eddfd28e7436f94";
+          sha256 = "0w0v3gzfg3cphz701g30sf7l92v3npsd7028pjp5g7rgv3pwkgsd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f729926f82d6b61f07f5c8a5e19d46afdcad568/recipes/smart-newline";
@@ -61060,12 +61292,12 @@
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "20170104.410";
+        version = "20170129.956";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "199006a0a8ae23ee6a8ee9948bf2512f2bcf1151";
-          sha256 = "0m4n5nhr8dqa14syy5907fyjsc3lnrpchdg2ai26jz4cw97v67ig";
+          rev = "add86ac3eeef160787728cad3e58b035dc540dba";
+          sha256 = "0d7rgj3b858w79g3nwimqaiqza2400y6c0v17ncsa7x1kvxrxk1f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -61497,6 +61729,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    socyl = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
+    melpaBuild {
+        pname = "socyl";
+        version = "20170129.144";
+        src = fetchFromGitHub {
+          owner = "nlamirault";
+          repo = "socyl";
+          rev = "38157e3bb0d7afa8b90b744648f63c85b4edb230";
+          sha256 = "1ha0827zcdkl1ih8c7018cpbiw2k1b8ik4h7p6asw7pg0n5xf1c6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/774b3006f5b6b781594257f1d9819068becbbcc1/recipes/socyl";
+          sha256 = "00b7x247cyjh4gci101fq1j6708vbcz1g9ls3845w863wjf6m5sz";
+          name = "socyl";
+        };
+        packageRequires = [ cl-lib dash pkg-info s ];
+        meta = {
+          homepage = "https://melpa.org/#/socyl";
+          license = lib.licenses.free;
+        };
+      }) {};
     soft-charcoal-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "soft-charcoal-theme";
@@ -61798,22 +62051,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    sourcekit = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    sourcekit = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "sourcekit";
-        version = "20160510.2017";
+        version = "20170126.353";
         src = fetchFromGitHub {
           owner = "nathankot";
           repo = "company-sourcekit";
-          rev = "3286a0dceea6f68b155dd4608db3ccf555f00938";
-          sha256 = "0xxwy5nahaafk5w3ybr1g898fiz6r7hjwr445z64v5pg862r8lkl";
+          rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b";
+          sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/sourcekit";
           sha256 = "1lvk3m86awlinivpg89h6zvrwrdqa5ljdp563k3i4h9384w82pks";
           name = "sourcekit";
         };
-        packageRequires = [ dash dash-functional emacs ];
+        packageRequires = [ dash dash-functional emacs request ];
         meta = {
           homepage = "https://melpa.org/#/sourcekit";
           license = lib.licenses.free;
@@ -61927,12 +62180,12 @@
     spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spacemacs-theme";
-        version = "20170106.539";
+        version = "20170127.457";
         src = fetchFromGitHub {
           owner = "nashamri";
           repo = "spacemacs-theme";
-          rev = "4342800a4a12d7d67f2a58792ab6a18542e7fc3e";
-          sha256 = "0bzdc8d3q5gxwfkgk31368vpw06i4y2qji0wi4c2d3vwg02b4ihl";
+          rev = "863e447f1b37d40c74b836b5132033430c6e8a7b";
+          sha256 = "14jcw75jvrqarg04bdk28c5bi0456d5xi4xyy53wd7knkm2zval5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -63395,12 +63648,12 @@
     sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sudo-edit";
-        version = "20160908.2310";
+        version = "20170201.916";
         src = fetchFromGitHub {
           owner = "nflath";
           repo = "sudo-edit";
-          rev = "beb584ca418dcd061641026662d9796f66a5a5a2";
-          sha256 = "1gprc192igny4vsk4d72xqf76ig79wq73fn757ghb8yrg8zzw1zc";
+          rev = "615f6c073e42d433e79ae5a63210e2e04357a4c8";
+          sha256 = "0k3ldywy1g6672hhasqmj1rvzrs0cmd3nzxkb688vw6mhzxfzld4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e/recipes/sudo-edit";
@@ -63416,12 +63669,12 @@
     sudo-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sudo-ext";
-        version = "20110116.2310";
+        version = "20170126.414";
         src = fetchFromGitHub {
           owner = "rubikitch";
           repo = "sudo-ext";
-          rev = "a1f742f90d1187834e24790b620f100e83e8aa74";
-          sha256 = "1ym3j9mxc8k9akk9z1m6i0gqsfcgr8k8xzz5gniw8jfarf7f4isq";
+          rev = "9d4580f304121ce7b8104bd4bd3b64e4dfa3c9b3";
+          sha256 = "1m9srlxavqg6yxmz6rz61saz1lj5hh029314dic8kh6g3bqdnh2w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/sudo-ext";
@@ -63788,12 +64041,12 @@
     swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "swift-mode";
-        version = "20170114.521";
+        version = "20170128.2303";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "swift-mode";
-          rev = "6cd2948589771d926e545d8cbe054705eebce18f";
-          sha256 = "1zz5jv2qgcnhidyhnw3wbcpqb80jqqbs74kpa66assfigyvivyj6";
+          rev = "42669da0b68bba2d12f9d5fc38f30def118bb999";
+          sha256 = "0l7f7mm4a7qrw0i6fnakgy7payghjgmamln9ldbdx593hg1jjzr8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
@@ -63834,8 +64087,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "75f9cebc6a44cc5aff51f403bae4774736ea52bd";
-          sha256 = "09xdlgwl40cb9kf622nnadh0g14g78p78yqmxfgy1wm3vbp0id99";
+          rev = "dbcee946f462e0fe2aa26f2a9e7ff4784c9e0e70";
+          sha256 = "199wg32ai117zkww4nzanksvdvzhmnnrn4cmp7l74z8i18cn2j2p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -64560,12 +64813,12 @@
     tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tao-theme";
-        version = "20170121.111";
+        version = "20170126.1021";
         src = fetchFromGitHub {
           owner = "11111000000";
           repo = "tao-theme-emacs";
-          rev = "228fd8573f526141e502609ac1b7c34ab97a68d1";
-          sha256 = "0nw8akvhkhw8hs9hrg4081bdyp8h3kz39y8nzp62r9m46sza0fn0";
+          rev = "a808ce58441de6256e670d39b27079d8630b031a";
+          sha256 = "0yf0hqm20mgiks9098231ry5sdv702agfj5pasgyyb19inawk13z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme";
@@ -64585,8 +64838,8 @@
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "tawny-owl";
-          rev = "d5b75f52d9ffdbc5cc391fedc3f81d86091839b3";
-          sha256 = "12nnyqg1lqa858c35b8z44wrbrznga8bwsnhm0hqcazy9bjin84v";
+          rev = "944c523029a40a68ce8896ca69ebccfe8db8b0ec";
+          sha256 = "1c1vmvg007vrbxhrq41ylfckppkkijgf3n2bij3x5db86ylfd9qs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode";
@@ -65005,8 +65258,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "4a88712c7fedfc63f079ae389f247dcd0349d960";
-          sha256 = "1vnpwkcf17i6akx2wgwj9g6spvdih3xp56gf8705bkfknisykxrz";
+          rev = "21b4f4b7f1f36724a18d2f70c50b2e5b634cf6b1";
+          sha256 = "0kq56iiqpclf6yl9g1fhhi9pk4icv5k1f0nyips88nhsq41j395c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
@@ -65026,8 +65279,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "4a88712c7fedfc63f079ae389f247dcd0349d960";
-          sha256 = "1vnpwkcf17i6akx2wgwj9g6spvdih3xp56gf8705bkfknisykxrz";
+          rev = "21b4f4b7f1f36724a18d2f70c50b2e5b634cf6b1";
+          sha256 = "0kq56iiqpclf6yl9g1fhhi9pk4icv5k1f0nyips88nhsq41j395c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
@@ -65103,6 +65356,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    test-c = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "test-c";
+        version = "20170123.950";
+        src = fetchFromGitHub {
+          owner = "aaptel";
+          repo = "test-c";
+          rev = "94e9f76659c45100a9b0e2a9fecf6482427cbbac";
+          sha256 = "0lnx9fidpfpmwi7xa2ik5mc72lcfc9g8cm9r25s5x7sfy9vr3q8c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ef915dc2d3bc09ef79eb8edde02101c89733c0b2/recipes/test-c";
+          sha256 = "1gy5dxkd4fpzzm2sq9g7bmi1ylwvsgh6hlvjmc1c064wjkha9j9z";
+          name = "test-c";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/test-c";
+          license = lib.licenses.free;
+        };
+      }) {};
     test-case-mode = callPackage ({ fetchFromGitHub, fetchurl, fringe-helper, lib, melpaBuild }:
     melpaBuild {
         pname = "test-case-mode";
@@ -65477,8 +65751,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "b62247e0ea23139a9922a1de965357907319e937";
-          sha256 = "0fcdwvjfhbyy5vm9f1q1c9g63zvpdmxgl94f459rgbvlxr2qhq1f";
+          rev = "de9c330b24c9190078eefb68c864d2a41a4dee07";
+          sha256 = "0y16xm0pkyyancg646ni1zz190rzdlsypdbkk0jslnz1l9zq445j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -65534,12 +65808,12 @@
     tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20170119.122";
+        version = "20170128.2207";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "bd89d93d9803319ba86eff0173821deb978ae2ac";
-          sha256 = "1a736r1igq66hn6ig4l7c5xaxcyk2kxvj26laphakk1xg8j5x52k";
+          rev = "13f6f64cb4e1236ba51d05b8acd70f36968851bd";
+          sha256 = "1xisk3s1sygb38gcr73m4iqpssbp6vms3162dn090g2sf0g4sssv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -65594,12 +65868,12 @@
     time-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "time-ext";
-        version = "20100515.1740";
+        version = "20170126.415";
         src = fetchFromGitHub {
           owner = "rubikitch";
           repo = "time-ext";
-          rev = "1e886eed26fb3049b0abc5c1241f823d44cab22f";
-          sha256 = "1iz3723sirazlrr9d5rpk4v0s1s9ajbx5j4i8jf1p54z8h7asjw5";
+          rev = "d128becf660fe3f30178eb1b05cd266741f4784a";
+          sha256 = "0ynxmik33hh0znmznrf7lkmsh5xggbrvbdhiqa61r0b7gs3jk5fd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/time-ext";
@@ -65846,12 +66120,12 @@
     toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "toc-org";
-        version = "20161004.320";
+        version = "20170131.558";
         src = fetchFromGitHub {
           owner = "snosov1";
           repo = "toc-org";
-          rev = "a0e8ca05e806e5074b8603985da7f18b92c15856";
-          sha256 = "1sv9y5dln4ai9w3mgg8p4a3s05hflfqh0k7k8isjqikydbv85m2k";
+          rev = "cda8f73640ae26c476990eae421e42627445f9d0";
+          sha256 = "1qkm70ay10blhji8z6c64f18288r1gswzmmkvg7b2z2rz9w475fm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org";
@@ -66650,36 +66924,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    ttrss = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "ttrss";
-        version = "20130409.1049";
-        src = fetchFromGitHub {
-          owner = "pedros";
-          repo = "ttrss.el";
-          rev = "e90d8f7ccaf235053057bd91d3a2113582604e24";
-          sha256 = "0a8f9p1im6k7mnp2bq733rfx2x246gfwpvi5ccym1y5lakx37fil";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d918a5aa26c890fd138323ac6a446c0722e8b4c6/recipes/ttrss";
-          sha256 = "08921cssvwpq33w87v08dafi2rz2rl1b3bhbhijn4bwjqgxi9w7z";
-          name = "ttrss";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/ttrss";
-          license = lib.licenses.free;
-        };
-      }) {};
     tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tuareg";
-        version = "20170124.551";
+        version = "20170130.1530";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "tuareg";
-          rev = "96b6ed94b1cbf4c4dd61abc928ea95f6645abfe1";
-          sha256 = "0v95za3d2xnk34lkqkkzbllwc1bc3hgza3dh84np5cfbgn7davsq";
+          rev = "4bdc7e15262a533aa7ea8aca48d615a49ad9e2c9";
+          sha256 = "1b1i0s8z6grvfa7lkbv4fgjg0dzi61gidz2ygwjwsqhqgw269ym1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -67028,12 +67281,12 @@
     typoscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }:
     melpaBuild {
         pname = "typoscript-mode";
-        version = "20160719.212";
+        version = "20170126.112";
         src = fetchFromGitHub {
           owner = "ksjogo";
           repo = "typoscript-mode";
-          rev = "478070b6946cbc6b73249bb6e5f35366aabe9f99";
-          sha256 = "13lawwhn2asr20213h1ijy827kfxs9qzhizkwzsa2sm2s0262rja";
+          rev = "44e7567e921573c4f33c537b827f71fb1f565c32";
+          sha256 = "0i7l9s3lhxnld32mqyrvasiv1hilhwnp2fwvpdv2cx9r902q6kc8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/701de09cb97cbfa49a3a81aaeb9577817566efa2/recipes/typoscript-mode";
@@ -67130,12 +67383,12 @@
     ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ujelly-theme";
-        version = "20170116.1121";
+        version = "20170201.217";
         src = fetchFromGitHub {
           owner = "marktran";
           repo = "color-theme-ujelly";
-          rev = "1837cfbf3d0b09d7e1da678e5dfb3b560a759734";
-          sha256 = "0jjr5798nqm5lwjv1j4r21vhbqy10qy3gn977g0ysb31wp2209r4";
+          rev = "2d886a64f84b3a27a53d2f29cd22528a8e3c7be2";
+          sha256 = "1w8v3a9hm15q0yih9vcby2y4g01kf64axfd368w1jchx01ql6n2p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme";
@@ -68100,12 +68353,12 @@
     vdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
     melpaBuild {
         pname = "vdiff";
-        version = "20170116.1154";
+        version = "20170201.1043";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-vdiff";
-          rev = "f4332f26f7a88c6339e357d19f56354d2a2489fa";
-          sha256 = "1jbhv430g2vsq0jhjypg9wdyax57m0r6hppqm2rqf0hlgn38v8d5";
+          rev = "bc5a9a8c5e78835a7311d0fcfcc4619a92ffaa3a";
+          sha256 = "112xrpznada8br8xcc7ln69k4w9da6h4c658gcjpj5a7mgqlbc4d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff";
@@ -68995,12 +69248,12 @@
     wc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wc-mode";
-        version = "20161031.648";
+        version = "20170126.2029";
         src = fetchFromGitHub {
           owner = "bnbeckwith";
           repo = "wc-mode";
-          rev = "122f90bd1d422a84cc50acabd350d44d39ddeb69";
-          sha256 = "0pjlxv46zzqdq6q131jb306vqlg4sfqls1x8vag7mmfw462hafqp";
+          rev = "f218f42709a651b34d6c1ddd98856f44648ef707";
+          sha256 = "0h79kf37pns92w4zsgazwhg087vkjvnhk9p1npll5ka87zbknndm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/wc-mode";
@@ -69121,12 +69374,12 @@
     web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20170118.1211";
+        version = "20170131.1400";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "5c626c98128724482336a1352e1e2af89d17a0c3";
-          sha256 = "0yzriypf19s1x9rqrvbal5986d3prhd72nh81w1fhvszci2nn2kd";
+          rev = "2d05692634766cfa647d9441aaf7f8d95d2d5206";
+          sha256 = "1q7vpw56fqjgyiq21xjnhclhbz9hdynapp53hsdsd361nghdg9d0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -69668,8 +69921,8 @@
         src = fetchFromGitHub {
           owner = "foretagsplatsen";
           repo = "emacs-js";
-          rev = "5e9b37cfbec400b51a8d9d1bc6603595e1a0aefd";
-          sha256 = "1w4drcqix3wwk15m1kkfss2mmip1q8j4hglyz4spaffkkqmmz438";
+          rev = "7bf3be6afab3c902c17b923cd4cdd12f4a2559c9";
+          sha256 = "1whq3cbk0z70pn8alrcp5m53ap278rkm7hzcbkg5yrjvjfxw38dz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
@@ -70494,12 +70747,12 @@
     www-synonyms = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "www-synonyms";
-        version = "20160812.1329";
+        version = "20170128.1451";
         src = fetchFromGitHub {
           owner = "spebern";
           repo = "www-synonyms";
-          rev = "e0ee69f98309a5f3f540683ddc35af46502343b2";
-          sha256 = "11iwwybanlwm4qkigk4w6zjh9rk7q7pf79hbcbyz9lll69hlmyj0";
+          rev = "7e37ea35064ff31c9945f0198a653647d408c936";
+          sha256 = "0l4fvq5zdzqvlwxqgqbfx9x0aimvk4x3la9yz9gw3vvj1rwf340i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2fe69ac09c3e24af9c4e24308e57d7c3c3425096/recipes/www-synonyms";
@@ -70599,12 +70852,12 @@
     xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-elisp-mode";
-        version = "20170116.1037";
+        version = "20170127.1616";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-elisp-mode";
-          rev = "d49a743fede497d102d4dc2b739dbe35b41163ca";
-          sha256 = "00v20p99njhh2wgk8jfccpigss2y6vd40wl1cs0ra67a4bjwn8di";
+          rev = "c32bae59a8d8daf97769b1c57b70ef9fb8b2570c";
+          sha256 = "1gs6h8csy8yz3f6gvqn3lx3i6xdqrddfhg54m4g8c5yxz0202yyg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode";
@@ -70641,12 +70894,12 @@
     xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20170122.1730";
+        version = "20170129.304";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "268681a0964f1b54908cac52b65a4209923dbf32";
-          sha256 = "14dkx2x2wk5fhdjyr8f3lsnknpm086scncbd6r1vsk6d6k7d9qyf";
+          rev = "fd63ec17a77d82c565f7ec181dbd928af3da8c9a";
+          sha256 = "0lgxw7vjy7kvh7lhp6a0yxgk0m77a5wpj7x45s1c33vcblwzsgdy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -71541,12 +71794,12 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "20170108.1830";
+        version = "20170127.2128";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "0041efedf9f06bfe427d36547f7c4a73ab7405ba";
-          sha256 = "12fkjy6i004vmc0vsxiyd3iwvlkqv2v5b0hypzkzwcjkxq426m88";
+          rev = "e74f00e70324101130c00b10af15f1f23e150654";
+          sha256 = "0b33mb10k5mvkg9v79kq1yx45swckz9pc1kn52h76rifcl83pif2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";

From 344227bfb9dc77e18d1789336313959df8e3e9af Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 2 Feb 2017 14:29:55 +0100
Subject: [PATCH 294/899] haddock-api: fix build on GHC-8.0.2

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0266cbe5a37..c6c78f49507 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -621,6 +621,14 @@ self: super: {
   # https://github.com/haskell/haddock/issues/378
   haddock-library = dontCheck super.haddock-library;
 
+  # https://github.com/haskell/haddock/issues/571
+  haddock-api = appendPatch (doJailbreak super.haddock-api) (pkgs.fetchpatch {
+    url = "https://github.com/basvandijk/haddock/commit/f4c5e46ded05a4b8884f5ad6f3102f79ff3bb127.patch";
+    sha256 = "01dawvikzw6y43557sbp9q7z9vw2g3wnzvv5ny0f0ks6ccc0vj0m";
+    stripLen = 2;
+    addPrefixes = true;
+  });
+
   # https://github.com/anton-k/csound-expression-dynamic/issues/1
   csound-expression-dynamic = dontHaddock super.csound-expression-dynamic;
 

From 16f8f0d31329b0f6335bfb34348c1b778765403e Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 2 Feb 2017 08:47:01 -0500
Subject: [PATCH 295/899] ffmpeg_3: 3.1.4 -> 3.1.6

---
 pkgs/development/libraries/ffmpeg-full/default.nix | 12 ++++++------
 pkgs/development/libraries/ffmpeg/3.1.nix          |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index eb985f4c3f3..090881107ce 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -408,7 +408,7 @@ stdenv.mkDerivation rec {
     ++ optional ((isLinux || isFreeBSD) && libva != null) libva
     ++ optionals isLinux [ alsaLib libraw1394 libv4l ]
     ++ optionals nvenc [ nvidia-video-sdk ]
-    ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation 
+    ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation
                                    MediaToolbox VideoDecodeAcceleration ];
 
   # Build qt-faststart executable
@@ -463,11 +463,11 @@ stdenv.mkDerivation rec {
     description = "A complete, cross-platform solution to record, convert and stream audio and video";
     homepage = https://www.ffmpeg.org/;
     longDescription = ''
-      FFmpeg is the leading multimedia framework, able to decode, encode, transcode, 
-      mux, demux, stream, filter and play pretty much anything that humans and machines 
-      have created. It supports the most obscure ancient formats up to the cutting edge. 
-      No matter if they were designed by some standards committee, the community or 
-      a corporation. 
+      FFmpeg is the leading multimedia framework, able to decode, encode, transcode,
+      mux, demux, stream, filter and play pretty much anything that humans and machines
+      have created. It supports the most obscure ancient formats up to the cutting edge.
+      No matter if they were designed by some standards committee, the community or
+      a corporation.
     '';
     license = (
       if nonfreeLicensing then
diff --git a/pkgs/development/libraries/ffmpeg/3.1.nix b/pkgs/development/libraries/ffmpeg/3.1.nix
index fb14ca47598..a3504bf897c 100644
--- a/pkgs/development/libraries/ffmpeg/3.1.nix
+++ b/pkgs/development/libraries/ffmpeg/3.1.nix
@@ -5,9 +5,9 @@
 }@args:
 
 callPackage ./generic.nix (args // rec {
-  version = "${branch}.4";
+  version = "${branch}.6";
   branch = "3.1";
-  sha256 = "1ynb1f0py5jb6hs78ypynpwc3jlqrw51vl8y1wnd44nwlisxz6bw";
+  sha256 = "0c9g9zhrnvbfwwcca35jis7f7njskhzrwa7n7wpd1618cms2kjvx";
   darwinFrameworks = [ Cocoa CoreMedia ];
   patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch;
 })

From e051e882133a052c5deb3ccec34060e2cace7e9b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 2 Feb 2017 15:01:55 +0100
Subject: [PATCH 296/899] heimdall: update to latest git revision

Probably makes no difference because there have been no significant changes.
Anyway, let's live on the bleeding edge.
---
 pkgs/tools/misc/heimdall/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix
index 1d75db59289..1f24679fc96 100644
--- a/pkgs/tools/misc/heimdall/default.nix
+++ b/pkgs/tools/misc/heimdall/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, zlib, libusb1, cmake, qt5, enableGUI ? false }:
 
-let version = "1.4.1-34-g7ebee1e"; in
+let version = "1.4.1-37-gb6fe7f8"; in
 
 stdenv.mkDerivation {
   name = "heimdall-${version}";

From 529853b5e16e97744b4fea544700583a24307e56 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Thu, 2 Feb 2017 15:11:54 +0100
Subject: [PATCH 297/899] asterisk: add lts version, fix impurity

---
 pkgs/servers/asterisk/default.nix            | 165 ++++++++++++-------
 pkgs/servers/asterisk/disable-download.patch |  12 --
 pkgs/top-level/all-packages.nix              |   5 +-
 3 files changed, 105 insertions(+), 77 deletions(-)
 delete mode 100644 pkgs/servers/asterisk/disable-download.patch

diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index 2433750ce45..30e137205c2 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -1,76 +1,113 @@
-{ stdenv, pkgs, fetchurl, fetchgit,
+{ stdenv, pkgs, lib, 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 = "14.1.2";
 
-  src = fetchurl {
-    url = "http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/asterisk-${version}.tar.gz";
+let
+  common = {version, sha256, externals}: stdenv.mkDerivation rec {
+    inherit version;
+    name = "asterisk-${version}";
+
+    buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid binutils newt lua srtp wget curl subversionClient ];
+
+    patches = [
+      # We want the Makefile to install the default /var skeleton
+      # under ${out}/var but we also want to use /var at runtime.
+      # This patch changes the runtime behavior to look for state
+      # directories in /var rather than ${out}/var.
+      ./runtime-vardirs.patch
+    ];
+
+    src = fetchurl {
+      url = "http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/asterisk-${version}.tar.gz";
+      inherit sha256;
+    };
+
+    # The default libdir is $PREFIX/usr/lib, which causes problems when paths
+    # compiled into Asterisk expect ${out}/usr/lib rather than ${out}/lib.
+
+    # Copy in externals to avoid them being downloaded;
+    # they have to be copied, because the modification date is checked.
+    # If you are getting a permission denied error on this dir,
+    # you're likely missing an automatically downloaded dependency
+    preConfigure = ''
+      mkdir externals_cache
+    '' + lib.concatStringsSep "\n"
+        (lib.mapAttrsToList (dst: src: "cp ${src} ${dst}") externals) + ''
+
+      chmod -w externals_cache
+    '';
+    configureFlags = [
+      "--libdir=\${out}/lib"
+      "--with-lua=${lua}/lib"
+      "--with-pjproject-bundled"
+      "--with-externals-cache=$(PWD)/externals_cache"
+    ];
+
+    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
+      make samples
+    '';
+
+    meta = with stdenv.lib; {
+      description = "Software implementation of a telephone private branch exchange (PBX)";
+      homepage = http://www.asterisk.org/;
+      license = licenses.gpl2;
+      maintainers = with maintainers; [ auntie DerTim1 ];
+    };
+  };
+
+  pjproject-255 = fetchurl {
+    url = http://www.pjsip.org/release/2.5.5/pjproject-2.5.5.tar.bz2;
+    sha256 = "1wq8lpfcd4dfrbl7bgy2yzgp3ldjzq5430fqkhcqad0xfrxj0fdb";
+  };
+
+in
+{
+
+  asterisk-lts = common {
+    version = "13.13.1";
+    sha256 = "0yh097rrp1i681qclvwyh7l1gg2i5wx5pjrcvwpbj6g949mc98vd";
+    externals = {
+      "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255;
+    };
+  };
+
+  asterisk-stable = common {
+    version = "14.1.2";
     sha256 = "0w9s4334rwvpyxm169grmnb4k9yq0l2al73dyh4cb8769qcs0ij8";
+    externals = {
+      "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255;
+    };
   };
 
-  # 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.5.tar.gz;
-    sha256 = "01xzbg7xy0c5zg7sixjw5025pvr4z64kfzi9zvx19im0w331h4cd";
-  };
-  mohSounds = fetchurl {
-    url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz;
-    sha256 = "449fb810d16502c3052fedf02f7e77b36206ac5a145f3dacf4177843a2fcb538";
-  };
-  # TODO: Sounds for other languages could be added here
+  # asterisk-git = common {
+  #   version = "15-pre";
+  #   sha256 = "...";
+  #   externals = {
+  #    "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255;
+      # 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. Include in externals.
+      # "sounds/asterisk-core-sounds-en-gsm-1.5.tar.gz" = fetchurl {
+      #   url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.5.tar.gz;
+      #   sha256 = "01xzbg7xy0c5zg7sixjw5025pvr4z64kfzi9zvx19im0w331h4cd";
+      # };
+      # "sounds/asterisk-moh-opsound-wav-2.03.tar.gz" = fetchurl {
+      #   url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz;
+      #   sha256 = "449fb810d16502c3052fedf02f7e77b36206ac5a145f3dacf4177843a2fcb538";
+      # };
+      # TODO: Sounds for other languages could be added here
+    # }
+  # }.overrideDerivation (_: {src = fetchgit {...}})
 
-  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
-    # ourselves if needed).
-    ./disable-download.patch
-
-    # We want the Makefile to install the default /var skeleton
-    # under ${out}/var but we also want to use /var at runtime.
-    # This patch changes the runtime behavior to look for state
-    # directories in /var rather than ${out}/var.
-    ./runtime-vardirs.patch
-  ];
-
-  # 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.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"
-    "--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
-    make samples
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Software implementation of a telephone private branch exchange (PBX)";
-    homepage = http://www.asterisk.org/;
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ auntie DerTim1 ];
-  };
 }
diff --git a/pkgs/servers/asterisk/disable-download.patch b/pkgs/servers/asterisk/disable-download.patch
deleted file mode 100644
index 670886bfe3c..00000000000
--- a/pkgs/servers/asterisk/disable-download.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
- 
--asterisk-$(2)$(if $(3),-$(3),)-%.tar.gz: have_download
-+asterisk-$(2)$(if $(3),-$(3),)-%.tar.gz:
- ifneq ($(SOUNDS_CACHE_DIR),)
- 	$(CMD_PREFIX) \
- 	if test ! -f "$(1)$(if $(3),/$(3),)/.$$(subst .tar.gz,,$$@)"; then \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 734644ae998..a1ae9687d61 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10219,7 +10219,10 @@ with pkgs;
 
   apcupsd = callPackage ../servers/apcupsd { };
 
-  asterisk = callPackage ../servers/asterisk { };
+  asterisk = asterisk-stable;
+
+  inherit (callPackages ../servers/asterisk { })
+    asterisk-stable asterisk-lts;
 
   sabnzbd = callPackage ../servers/sabnzbd { };
 

From 59fd1c802ea1f45c83f186f6517ed319229cce18 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Thu, 2 Feb 2017 15:12:33 +0100
Subject: [PATCH 298/899] asterisk: add maintainer

---
 lib/maintainers.nix               | 1 +
 pkgs/servers/asterisk/default.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index fdf57f92f0e..4672dc59d43 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -519,6 +519,7 @@
   wyvie = "Elijah Rum <elijahrum@gmail.com>";
   yarr = "Dmitry V. <savraz@gmail.com>";
   yochai = "Yochai <yochai@titat.info>";
+  yorickvp = "Yorick van Pelt <yorickvanpelt@gmail.com>";
   yurrriq = "Eric Bailey <eric@ericb.me>";
   z77z = "Marco Maggesi <maggesi@math.unifi.it>";
   zagy = "Christian Zagrodnick <cz@flyingcircus.io>";
diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index 30e137205c2..ff64e83820f 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -62,7 +62,7 @@ let
       description = "Software implementation of a telephone private branch exchange (PBX)";
       homepage = http://www.asterisk.org/;
       license = licenses.gpl2;
-      maintainers = with maintainers; [ auntie DerTim1 ];
+      maintainers = with maintainers; [ auntie DerTim1 yorickvp ];
     };
   };
 

From 1b47bc94771c42c61561199b7199e60165da2fed Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Thu, 2 Feb 2017 15:13:02 +0100
Subject: [PATCH 299/899] service.asterisk: add package option

---
 .../modules/services/networking/asterisk.nix  | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/networking/asterisk.nix b/nixos/modules/services/networking/asterisk.nix
index 5c71a1d8dda..514204db33f 100644
--- a/nixos/modules/services/networking/asterisk.nix
+++ b/nixos/modules/services/networking/asterisk.nix
@@ -17,7 +17,7 @@ let
   allConfFiles =
     cfg.confFiles //
     builtins.listToAttrs (map (x: { name = x;
-                                    value = builtins.readFile (pkgs.asterisk + "/etc/asterisk/" + x); })
+                                    value = builtins.readFile (cfg.package + "/etc/asterisk/" + x); })
                               defaultConfFiles);
 
   asteriskEtc = pkgs.stdenv.mkDerivation
@@ -38,7 +38,7 @@ let
     asteriskConf = ''
       [directories]
       astetcdir => /etc/asterisk
-      astmoddir => ${pkgs.asterisk}/lib/asterisk/modules
+      astmoddir => ${cfg.package}/lib/asterisk/modules
       astvarlibdir => /var/lib/asterisk
       astdbdir => /var/lib/asterisk
       astkeydir => /var/lib/asterisk
@@ -47,7 +47,7 @@ let
       astspooldir => /var/spool/asterisk
       astrundir => /var/run/asterisk
       astlogdir => /var/log/asterisk
-      astsbindir => ${pkgs.asterisk}/sbin
+      astsbindir => ${cfg.package}/sbin
     '';
     extraConf = cfg.extraConfig;
 
@@ -197,11 +197,17 @@ in
           Additional command line arguments to pass to Asterisk.
         '';
       };
+      package = mkOption {
+        type = types.package;
+        default = pkgs.asterisk;
+        defaultText = "pkgs.asterisk";
+        description = "The Asterisk package to use.";
+      };
     };
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = [ pkgs.asterisk ];
+    environment.systemPackages = [ cfg.package ];
 
     environment.etc.asterisk.source = asteriskEtc;
 
@@ -234,7 +240,7 @@ in
           # TODO: Make exceptions for /var directories that likely should be updated
           if [ ! -e "$d" ]; then
             mkdir -p "$d"
-            cp --recursive ${pkgs.asterisk}/"$d"/* "$d"/
+            cp --recursive ${cfg.package}/"$d"/* "$d"/
             chown --recursive ${asteriskUser}:${asteriskGroup} "$d"
             find "$d" -type d | xargs chmod 0755
           fi
@@ -247,8 +253,8 @@ in
             # FIXME: This doesn't account for arguments with spaces
             argString = concatStringsSep " " cfg.extraArguments;
           in
-          "${pkgs.asterisk}/bin/asterisk -U ${asteriskUser} -C /etc/asterisk/asterisk.conf ${argString} -F";
-        ExecReload = ''${pkgs.asterisk}/bin/asterisk -x "core reload"
+          "${cfg.package}/bin/asterisk -U ${asteriskUser} -C /etc/asterisk/asterisk.conf ${argString} -F";
+        ExecReload = ''${cfg.package}/bin/asterisk -x "core reload"
           '';
         Type = "forking";
         PIDFile = "/var/run/asterisk/asterisk.pid";

From 9438cc264f876e3d2b46f35f6f0a0cec6bc69145 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 2 Feb 2017 15:18:28 +0100
Subject: [PATCH 300/899] shelly: fix build on GHC-8.0.2

---
 .../haskell-modules/configuration-common.nix         | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4d74f453859..a09d4c4a3cd 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -874,7 +874,17 @@ self: super: {
 
   # https://github.com/yesodweb/Shelly.hs/issues/106
   # https://github.com/yesodweb/Shelly.hs/issues/108
-  shelly = dontCheck super.shelly;
+  # https://github.com/yesodweb/Shelly.hs/issues/130
+  shelly =
+    let drv = appendPatch (dontCheck (doJailbreak super.shelly)) (pkgs.fetchpatch {
+                url = "https://github.com/k0001/Shelly.hs/commit/32a1e290961755e7b2379f59faa49b13d03dfef6.patch";
+                sha256 = "0ccq0qly8bxxv64dk97a44ng6hb01j6ajs0sp3f2nn0hf5j3xv69";
+              });
+    in overrideCabal drv (drv : {
+         # doJailbreak doesn't seem to work for build-depends inside an
+         # if-then-else block so we have to do it manually.
+         postPatch = "sed -i 's/base >=4\.6 \&\& <4\.9\.1/base -any/' shelly.cabal";
+       });
 
   # https://github.com/bos/configurator/issues/22
   configurator = dontCheck super.configurator;

From 6dca78e1ae08a9e89678f1c1aef3d358475e8657 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 2 Feb 2017 15:20:16 +0100
Subject: [PATCH 301/899] heimdall: clean up the build expression

- Make sure the front-end-less build does not depend on QT.

- Don't override patchPhase because that will lead to unexpected results for
  people who try to defined a "patches = [...]" attribute.
---
 pkgs/tools/misc/heimdall/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix
index 1f24679fc96..4fb71b688c3 100644
--- a/pkgs/tools/misc/heimdall/default.nix
+++ b/pkgs/tools/misc/heimdall/default.nix
@@ -13,20 +13,22 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ zlib libusb1 cmake ];
-  patchPhase = stdenv.lib.optional (!enableGUI) ''
-    sed -i '/heimdall-frontend/d' CMakeLists.txt
-  '';
-  enableParallelBuilding = true;
+
   cmakeFlags = [
+    "-DBUILD_TYPE=Release"
+    "-DDISABLE_FRONTEND=${if enableGUI then "OFF" else "ON"}"
+  ] ++ stdenv.lib.optionals enableGUI [
     "-DQt5Widgets_DIR=${qt5.qtbase.dev}/lib/cmake/Qt5Widgets"
     "-DQt5Gui_DIR=${qt5.qtbase.dev}/lib/cmake/Qt5Gui"
     "-DQt5Core_DIR=${qt5.qtbase.dev}/lib/cmake/Qt5Core"
-    "-DBUILD_TYPE=Release"
   ];
 
   preConfigure = ''
     # Give ownership of the Galaxy S USB device to the logged in user.
     substituteInPlace heimdall/60-heimdall.rules --replace 'MODE="0666"' 'TAG+="uaccess"'
+
+    # Fix version string reported by the executable.
+    sed -i -e 's/version = "v.*"/version = "v${version}"/' heimdall/source/Interface.cpp
   '';
 
   installPhase = ''
@@ -36,6 +38,8 @@ stdenv.mkDerivation {
     cp ../heimdall/60-heimdall.rules $out/lib/udev/rules.d
   '';
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = "http://www.glassechidna.com.au/products/heimdall/";
     description = "A cross-platform tool suite to flash firmware onto Samsung Galaxy S devices";

From 364f089fe734be41d00f9c283e63976b280ef59a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 2 Feb 2017 15:23:56 +0100
Subject: [PATCH 302/899] mpd: 0.20 -> 0.20.4

Fixes bugs at least one crash.

Fixes #22368.
---
 pkgs/servers/mpd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index c07ca6a8342..09d72a12cf0 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -30,13 +30,13 @@ let
   opt = stdenv.lib.optional;
   mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
   major = "0.20";
-  minor = "";
+  minor = "4";
 
 in stdenv.mkDerivation rec {
   name = "mpd-${major}${if minor == "" then "" else "." + minor}";
   src = fetchurl {
     url    = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz";
-    sha256 = "068nxsfkp2ppcjh3fmcbapkiwnjpvkii73bfydpw4bf2yphdvsa8";
+    sha256 = "0a4psqsf71vc6hfgyv55jclsx8yb7lf4w840qlq6cq8j3hsjaavi";
   };
 
   buildInputs = [ pkgconfig glib boost ]
@@ -111,7 +111,7 @@ in stdenv.mkDerivation rec {
     description = "A flexible, powerful daemon for playing music";
     homepage    = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki;
     license     = licenses.gpl2;
-    maintainers = with maintainers; [ astsmtl fuuzetsu ehmry ];
+    maintainers = with maintainers; [ astsmtl fuuzetsu ehmry fpletz ];
     platforms   = platforms.unix;
 
     longDescription = ''

From 4494720241df849ef121510a1bba74a20ddae52b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Thu, 2 Feb 2017 22:58:43 +0800
Subject: [PATCH 303/899] fpm: fix vulnerable dependency

---
 pkgs/tools/package-management/fpm/Gemfile      |  2 ++
 pkgs/tools/package-management/fpm/Gemfile.lock | 10 ++++++++--
 pkgs/tools/package-management/fpm/gemset.nix   | 10 ++++++----
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/package-management/fpm/Gemfile b/pkgs/tools/package-management/fpm/Gemfile
index 95916cf4322..ea498ca7835 100644
--- a/pkgs/tools/package-management/fpm/Gemfile
+++ b/pkgs/tools/package-management/fpm/Gemfile
@@ -1,2 +1,4 @@
 source 'https://rubygems.org'
+
+gem 'archive-tar-minitar', '>= 0.5.2.1', github: 'peterhoeg/archive-tar-minitar'
 gem 'fpm'
diff --git a/pkgs/tools/package-management/fpm/Gemfile.lock b/pkgs/tools/package-management/fpm/Gemfile.lock
index ab3d4dd6b46..16d7a8250ec 100644
--- a/pkgs/tools/package-management/fpm/Gemfile.lock
+++ b/pkgs/tools/package-management/fpm/Gemfile.lock
@@ -1,7 +1,12 @@
+GIT
+  remote: git://github.com/peterhoeg/archive-tar-minitar.git
+  revision: dae32ca550a87dba32597115ae18805db4782ebe
+  specs:
+    archive-tar-minitar (0.5.2.1)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    archive-tar-minitar (0.5.2)
     arr-pm (0.0.10)
       cabin (> 0)
     backports (3.6.8)
@@ -40,7 +45,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  archive-tar-minitar (>= 0.5.2.1)!
   fpm
 
 BUNDLED WITH
-   1.12.5
+   1.14.3
diff --git a/pkgs/tools/package-management/fpm/gemset.nix b/pkgs/tools/package-management/fpm/gemset.nix
index 0670d3a5b14..4243651dd25 100644
--- a/pkgs/tools/package-management/fpm/gemset.nix
+++ b/pkgs/tools/package-management/fpm/gemset.nix
@@ -1,11 +1,13 @@
 {
   archive-tar-minitar = {
     source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1j666713r3cc3wb0042x0wcmq2v11vwwy5pcaayy5f0lnd26iqig";
-      type = "gem";
+      fetchSubmodules = false;
+      rev = "dae32ca550a87dba32597115ae18805db4782ebe";
+      sha256 = "0fvxacbcb52fm5dis451kdd7dv74z8p6nm4vnfqf7jg2aghcxdkd";
+      type = "git";
+      url = "git://github.com/peterhoeg/archive-tar-minitar.git";
     };
-    version = "0.5.2";
+    version = "0.5.2.1";
   };
   arr-pm = {
     source = {

From 7bc17013f83934de37d2c2eaf0b61a388d312aa4 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 2 Feb 2017 16:28:32 +0100
Subject: [PATCH 304/899] aws-sdk-cpp: 1.0.48 -> 1.0.60

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

diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 6a18ff3ed24..a47e740be95 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -14,13 +14,13 @@ let
         else throw "Unsupported system!";
 in stdenv.mkDerivation rec {
   name = "aws-sdk-cpp-${version}";
-  version = "1.0.48";
+  version = "1.0.60";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-sdk-cpp";
     rev = version;
-    sha256 = "1k73ir1w6457y9mdv2xnk8cr1y1xxhzzd4095rzvn2y7fr3zgz01";
+    sha256 = "0k6jv70l4xhkf2rna6zaxkxgd7xh7cc1ghzska637h5d2v6h8nzk";
   };
 
   # FIXME: might be nice to put different APIs in different outputs

From 5cc75352f8b9705e35ed7e1a6a7d1e3f012ba9b8 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 2 Feb 2017 16:34:41 +0100
Subject: [PATCH 305/899] wordpress: 4.7.1 -> 4.7.2

See: https://make.wordpress.org/core/2017/02/01/disclosure-of-additional-security-fix-in-wordpress-4-7-2/
---
 nixos/modules/services/web-servers/apache-httpd/wordpress.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
index 26f0bdec655..a5b6548d3c5 100644
--- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
@@ -6,7 +6,7 @@ with lib;
 let
 
   # Upgrading? We have a test! nix-build ./nixos/tests/wordpress.nix
-  version = "4.7.1";
+  version = "4.7.2";
   fullversion = "${version}";
 
   # Our bare-bones wp-config.php file using the above settings
@@ -75,7 +75,7 @@ let
       owner = "WordPress";
       repo = "WordPress";
       rev = "${fullversion}";
-      sha256 = "1wb4f4zn55d23qi0whsfpbpcd4sjvzswgmni6f5rzrmlawq9ssgr";
+      sha256 = "0vph12708drf8ww0xd05hpdvbyy7n5gj9ca598lhdhy2i1j6wy32";
     };
     installPhase = ''
       mkdir -p $out

From 1d85e0bbab6a9f1b5a0d0a66c0ed927f6198f63b Mon Sep 17 00:00:00 2001
From: Fernando J Pando <fernando.pando@stelligent.com>
Date: Wed, 1 Feb 2017 11:26:55 -0500
Subject: [PATCH 306/899] hologram: 8d86e3f -> d20d1c3

- Updates dependencies
- Adds configuration module
- Tested on Nixos Unstable
---
 nixos/modules/module-list.nix                 |  3 +-
 .../services/security/hologram-agent.nix      | 57 +++++++++++++++++++
 .../{hologram.nix => hologram-server.nix}     |  0
 pkgs/tools/security/hologram/default.nix      | 18 ++++--
 pkgs/tools/security/hologram/deps.nix         |  9 +++
 5 files changed, 81 insertions(+), 6 deletions(-)
 create mode 100644 nixos/modules/services/security/hologram-agent.nix
 rename nixos/modules/services/security/{hologram.nix => hologram-server.nix} (100%)

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 23acc11db23..fed75053e56 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -498,7 +498,8 @@
   ./services/security/frandom.nix
   ./services/security/haka.nix
   ./services/security/haveged.nix
-  ./services/security/hologram.nix
+  ./services/security/hologram-server.nix
+  ./services/security/hologram-agent.nix
   ./services/security/munge.nix
   ./services/security/oauth2_proxy.nix
   ./services/security/physlock.nix
diff --git a/nixos/modules/services/security/hologram-agent.nix b/nixos/modules/services/security/hologram-agent.nix
new file mode 100644
index 00000000000..49b5c935267
--- /dev/null
+++ b/nixos/modules/services/security/hologram-agent.nix
@@ -0,0 +1,57 @@
+{pkgs, config, lib, ...}:
+
+with lib;
+
+let
+  cfg = config.services.hologram-agent;
+
+  cfgFile = pkgs.writeText "hologram-agent.json" (builtins.toJSON {
+    host = cfg.dialAddress;
+  });
+in {
+  options = {
+    services.hologram-agent = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable the Hologram agent for AWS instance credentials";
+      };
+
+      dialAddress = mkOption {
+        type        = types.str;
+        default     = "localhost:3100";
+        description = "Hologram server and port.";
+      };
+
+      httpPort = mkOption {
+        type        = types.str;
+        default     = "80";
+        description = "Port for metadata service to listen on.";
+      };
+
+    };
+  };
+
+  config = mkIf cfg.enable {
+    networking.interfaces.dummy0 = {
+      ipAddress = "169.254.169.254";
+      prefixLength = 32;
+    };
+
+    systemd.services.hologram-agent = {
+      description = "Provide EC2 instance credentials to machines outside of EC2";
+      after       = [ "network.target" ];
+      wantedBy    = [ "multi-user.target" ];
+      requires    = [ "network-link-dummy0.service" "network-addresses-dummy0.service" ]; 
+      preStart = ''
+        /run/current-system/sw/bin/rm -fv /var/run/hologram.sock
+      '';
+      serviceConfig = {
+        ExecStart = "${pkgs.hologram.bin}/bin/hologram-agent -debug -conf ${cfgFile} -port ${cfg.httpPort}";
+      };
+    };
+
+  };
+
+  meta.maintainers = with lib.maintainers; [ nand0p ];
+}
diff --git a/nixos/modules/services/security/hologram.nix b/nixos/modules/services/security/hologram-server.nix
similarity index 100%
rename from nixos/modules/services/security/hologram.nix
rename to nixos/modules/services/security/hologram-server.nix
diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix
index e7673cf5842..abdcd5d2d3e 100644
--- a/pkgs/tools/security/hologram/default.nix
+++ b/pkgs/tools/security/hologram/default.nix
@@ -2,16 +2,24 @@
 
 buildGoPackage rec {
   name = "hologram-${version}";
-  version = "20160209-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "8d86e3fdcbfd967ba58d8de02f5e8173c101212e";
-
-  goPackagePath = "github.com/AdRoll/hologram";
+  version = "20170130-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "d20d1c30379e7010e8f9c428a5b9e82f54d390e1";
 
   src = fetchgit {
     inherit rev;
     url = "https://github.com/AdRoll/hologram";
-    sha256 = "0i0p170brdsczfz079mqbc5y7x7mdph04p3wgqsd7xcrddvlkkaf";
+    sha256 = "0dg5kfs16kf2gzhpmzsg83qzi2pxgnc9g81lw5zpa6fmzpa9kgsn";
   };
 
+  goPackagePath = "github.com/AdRoll/hologram";
+
   goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/AdRoll/hologram/;
+    description = "Easy, painless AWS credentials on developer laptops.";
+    maintainers = with maintainers; [ nand0p ];
+    platforms = platforms.all;
+    license = licenses.asl20;
+  };
 }
diff --git a/pkgs/tools/security/hologram/deps.nix b/pkgs/tools/security/hologram/deps.nix
index 2c4cdbe84f0..a9b66da2a9c 100644
--- a/pkgs/tools/security/hologram/deps.nix
+++ b/pkgs/tools/security/hologram/deps.nix
@@ -98,4 +98,13 @@
       sha256 = "179lwaf0hvczl8g4xzkpcpzq25p1b23f7399bx5zl55iin62d8yz";
     };
   }
+  {
+    goPackagePath = "github.com/aws/aws-sdk-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/aws/aws-sdk-go";
+      rev = "3f8f870ec9939e32b3372abf74d24e468bcd285d";
+      sha256 = "0a4hycs3d87s50z4prf5h6918r0fa2rvrrwlbffs430ilc4y8ghv";
+    };
+  }
 ]

From 28a324b01d059bc0bebce5c31eb8091c2ff38696 Mon Sep 17 00:00:00 2001
From: Pierre Radermecker <pierrer@pi3r.be>
Date: Thu, 2 Feb 2017 17:28:20 +0100
Subject: [PATCH 307/899] hackage2nix: remove swagger2 from the list of broken
 packages

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 41814d382e0..75b59ced71c 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -7140,7 +7140,6 @@ dont-distribute-packages:
   svgutils:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   svm-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   svndump:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  swagger2:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   swagger:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   swapper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   swearjure:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]

From 008a6a571bc61891f629b427b4ea3ef1af94b153 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 18:43:10 +0100
Subject: [PATCH 308/899] strace: 4.14 -> 4.15

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

diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index 5152067efa1..d0e05dd35f8 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "strace-${version}";
-  version = "4.14";
+  version = "4.15";
 
   src = fetchurl {
     url = "mirror://sourceforge/strace/${name}.tar.xz";
-    sha256 = "0bvicjkqk3c09zyxgkakymiqr3618sa2dfpd9f3fdp23n8853vav";
+    sha256 = "1a9wb2nzfqgwazd0yrlbk48awlfn898n1bdayvdxj7qlssac1kf0";
   };
 
   nativeBuildInputs = [ perl ];

From 2a825540dbec6a7b018446671d4ae07cd9ca7f69 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 2 Feb 2017 18:49:23 +0100
Subject: [PATCH 309/899] parallel: 20161222 -> 20170122

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

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 99a933b3243..842616793a3 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl, makeWrapper, procps }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20161222";
+  name = "parallel-20170122";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "1chgr3csyc7hbq2wq4jnwnbsr3ix8rzsk2lf4vdnvkjpd6dvw517";
+    sha256 = "19maf889vj1c4zakqwap58f44hgypyb5mzzwfsliir9gvvcq6zj1";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 269b8a32ed1d4ca9e3294de53d00e5a55e297c9b Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 18:45:19 +0100
Subject: [PATCH 310/899] lr: 0.2 -> 0.3.2

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

diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix
index 47233532df3..36b84c21154 100644
--- a/pkgs/tools/system/lr/default.nix
+++ b/pkgs/tools/system/lr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 let
-  version = "0.2";
+  version = "0.3.2";
 in
 stdenv.mkDerivation {
   name = "lr-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     owner = "chneukirchen";
     repo = "lr";
     rev = "v${version}";
-    sha256 = "1wn1j0cf84r4nli92myf3waackh2p6r2hkavgx6533x15kdyfnf7";
+    sha256 = "1bbgzshayk0kzmlyw44jqskgmxz5c4jh2h0bqg3n5zi89588ng2k";
   };
 
   makeFlags = "PREFIX=$(out)";
@@ -21,6 +21,6 @@ stdenv.mkDerivation {
     description = "List files recursively";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.all;
-    maintainers = [stdenv.lib.maintainers.globin];
+    maintainers = [ stdenv.lib.maintainers.globin ];
   };
 }

From a0aacdd199224df43aafc6f8f7e495b26c147f7b Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 18:53:45 +0100
Subject: [PATCH 311/899] lxc: 2.0.6 -> 2.0.7

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

diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index 3c413ca2426..ccee2a18a90 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -12,11 +12,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "lxc-${version}";
-  version = "2.0.6";
+  version = "2.0.7";
 
   src = fetchurl {
     url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz";
-    sha256 = "0ynddnfirh9pmy7ijg300jrgzdhjzm07fsmvdw71mb2x0p82qabw";
+    sha256 = "0paz0lgb9dzpgahysad1cr6gz54l6xyhqdx6dzw2kh3fy1sw028w";
   };
 
   nativeBuildInputs = [

From 8821ef9dc5b558da7a4385c17c4676f0e861ccfe Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 18:54:10 +0100
Subject: [PATCH 312/899] redir: 2.2.1 -> 3.1

---
 pkgs/tools/networking/redir/default.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/networking/redir/default.nix b/pkgs/tools/networking/redir/default.nix
index 1fcb73e00dc..620e8d3dbba 100644
--- a/pkgs/tools/networking/redir/default.nix
+++ b/pkgs/tools/networking/redir/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "redir-2.2.1";
+  name = "redir-${version}";
+  version = "3.1";
 
-  src = fetchurl {
-    url = "http://sammy.net/~sammy/hacks/${name}.tar.gz";
-    sha256 = "0v0f14br00rrmd1ss644adsby4gm29sn7a2ccy7l93ik6pw099by";
+  src = fetchFromGitHub {
+    owner = "troglobit";
+    repo = "redir";
+    rev = "v${version}";
+    sha256 = "1m05dchi15bzz9zfdb7jg59624sx4khp5zq0wf4pzr31s64f69cx";
   };
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp redir $out/bin
-  '';
+  nativeBuildInputs = [ autoreconfHook ];
 
   meta = {
-    description = "A port redirector";
-    homepage = http://sammy.net/~sammy/hacks/;
+    description = "A TCP port redirector for UNIX";
+    homepage = "https://github.com/troglobit/redir";
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ globin ];
     platforms = stdenv.lib.platforms.linux;

From 51f4e1829cffdf1068ad811137dd78a2260ddfaf Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 18:57:17 +0100
Subject: [PATCH 313/899] sslscan: 1.11.7 -> 1.11.8

---
 pkgs/tools/security/sslscan/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix
index 6b205d84534..90034b641a0 100644
--- a/pkgs/tools/security/sslscan/default.nix
+++ b/pkgs/tools/security/sslscan/default.nix
@@ -2,20 +2,18 @@
 
 stdenv.mkDerivation rec {
   name = "sslscan-${version}";
-  version = "1.11.7";
+  version = "1.11.8";
 
   src = fetchFromGitHub {
     owner = "rbsec";
     repo = "sslscan";
     rev = "${version}-rbsec";
-    sha256 = "007lf3rxcn9nz6jrki3mavgd9sd2hmm9nzp2g13h0ri51yc3bkp0";
+    sha256 = "0vm9r0hmpb6ifix2biqbr7za1rld9yx8hi8vf7j69vcm647z7aas";
   };
 
   buildInputs = [ openssl ];
 
-  installFlags = [
-    "PREFIX=$(out)"
-  ];
+  installFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
     description = "Tests SSL/TLS services and discover supported cipher suites";

From 756bcc3d959b61da60e5586afa389ba257e49b82 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 19:04:01 +0100
Subject: [PATCH 314/899] moonlight-embedded: 2.2.1 -> 2.2.3

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

diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix
index 9171e012807..391440f8622 100644
--- a/pkgs/applications/misc/moonlight-embedded/default.nix
+++ b/pkgs/applications/misc/moonlight-embedded/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   name = "moonlight-embedded-${version}";
-  version = "2.2.1";
+  version = "2.2.3";
 
   # fetchgit used to ensure submodules are available
   src = fetchgit {

From 944403a3fd3332efb03c83462776bb2643b28064 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 19:10:15 +0100
Subject: [PATCH 315/899] babeld: 1.7.1 -> 1.8.0

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

diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix
index 1f5b5a7c638..d3b99a9381e 100644
--- a/pkgs/tools/networking/babeld/default.nix
+++ b/pkgs/tools/networking/babeld/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "babeld-1.7.1";
+  name = "babeld-1.8.0";
 
   src = fetchurl {
     url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz";
-    sha256 = "1dl7s2lb40kiysrqhr7zd0s90yfxy6xfsp0fhqgdlwfr99ymx59c";
+    sha256 = "0v2jkav2sb0rpx3fmi5chhii08lc92pxf306nyha2amq9wib3a0i";
   };
 
   preBuild = ''

From bd3ac6938bb4e1d1d24fc7c2add6a8e1918aac7e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 19:15:10 +0100
Subject: [PATCH 316/899] claws-mail: 3.14.0 -> 3.14.1

---
 .../mailreaders/claws-mail/default.nix        | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index 346dba3acd5..7186917269d 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -32,19 +32,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "claws-mail-${version}";
-  version = "3.14.0";
-
-  meta = {
-    description = "The user-friendly, lightweight, and fast email client";
-    homepage = http://www.claws-mail.org/;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ khumba fpletz ];
-  };
+  version = "3.14.1";
 
   src = fetchurl {
     url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz";
-    sha256 = "0nfchgga3ir91s8rky0a0vnz8cgj2f6h716wh3cmb466a01xfss6";
+    sha256 = "0df34gj4r5cbb92834hph19gnh7ih9rgmmw47rliyg8b9z01v6mp";
   };
 
   patches = [ ./mime.patch ];
@@ -99,4 +91,12 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/applications
     cp claws-mail.desktop $out/share/applications
   '';
+
+  meta = {
+    description = "The user-friendly, lightweight, and fast email client";
+    homepage = http://www.claws-mail.org/;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ khumba fpletz globin ];
+  };
 }

From 209d453bfb4f7e7ebc53e13f97f40e2859fd1456 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 19:17:57 +0100
Subject: [PATCH 317/899] fail2ban: 0.9.4 -> 0.9.6

---
 pkgs/tools/security/fail2ban/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix
index 695bfcce3a5..e7a052c90f1 100644
--- a/pkgs/tools/security/fail2ban/default.nix
+++ b/pkgs/tools/security/fail2ban/default.nix
@@ -1,16 +1,15 @@
 { stdenv, fetchFromGitHub, python, pythonPackages, gamin }:
 
-let version = "0.9.4"; in
+let version = "0.9.6"; in
 
 pythonPackages.buildPythonApplication {
   name = "fail2ban-${version}";
-  namePrefix = "";
 
   src = fetchFromGitHub {
     owner  = "fail2ban";
     repo   = "fail2ban";
     rev    = version;
-    sha256 = "1m8gqj35kwrn30rqwd488sgakaisz22xa5v9llvz6gwf4f7ps0a9";
+    sha256 = "1a75xjjqhn98zd9i51k15vjvcy0ql0gmcv9xf8pbd0bpvblgdah8";
   };
 
   propagatedBuildInputs = [ gamin ]

From 1393d7158a61bec64d3fb8074470bcf7bbba5d22 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 19:18:57 +0100
Subject: [PATCH 318/899] whois: 5.2.12 -> 5.2.14

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

diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix
index f7c94c1e72b..1a8104c2ee1 100644
--- a/pkgs/tools/networking/whois/default.nix
+++ b/pkgs/tools/networking/whois/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, perl, gettext }:
 
 stdenv.mkDerivation rec {
-  version = "5.2.12";
+  version = "5.2.14";
   name = "whois-${version}";
 
   src = fetchFromGitHub {
     owner = "rfc1036";
     repo = "whois";
     rev = "v${version}";
-    sha256 = "1cis7zwh0r1hqbl2wa3i2x1446nrhfqfd52b2lknfml64l08rnk5";
+    sha256 = "06nx295g03z7vzrrc3mhxikpw870zvkilrlxghd2rpcbm939iin5";
   };
 
   buildInputs = [ perl gettext ];

From 72e2de3a078e15692c255fd451fc33dc974f4361 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 19:24:03 +0100
Subject: [PATCH 319/899] rspamd: 1.4.1 -> 1.4.3

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

diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index 692227b5094..6283bed96c3 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -6,13 +6,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "rspamd-${version}";
-  version = "1.4.1";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "vstakhov";
     repo = "rspamd";
     rev = version;
-    sha256 = "19hy9qr9lv17br2algig95d64zzdyly7n6c3z8fanwcpk35sgrhr";
+    sha256 = "1wrqi8vsd61rc48x2gyhc0xrir9pr372lpkyhwgx1rpxzdxsdwh9";
   };
 
   nativeBuildInputs = [ cmake pkgconfig perl ];

From 0e0f0d0478dcfd2c7a97e37ef83df9dc7841873f Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 19:27:12 +0100
Subject: [PATCH 320/899] radvd: 2.15 -> 2.16

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

diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix
index 6c74b52b45f..a5008e91423 100644
--- a/pkgs/tools/networking/radvd/default.nix
+++ b/pkgs/tools/networking/radvd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "radvd-${version}";
-  version = "2.15";
+  version = "2.16";
 
   src = fetchurl {
     url = "http://www.litech.org/radvd/dist/${name}.tar.xz";
-    sha256 = "09spyj4f05rjx21v8vmyqmmj0fz1wx810s63md1vf05hyzd0v8dk";
+    sha256 = "1s3aqgn3db0wb4920b0mrvwb5isgijlb6izb1wliqhhashwffz1i";
   };
 
   nativeBuildInputs = [ pkgconfig bison flex check ];

From e3d9f438c357377d524036f88c45e9245c3809fc Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 19:32:46 +0100
Subject: [PATCH 321/899] nmap: 7.31 -> 7.40

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

diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix
index 71d93d44322..aefa82128ac 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/pkgs/tools/security/nmap/default.nix
@@ -19,11 +19,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nmap${optionalString graphicalSupport "-graphical"}-${version}";
-  version = "7.31";
+  version = "7.40";
 
   src = fetchurl {
     url = "https://nmap.org/dist/nmap-${version}.tar.bz2";
-    sha256 = "0hiqb28950kn4bjsmw0ksfyss7j2qdmgrj3xsjf7073pq01lx7yb";
+    sha256 = "121i9mgyc28ra2825akd0ix5qyssv4xc2qlx296mam6hzxgnc54y";
   };
 
   patches = ./zenmap.patch;

From d1738c19bb5fe487087386160c3f134413a10b9a Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Wed, 1 Feb 2017 21:25:29 +0100
Subject: [PATCH 322/899] kernel: 4.9.6 -> 4.9.7

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index ce041ecf0e9..02a86f0a196 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.6";
+  version = "4.9.7";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "16yfrydxcdlbm8vmfqirc0gshsbka6mjgfwc2wqs422v19vsz4zl";
+    sha256 = "1p1k1swmpky6iafb6snixhvq3prwbn29fd5cnnv7qff7f4xjhq8b";
   };
 
   kernelPatches = args.kernelPatches;

From 599df5e1082c246a995ca91fc052021b89724be0 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Thu, 2 Feb 2017 19:31:14 +0100
Subject: [PATCH 323/899] virtualbox: 5.1.10 -> 5.1.14

---
 pkgs/applications/virtualization/virtualbox/default.nix   | 8 ++++----
 .../virtualization/virtualbox/guest-additions/default.nix | 2 +-
 .../virtualization/virtualbox/upstream-info.json          | 8 ++++++++
 3 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/applications/virtualization/virtualbox/upstream-info.json

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index d0c98911387..7512ddb6b0f 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -18,10 +18,10 @@ let
   python = python2;
   buildType = "release";
 
-  extpack = "3982657fd4853bcbc79b9162e618545a479b65aca08e9ced43a904aeeba3ffa5";
-  extpackRev = 112026;
-  main = "98073b1b2adee4e6553df73cb5bb6ea8ed7c3a41a475757716fd9400393bea40";
-  version = "5.1.10";
+  extpack = "baddb7cc49224ecc1147f82d77fce2685ac39941ac9b0aac83c270dd6570ea85";
+  extpackRev = 112924;
+  main = "8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a";
+  version = "5.1.14";
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
   extensionPack = requireFile rec {
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index fe362616bc5..d73c18badb1 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "29fa0af66a3dd273b0c383c4adee31a52061d52f57d176b67f444698300b8c41";
+    sha256 = "1b206b76050dccd3ed979307230f9ddea79551e1c0aba93faee77416733cdc8a";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/*/build";
diff --git a/pkgs/applications/virtualization/virtualbox/upstream-info.json b/pkgs/applications/virtualization/virtualbox/upstream-info.json
new file mode 100644
index 00000000000..8628751f2a1
--- /dev/null
+++ b/pkgs/applications/virtualization/virtualbox/upstream-info.json
@@ -0,0 +1,8 @@
+{
+  "__NOTE": "Generated using update.py from the same directory.",
+  "extpack": "baddb7cc49224ecc1147f82d77fce2685ac39941ac9b0aac83c270dd6570ea85",
+  "extpackRev": "112924",
+  "guest": "1b206b76050dccd3ed979307230f9ddea79551e1c0aba93faee77416733cdc8a",
+  "main": "8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a",
+  "version": "5.1.14"
+}

From 5ca3a7e56f8b508e513b381b4d62a0682ae94bfa Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Thu, 2 Feb 2017 21:11:08 +0100
Subject: [PATCH 324/899] virtualbox: remove upstream-info.json as it is no
 longer used

We keep the script as it might be useful in the future.
---
 .../virtualization/virtualbox/upstream-info.json          | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 pkgs/applications/virtualization/virtualbox/upstream-info.json

diff --git a/pkgs/applications/virtualization/virtualbox/upstream-info.json b/pkgs/applications/virtualization/virtualbox/upstream-info.json
deleted file mode 100644
index 8628751f2a1..00000000000
--- a/pkgs/applications/virtualization/virtualbox/upstream-info.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "__NOTE": "Generated using update.py from the same directory.",
-  "extpack": "baddb7cc49224ecc1147f82d77fce2685ac39941ac9b0aac83c270dd6570ea85",
-  "extpackRev": "112924",
-  "guest": "1b206b76050dccd3ed979307230f9ddea79551e1c0aba93faee77416733cdc8a",
-  "main": "8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a",
-  "version": "5.1.14"
-}

From a70b4f7b3896b082c8547797f7e676de49d72ea3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sat, 8 Oct 2016 18:07:15 +0200
Subject: [PATCH 325/899] kodi: 16.1 -> 17.0

---
 pkgs/applications/video/kodi/default.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index dccb8412733..ee0be6419aa 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, makeWrapper
 , pkgconfig, cmake, gnumake, yasm, python2
-, boost, avahi, libdvdcss, lame, autoreconfHook
+, boost, avahi, libdvdcss, libdvdnav, libdvdread, lame, autoreconfHook
 , gettext, pcre-cpp, yajl, fribidi, which
 , openssl, gperf, tinyxml2, taglib, libssh, swig, jre
 , libX11, xproto, inputproto, libxml2
@@ -38,18 +38,18 @@ assert pulseSupport -> libpulseaudio != null;
 assert rtmpSupport  -> rtmpdump != null;
 
 let
-  rel = "Jarvis";
-  ffmpeg_2_8_6 = fetchurl {
-    url = "https://github.com/xbmc/FFmpeg/archive/2.8.6-${rel}-16.1.tar.gz";
-    sha256 = "1qp8b97298l2pnhhcp7xczdfwr7q7ibxlk4vp8pfmxli2h272wan";
+  rel = "Krypton";
+  ffmpeg_3_1_6 = fetchurl {
+    url = "https://github.com/xbmc/FFmpeg/archive/3.1.6-${rel}.tar.gz";
+    sha256 = "14jicb26s20nr3qmfpazszpc892yjwjn81zbsb8szy3a5xs19y81";
   };
 in stdenv.mkDerivation rec {
     name = "kodi-" + version;
-    version = "16.1";
+    version = "17.0";
 
     src = fetchurl {
       url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz";
-      sha256 = "047xpmz78k3d6nhk1x9s8z0bw1b1w9kca46zxkg86p3iyapwi0kx";
+      sha256 = "0ib59x733yf8ivsw82qlsq43jn5214n668nrn5df2flpjcjgmzsb";
     };
 
     buildInputs = [
@@ -90,7 +90,10 @@ in stdenv.mkDerivation rec {
         --replace 'usr/share/zoneinfo' 'etc/zoneinfo'
       substituteInPlace tools/depends/target/ffmpeg/autobuild.sh \
         --replace "/bin/bash" "${bash}/bin/bash -ex"
-      cp ${ffmpeg_2_8_6} tools/depends/target/ffmpeg/ffmpeg-2.8.6-${rel}-16.0.tar.gz
+      cp ${ffmpeg_3_1_6} tools/depends/target/ffmpeg/ffmpeg-3.1.6-${rel}.tar.gz
+      ln -s ${libdvdcss.src} tools/depends/target/libdvdcss/libdvdcss-master.tar.gz
+      ln -s ${libdvdnav.src} tools/depends/target/libdvdnav/libdvdnav-master.tar.gz
+      ln -s ${libdvdread.src} tools/depends/target/libdvdread/libdvdread-master.tar.gz
     '';
 
     preConfigure = ''

From d211d7c44009df5fd57b231cac183250b56a6cf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Wed, 19 Oct 2016 00:08:27 +0200
Subject: [PATCH 326/899] kodiPlugins.pvr-hts: update to 3.4.4 for kodi17

Updated pvr-hts plugin to latest version to work with kodi 17. Had to
update libcec as well, to pick the name change.
---
 pkgs/applications/video/kodi/plugins.nix       | 12 ++++++------
 pkgs/development/libraries/libcec/default.nix  |  4 ++--
 pkgs/development/libraries/libcec/platform.nix | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 6abb47b81c3..b56f461ee2a 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -6,14 +6,14 @@ let
 
   kodi-platform = stdenv.mkDerivation rec {
     project = "kodi-platform";
-    version = "15.2";
+    version = "17.1";
     name = "${project}-${version}";
 
     src = fetchFromGitHub {
       owner = "xbmc";
       repo = project;
-      rev = "45d6ad1984fdb1dc855076ff18484dbec33939d1";
-      sha256 = "1fai33mwyv5ab47b16i692g7a3vcnmxavx13xin2gh16y0qm62hi";
+      rev = "c8188d82678fec6b784597db69a68e74ff4986b5";
+      sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199";
     };
 
     buildInputs = [ cmake kodi libcec_platform tinyxml ];
@@ -219,13 +219,13 @@ in
   pvr-hts = (mkKodiPlugin rec {
     plugin = "pvr-hts";
     namespace = "pvr.hts";
-    version = "2.2.13";
+    version = "3.4.4";
 
     src = fetchFromGitHub {
       owner = "kodi-pvr";
       repo = "pvr.hts";
-      rev = "3274354511e970e2101c2aa437001b2f245f80da";
-      sha256 = "0i7cb61pjv6vbj3x96cm1n4w91mvc8z6lxa8ykjasrrbi95ph7ld";
+      rev = "343ca980982d87c778696e42e52eff763cadee4a";
+      sha256 = "03jk45nk1c5j7zwj6l8s8jyf6ijhisp1r16xg6n5561bm3cfk0b9";
     };
 
     meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix
index 94b483e1f5d..7811eff6fe2 100644
--- a/pkgs/development/libraries/libcec/default.nix
+++ b/pkgs/development/libraries/libcec/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform }:
 
-let version = "3.0.1"; in
+let version = "3.1.0"; in
 
 stdenv.mkDerivation {
   name = "libcec-${version}";
 
   src = fetchurl {
     url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz";
-    sha256 = "0gi5gq8pz6vfdx80pimx23d5g243zzgmc7s8wpb686csjk470dky";
+    sha256 = "08gr4rhx7qh8ajkry9j0sqw11i74y802dla1wg4l4gxhl4hrs409";
   };
 
   buildInputs = [ cmake pkgconfig udev libcec_platform ];
diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix
index 6db2656c9f4..d21f1b1404e 100644
--- a/pkgs/development/libraries/libcec/platform.nix
+++ b/pkgs/development/libraries/libcec/platform.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, cmake }:
 
-let version = "1.0.10"; in
+let version = "2.0.1"; in
 
 stdenv.mkDerivation {
-  name = "libcec-${version}";
+  name = "p8-platform-${version}";
 
   src = fetchurl {
-    url = "https://github.com/Pulse-Eight/platform/archive/${version}.tar.gz";
-    sha256 = "1kdmi9b62nky4jrb5519ddnw5n7s7m6qyj7rzhg399f0n6f278vb";
+    url = "https://github.com/Pulse-Eight/platform/archive/p8-platform-${version}.tar.gz";
+    sha256 = "1kslq24p2zams92kc247qcczbxb2n89ykk9jfyiilmwh7qklazp9";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "Platform library for libcec and Kodi addons";
     homepage = "https://github.com/Pulse-Eight/platform";
-    repositories.git = "https://github.com/Pulse-Eight/libcec.git";
+    repositories.git = "https://github.com/Pulse-Eight/platform.git";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.titanous ];

From 62dc6830967ceb2d18630503ae9fecbabfc5ffa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 6 Nov 2016 12:00:28 +0100
Subject: [PATCH 327/899] kodiPlugins: updates

  * Added exodus in favour of genesis, same developer and old plugin is dead
  * Added gamepad(controllers) inputs as enableControllers
  * Updated SVTPlay, HyperLauncher
  * Removed SALTS, doesn't work without a FHS
---
 pkgs/applications/video/kodi/plugins.nix | 143 +++++++++--------------
 pkgs/top-level/all-packages.nix          |   6 +-
 2 files changed, 62 insertions(+), 87 deletions(-)

diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index b56f461ee2a..463003239d0 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, cmake, kodi, steam, libcec_platform, tinyxml, unzip }:
+{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, lib
+, unzip, cmake, kodi, steam, libcec_platform, tinyxml }:
 
 let
 
@@ -19,9 +20,9 @@ let
     buildInputs = [ cmake kodi libcec_platform tinyxml ];
   };
 
-  mkKodiPlugin = { plugin, namespace, version, src, meta, ... }:
+  mkKodiPlugin = { plugin, namespace, version, src, meta, sourceDir ? null, ... }:
   stdenv.lib.makeOverridable stdenv.mkDerivation rec {
-    inherit src meta;
+    inherit src meta sourceDir;
     name = "kodi-plugin-${plugin}-${version}";
     passthru = {
       kodiPlugin = pluginDir;
@@ -29,6 +30,7 @@ let
     };
     dontStrip = true;
     installPhase = ''
+      ${if isNull sourceDir then "" else "cd $src/$sourceDir"}
       d=$out${pluginDir}/${namespace}
       mkdir -p $d
       sauce="."
@@ -70,34 +72,69 @@ in
 
   };
 
-  genesis = (mkKodiPlugin rec {
+  controllers = let
+    pname = "game-controller";
+    version = "1.0.3";
 
-    plugin = "genesis";
-    namespace = "plugin.video.genesis";
-    version = "5.1.4";
-
-    src = fetchurl {
-      url = "https://offshoregit.com/lambda81/lambda-repo/${namespace}/${namespace}-${version}.zip";
-      sha256 = "0b0pdzgg42mgxgkb6sb83rldh4k19c3l9z7g2wnvxm3s2p6rjy3v";
+    src = fetchFromGitHub {
+      owner = "kodi-game";
+      repo = "kodi-game-controllers";
+      rev = "01acb5b6e8b85392b3cb298b034aadb1b24ccf18";
+      sha256 = "0sbc0w0fwbp7rbmbgb6a1kglhnn5g85hijcbbvf5x6jdq9v3f1qb";
     };
 
     meta = with stdenv.lib; {
-      homepage = "http://forums.tvaddons.ag/forums/148-lambda-s-kodi-addons";
-      description = "The origins of streaming";
+      description = "Add support for different gaming controllers.";
       platforms = platforms.all;
       maintainers = with maintainers; [ edwtjo ];
     };
+
+    mkController = controller: {
+        "${controller}" = mkKodiPlugin rec {
+          plugin = pname + "-" + controller;
+          namespace = "game.controller." + controller;
+          sourceDir = "addons/" + namespace;
+          inherit version src meta;
+        };
+      };
+    in (mkController "default")
+    // (mkController "dreamcast")
+    // (mkController "gba")
+    // (mkController "genesis")
+    // (mkController "mouse")
+    // (mkController "n64")
+    // (mkController "nes")
+    // (mkController "ps")
+    // (mkController "snes");
+
+  exodus = (mkKodiPlugin rec {
+
+    plugin = "exodus";
+    namespace = "plugin.video.exodus";
+    version = "2.0.12";
+
+    src = fetchurl {
+      url = "https://offshoregit.com/${plugin}/${namespace}/${namespace}-${version}.zip";
+      sha256 = "02cdyvyxay6jiw9xj8hqnkp5w6drqj67pkh243znrsc06f26qkql";
+    };
+
+    meta = with stdenv.lib; {
+      description = "A streaming plugin for Kodi";
+      platforms = platforms.all;
+      maintainers = with maintainers; [ edwtjo ];
+    };
+
   }).override { buildInputs = [ unzip ]; };
 
   hyper-launcher = let
     pname = "hyper-launcher";
-    version = "1.2.0";
+    version = "1.5.2";
     src = fetchFromGitHub rec {
       name = pname + "-" + version + ".tar.gz";
       owner = "teeedubb";
       repo = owner + "-xbmc-repo";
-      rev = "9bd170407436e736d2d709f8af9968238594669c";
-      sha256 = "019nqf7kixicnrzkg671x4yq723igjkhfl8hz5bifi9gx2qcy8hy";
+      rev = "f958ba93fe85b9c9025b1745d89c2db2e7dd9bf6";
+      sha256 = "1dvff24fbas25k5kvca4ssks9l1g5rfa3hl8lqxczkaqi3pp41j5";
     };
     meta = with stdenv.lib; {
       homepage = http://forum.kodi.tv/showthread.php?tid=258159;
@@ -107,8 +144,9 @@ in
   in {
     service = mkKodiPlugin {
       plugin = pname + "-service";
+      version = "1.2.1";
       namespace = "service.hyper.launcher";
-      inherit version src meta;
+      inherit src meta;
     };
     plugin = mkKodiPlugin {
       plugin = pname;
@@ -117,39 +155,18 @@ in
     };
   };
 
-  salts = mkKodiPlugin rec {
-
-    plugin = "salts";
-    namespace = "plugin.video.salts";
-    version = "2.0.19";
-
-    src = fetchFromGitHub {
-      name = plugin + "-" + version + ".tar.gz";
-      owner = "tknorris";
-      repo = plugin;
-      rev = "9c1882bad35cab9e62687847e097c37a576b900d";
-      sha256 = "0saq578xsxvyg1v8jg2m3131hfrr95gv74b2npxr7g715yyx5bjq";
-    };
-
-    meta = with stdenv.lib; {
-      homepage = "https://github.com/tknorris/salts";
-      description = "Stream All The Sources";
-      maintainers = with maintainers; [ edwtjo ];
-    };
-  };
-
   svtplay = mkKodiPlugin rec {
 
     plugin = "svtplay";
     namespace = "plugin.video.svtplay";
-    version = "4.0.24";
+    version = "4.0.42";
 
     src = fetchFromGitHub {
       name = plugin + "-" + version + ".tar.gz";
       owner = "nilzen";
       repo = "xbmc-" + plugin;
-      rev = "e66e2af6529e3ffd030ad486c849894a9ffdeb45";
-      sha256 = "01nq6gac83q6ayhqcj1whvk58pzrm1haw801s321f4vc8gswag56";
+      rev = "83cb52b949930a1b6d2e51a7a0faf9bd69c7fb7d";
+      sha256 = "0ync2ya4lwmfn6ngg8v0z6bng45whwg280irsn4bam5ca88383iy";
     };
 
     meta = with stdenv.lib; {
@@ -248,48 +265,4 @@ in
       ln -s $out/lib/addons/pvr.hts/pvr.hts.so* $out/share/kodi/addons/pvr.hts
     '';
   };
-
-  t0mm0-common = mkKodiPlugin rec {
-
-    plugin = "t0mm0-common";
-    namespace = "script.module.t0mm0.common";
-    version = "0.0.1";
-
-    src = fetchFromGitHub {
-      name = plugin + "-" + version + ".tar.gz";
-      owner = "t0mm0";
-      repo = "xbmc-urlresolver";
-      rev = "ab16933a996a9e77b572953c45e70900c723d6e1";
-      sha256 = "1yd00md8iirizzaiqy6fv1n2snydcpqvp2f9irzfzxxi3i9asb93";
-    };
-
-    meta = with stdenv.lib; {
-      homepage = "https://github.com/t0mm0/xbmc-urlresolver/";
-      description = "t0mm0's common stuff";
-      maintainers = with maintainers; [ edwtjo ];
-    };
-  };
-
-  urlresolver = (mkKodiPlugin rec {
-
-    plugin = "urlresolver";
-    namespace = "script.module.urlresolver";
-    version = "2.10.0";
-
-    src = fetchFromGitHub {
-      name = plugin + "-" + version + ".tar.gz";
-      owner = "Eldorados";
-      repo = namespace;
-      rev = "72b9d978d90d54bb7a0224a1fd2407143e592984";
-      sha256 = "0r5glfvgy9ri3ar9zdkvix8lalr1kfp22fap2pqp739b6k2iqir6";
-    };
-
-    meta = with stdenv.lib; {
-      homepage = "https://github.com/Eldorados/urlresolver";
-      description = "Resolve common video host URL's to be playable in XBMC/Kodi";
-      maintainers = with maintainers; [ edwtjo ];
-    };
-  }).override {
-    postPatch = "sed -i -e 's,settings_file = os.path.join(addon_path,settings_file = os.path.join(profile_path,g' lib/urlresolver/common.py";
-  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a43132ce096..04ce743e2a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15593,10 +15593,12 @@ with pkgs;
     plugins = let inherit (lib) optional optionals; in with kodiPlugins;
       ([]
       ++ optional (config.kodi.enableAdvancedLauncher or false) advanced-launcher
-      ++ optional (config.kodi.enableGenesis or false) genesis
+      ++ optionals (config.kodi.enableControllers or false)
+        (with controllers;
+          [ default dreamcast gba genesis mouse n64 nes ps snes ])
+      ++ optional (config.kodi.enableExodus or false) exodus
       ++ optionals (config.kodi.enableHyperLauncher or false)
            (with hyper-launcher; [ plugin service pdfreader ])
-      ++ optionals (config.kodi.enableSALTS or false) [salts urlresolver t0mm0-common]
       ++ optional (config.kodi.enableSVTPlay or false) svtplay
       ++ optional (config.kodi.enableSteamLauncher or false) steam-launcher
       ++ optional (config.kodi.enablePVRHTS or false) pvr-hts

From db73e446b4d929f262dbde35e7063d1e5e9cfb92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Thu, 2 Feb 2017 21:23:16 +0100
Subject: [PATCH 328/899] catch: 1.5.0 -> 1.7.0

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

diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix
index 090d03a1d14..9a3b9d8e8aa 100644
--- a/pkgs/development/libraries/catch/default.nix
+++ b/pkgs/development/libraries/catch/default.nix
@@ -3,20 +3,20 @@
 stdenv.mkDerivation rec {
 
   name = "catch-${version}";
-  version = "1.5.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "philsquared";
     repo = "Catch";
-    rev = "v" + version;
-    sha256 = "1ag8siafg7fmb50qdqznryrg3lvv56f09nvqwqqn2rlk83zjnaw0";
+    rev = "v." + version;
+    sha256 = "0harki6irc4mqipjc24zyy0jimidr5ng3ss29bnpzbbwhrnkyrgm";
   };
 
   buildInputs = [ cmake ];
   dontUseCmakeConfigure = true;
 
   buildPhase = ''
-    cmake -Hprojects/CMake -BBuild -DCMAKE_BUILD_TYPE=Release -DUSE_CPP11=ON
+    cmake . -BBuild -DCMAKE_BUILD_TYPE=Release -DUSE_CPP11=ON
     cd Build
     make
     cd ..

From 78960abfc7bdc502d8b4a7312f3dcddad8c1e888 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 2 Feb 2017 20:15:34 +0000
Subject: [PATCH 329/899] ocamlPackages.vg: add ocamlbuild as dependency

---
 pkgs/development/ocaml-modules/vg/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix
index aa6047c7901..cb7878ac731 100644
--- a/pkgs/development/ocaml-modules/vg/default.nix
+++ b/pkgs/development/ocaml-modules/vg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, opam, topkg
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
 , uchar, result, gg, uutf, otfm, js_of_ocaml,
   pdfBackend ? true, # depends on uutf and otfm
   htmlcBackend ? true # depends on js_of_ocaml
@@ -17,14 +17,14 @@ assert versionAtLeast ocaml.version "4.02.0";
 
 stdenv.mkDerivation rec {
 
-  name = "ocaml-${pname}-${version}";
+  name = "ocaml${ocaml.version}-${pname}-${version}";
 
   src = fetchurl {
     url = "${webpage}/releases/${pname}-${version}.tbz";
     sha256 = "1czd2fq85hy24w5pllarsq4pvbx9rda5zdikxfxdng8s9kff2h3f";
   };
 
-  buildInputs = [ ocaml findlib opam topkg ];
+  buildInputs = [ ocaml findlib ocamlbuild opam topkg ];
 
   propagatedBuildInputs = [ uchar result gg ]
                           ++ optionals pdfBackend [ uutf otfm ]

From 9f334c2732e4d8606ccb09b14893aad5c37bb9da Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 2 Feb 2017 20:16:07 +0000
Subject: [PATCH 330/899] ocamlPackages.ppx_tools: init at unstable-20161114
 (for OCaml 4.04)

---
 pkgs/development/ocaml-modules/ppx_tools/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix
index b6a6039a4fa..62aa97de5fa 100644
--- a/pkgs/development/ocaml-modules/ppx_tools/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix
@@ -7,6 +7,10 @@ let param = {
   "4.03.0" = {
     version = "5.0+4.03.0";
     sha256 = "061v1fl5z7z3ywi4ppryrlcywnvnqbsw83ppq72qmkc7ma4603jg"; };
+  "4.04.0" = {
+    version = "unstable-20161114";
+    rev = "49c08e2e4ea8fef88692cd1dcc1b38a9133f17ac";
+    sha256 = "0ywzfkf5brj33nwh49k9if8x8v433ral25f3nbklfc9vqr06zrfl"; };
 }."${ocaml.version}";
 in
   stdenv.mkDerivation {
@@ -14,7 +18,7 @@ in
     src = fetchFromGitHub {
       owner = "alainfrisch";
       repo = "ppx_tools";
-      rev = param.version;
+      rev = if param ? rev then param.rev else param.version;
       inherit (param) sha256;
     };
 

From dbda1c433186b60d63f68a360edd8b52d94043be Mon Sep 17 00:00:00 2001
From: David Terry <davidterry@posteo.de>
Date: Thu, 2 Feb 2017 21:31:28 +0100
Subject: [PATCH 331/899] vscode: 1.8.1 -> 1.9.0

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

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 97fc30c237c..f0f44bfe62f 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,21 +2,21 @@
   makeWrapper, libXScrnSaver }:
 
 let
-  version = "1.8.1";
-  rev = "ee428b0eead68bf0fb99ab5fdc4439be227b6281";
+  version = "1.9.0";
+  rev = "38746938a4ab94f2f57d9e1309c51fd6fb37553d";
   channel = "stable";
 
-  sha256 = if stdenv.system == "i686-linux"    then "f48c2eb302de0742612f6c5e4ec4842fa474a85c1bcf421456526c9472d4641f"
-      else if stdenv.system == "x86_64-linux"  then "99bd463707f3a21bc949eec3e857c80aafef8f66e06a295148c1c23875244760"
-      else if stdenv.system == "x86_64-darwin" then "9202c85669853b07d1cbac9e6bcb01e7c08e13fd2a2b759dd53994e0fa51e7a1"
+  sha256 = if stdenv.system == "i686-linux"    then "05f1sk2lq2skp8fxq6q229kf89vi2sq3zz6lywq7nk81pwvp8jap"
+      else if stdenv.system == "x86_64-linux"  then "0wj17lwq8f88xvfa6wfbqm580kp0470ib2yxn15j9mv0iw7nzqry"
+      else if stdenv.system == "x86_64-darwin" then "1k067h099j6fv820nn6h4i8ax35yvd1h8f4h5216dm66cpikv7nd"
       else throw "Unsupported system: ${stdenv.system}";
 
   urlBase = "https://az764295.vo.msecnd.net/${channel}/${rev}/";
 
   urlStr = if stdenv.system == "i686-linux" then
-        urlBase + "code-${channel}-code_${version}-1482159060_i386.tar.gz"
+        urlBase + "code-${channel}-code_${version}-1486024310_i386.tar.gz"
       else if stdenv.system == "x86_64-linux" then
-        urlBase + "code-${channel}-code_${version}-1482158209_amd64.tar.gz"
+        urlBase + "code-${channel}-code_${version}-1486023356_amd64.tar.gz"
       else if stdenv.system == "x86_64-darwin" then
         urlBase + "VSCode-darwin-${channel}.zip"
       else throw "Unsupported system: ${stdenv.system}";

From e2b74824d75c763e49fe3ef555a18dfe797e0a56 Mon Sep 17 00:00:00 2001
From: Ruben Maher <r@rkm.id.au>
Date: Thu, 2 Feb 2017 23:31:36 +1030
Subject: [PATCH 332/899] gnome-tweak-tool: trick autoconf into using python2

---
 .../gnome-3/3.22/misc/gnome-tweak-tool/default.nix       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix
index e6c4b8c8202..f75cdd0e83e 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix
@@ -12,6 +12,15 @@ in stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
+  # Make sure that Python 2 is first in $PATH because gnome3.gnome_shell
+  # propagates python3Packages.python.  If we do not do this, autoconf will use
+  # Python 3 instead which gnome-tweak-tool does not support at this time.  See:
+  # https://github.com/NixOS/nixpkgs/issues/21851
+  # https://github.com/NixOS/nixpkgs/pull/22370
+  preConfigure = ''
+    PATH="${python}/bin:$PATH"
+  '';
+
   makeFlags = [ "DESTDIR=/" ];
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2

From 19759cfeab0b749666dafdf52a0aad79123a2126 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Thu, 26 Jan 2017 22:49:22 +0100
Subject: [PATCH 333/899] services: add GlusterFS service

This service is only limited in configuration options.
But it is sufficient to run glusterd and configure it using the gluster command
---
 nixos/modules/module-list.nix                 |  1 +
 .../network-filesystems/glusterfs.nix         | 84 +++++++++++++++++++
 2 files changed, 85 insertions(+)
 create mode 100644 nixos/modules/services/network-filesystems/glusterfs.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index fed75053e56..1398542a5c1 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -339,6 +339,7 @@
   ./services/monitoring/zabbix-server.nix
   ./services/network-filesystems/cachefilesd.nix
   ./services/network-filesystems/drbd.nix
+  ./services/network-filesystems/glusterfs.nix
   ./services/network-filesystems/ipfs.nix
   ./services/network-filesystems/netatalk.nix
   ./services/network-filesystems/nfsd.nix
diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix
new file mode 100644
index 00000000000..a2f2c033951
--- /dev/null
+++ b/nixos/modules/services/network-filesystems/glusterfs.nix
@@ -0,0 +1,84 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  inherit (pkgs) glusterfs;
+
+  cfg = config.services.glusterfs;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.glusterfs = {
+
+      enable = mkEnableOption "GlusterFS Daemon";
+
+      logLevel = mkOption {
+        type = types.enum ["DEBUG" "INFO" "WARNING" "ERROR" "CRITICAL" "TRACE" "NONE"];
+        description = "Log level used by the GlusterFS daemon";
+        default = "INFO";
+      };
+
+      extraFlags = mkOption {
+        type = types.listOf types.str;
+        description = "Extra flags passed to the GlusterFS daemon";
+        default = [];
+      };
+    };
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.glusterfs ];
+
+    services.rpcbind.enable = true;
+
+    systemd.services.glusterd = {
+
+      description = "GlusterFS, a clustered file-system server";
+
+      wantedBy = [ "multi-user.target" ];
+
+      requires = [ "rpcbind.service" ];
+      after = [ "rpcbind.service" "network.target" "local-fs.target" ];
+      before = [ "network-online.target" ];
+
+      preStart = ''
+        install -m 0755 -d /var/log/glusterfs
+      '';
+
+      serviceConfig = {
+        Type="forking";
+        PIDFile="/run/glusterd.pid";
+        LimitNOFILE=65536;
+        ExecStart="${glusterfs}/sbin/glusterd -p /run/glusterd.pid --log-level=${cfg.logLevel} ${toString cfg.extraFlags}";
+        KillMode="process";
+      };
+    };
+
+    systemd.services.glustereventsd = {
+
+      description = "Gluster Events Notifier";
+
+      wantedBy = [ "multi-user.target" ];
+
+      after = [ "syslog.target" "network.target" ];
+
+      serviceConfig = {
+        Type="simple";
+        Environment="PYTHONPATH=${glusterfs}/usr/lib/python2.7/site-packages";
+        PIDFile="/run/glustereventsd.pid";
+        ExecStart="${glusterfs}/sbin/glustereventsd --pid-file /run/glustereventsd.pid";
+        ExecReload="/bin/kill -SIGUSR2 $MAINPID";
+        KillMode="control-group";
+      };
+    };
+  };
+}

From ff3f3399aefa759707f5f24da3b6641f2147cb0e Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Thu, 26 Jan 2017 23:38:06 +0100
Subject: [PATCH 334/899] filesystems: add support to mount glusterfs

---
 nixos/modules/tasks/filesystems.nix           |  2 +-
 nixos/modules/tasks/filesystems/glusterfs.nix | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/tasks/filesystems/glusterfs.nix

diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index 49ba66ad50a..8bd35385739 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -216,7 +216,7 @@ in
 
     environment.etc.fstab.text =
       let
-        fsToSkipCheck = [ "none" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" ];
+        fsToSkipCheck = [ "none" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" ];
         skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck;
       in ''
         # This is a generated file.  Do not edit!
diff --git a/nixos/modules/tasks/filesystems/glusterfs.nix b/nixos/modules/tasks/filesystems/glusterfs.nix
new file mode 100644
index 00000000000..e8c7fa8efba
--- /dev/null
+++ b/nixos/modules/tasks/filesystems/glusterfs.nix
@@ -0,0 +1,11 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = mkIf (any (fs: fs == "glusterfs") config.boot.supportedFilesystems) {
+
+    system.fsPackages = [ pkgs.glusterfs ];
+
+  };
+}

From 6251b314e796505ceedc964dd981de34ca4212e0 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Fri, 3 Feb 2017 01:00:05 +0200
Subject: [PATCH 335/899] zathura-pdf-mupdf: 0.3.0 -> 0.3.2

(version compatible with mupdf 1.10a)
---
 pkgs/applications/misc/zathura/pdf-mupdf/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
index a78c94173e4..23a654b4d51 100644
--- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
@@ -2,24 +2,18 @@
 , libjpeg, jbig2dec, openjpeg, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  version = "0.3.0";
+  version = "0.3.1";
   name = "zathura-pdf-mupdf-${version}";
 
   src = fetchurl {
     url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/${name}.tar.gz";
-    sha256 = "1j3j3wbp49walb19f0966qsnlqbd26wnsjpcxfbf021dav8vk327";
+    sha256 = "06zqn8z6a0hfsx3s1kzqvqzb73afgcl6z5r062sxv7kv570fvffr";
   };
 
   buildInputs = [ pkgconfig zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg ];
 
   makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ];
 
-  patches = [(fetchpatch {
-    name = "mupdf-1.9.patch";
-    url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/mupdf-1.9.patch?h=packages/zathura-pdf-mupdf&id=385ad96261b7297fdebbee6f4b22ec20dda8d65e";
-    sha256 = "185wgg0z4b0z5aybcnnyvbs50h43imn5xz3nqmya4rk4v5bwy49y";
-  })];
-
   meta = with lib; {
     homepage = http://pwmt.org/projects/zathura/;
     description = "A zathura PDF plugin (mupdf)";

From 3acd52d91721014464c32b5497c0f1d1bac43147 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sun, 29 Jan 2017 22:05:55 -0800
Subject: [PATCH 336/899] mgba: 0.5.1 -> 0.5.2

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

diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix
index 7724d3d8d1b..e4e84220812 100644
--- a/pkgs/misc/emulators/mgba/default.nix
+++ b/pkgs/misc/emulators/mgba/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "mgba-${version}";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "mgba-emu";
     repo = "mgba";
     rev = version;
-    sha256 = "1ysxyy888qdwjbgsh3xdzsx8f3a5yd1gqx54xvndpv9v3zqgr2jf";
+    sha256 = "1cpxiwzbywnjs3lrqa3bc9bj68plypx0br3lssd6p68c4wh01fyp";
   };
 
   nativeBuildInputs = [ pkgconfig cmake ];

From 6b44f3523a2598b1303e0f7b26e4439b79d00380 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Tue, 31 Jan 2017 23:11:03 -0800
Subject: [PATCH 337/899] doomseeker: fix invalid substitution via sed

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

diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix
index 33adacefb9d..a8d35680dbd 100644
--- a/pkgs/applications/misc/doomseeker/default.nix
+++ b/pkgs/applications/misc/doomseeker/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   patchPhase = ''
-    sed -e 's#/usr/share/applications#$out/share/applications#' -i src/core/CMakeLists.txt
+    substituteInPlace src/core/CMakeLists.txt --replace /usr/share/applications "$out"/share/applications
   '';
 
   meta = {

From d62d26251d5f5369cb35e07459934fcdaf451e29 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sun, 29 Jan 2017 23:36:01 -0800
Subject: [PATCH 338/899] SDL2: 2.0.4 -> 2.0.5

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

diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index c25b0642637..5d818cb315c 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -24,11 +24,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "SDL2-${version}";
-  version = "2.0.4";
+  version = "2.0.5";
 
   src = fetchurl {
     url = "http://www.libsdl.org/release/${name}.tar.gz";
-    sha256 = "0jqp46mxxbh9lhpx1ih6sp93k752j2smhpc0ad0q4cb3px0famfs";
+    sha256 = "11c75qj1qxmx67iwkvf9z4x69phk301pdn86zzr6jncnap7kh824";
   };
 
   outputs = [ "out" "dev" ];

From 45f51f05b817777a30881801fcd133d16d4cb09d Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sun, 29 Jan 2017 23:46:27 -0800
Subject: [PATCH 339/899] dhewm3: 20130113 -> 1.4.1

---
 pkgs/games/dhewm3/default.nix | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix
index e3efd84f0fb..4bae8e1d58a 100644
--- a/pkgs/games/dhewm3/default.nix
+++ b/pkgs/games/dhewm3/default.nix
@@ -1,33 +1,38 @@
-{stdenv, fetchurl, unzip, cmake, SDL, mesa, zlib, libjpeg, libogg, libvorbis
+{ stdenv, fetchFromGitHub, cmake, SDL2, mesa, zlib, libjpeg, libogg, libvorbis
 , openal, curl }:
 
 stdenv.mkDerivation rec {
-  hash = "92a41322f4aa8bd45395d8088721c9a2bf43c79b";
-  name = "dhewm3-20130113-${hash}";
-  src = fetchurl {
-    url = "https://github.com/dhewm/dhewm3/zipball/${hash}";
-    sha256 = "0c17k60xhimpqi1xi9s1l7jbc97pqjnk4lgwyjb0agc3dkr73zwd";
+  name = "dhewm3-${version}";
+  version = "1.4.1";
+
+  src = fetchFromGitHub {
+    owner = "dhewm";
+    repo = "dhewm3";
+    rev = version;
+    sha256 = "1s64xr1ir4d2z01fhldy577b0x80nd1k6my7y1hxp57lggr8dy5y";
   };
 
   # Add mesa linking
   patchPhase = ''
-    sed -i 's/\<idlib\()\?\)$/idlib GL\1/' CMakeLists.txt
+    sed -i 's/\<idlib\()\?\)$/idlib GL\1/' neo/CMakeLists.txt
   '';
 
-  unpackPhase = ''
-    unzip ${src}
-    cd */neo
+  preConfigure = ''
+    cd "$(ls -d dhewm3-*.src)"/neo
   '';
 
-  buildInputs = [ unzip cmake SDL mesa zlib libjpeg libogg libvorbis openal
-    curl ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ SDL2 mesa zlib libjpeg libogg libvorbis openal curl ];
 
   enableParallelBuilding = true;
 
-  meta = {
+  hardeningDisable = [ "format" ];
+
+  meta = with stdenv.lib; {
     homepage = https://github.com/dhewm/dhewm3;
     description = "Doom 3 port to SDL";
     license = stdenv.lib.licenses.gpl3;
+    maintainers = with maintainers; [ MP2E ];
+    platforms = with platforms; linux;
   };
-
 }

From a430acb4d8cdac5fa2be658bc319e347fcc3f3d1 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Mon, 30 Jan 2017 00:22:50 -0800
Subject: [PATCH 340/899] urbanterror: 4.2.023 -> 4.3.1

---
 pkgs/games/urbanterror/default.nix | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix
index 9224d5872c2..50b127fa9dc 100644
--- a/pkgs/games/urbanterror/default.nix
+++ b/pkgs/games/urbanterror/default.nix
@@ -1,25 +1,30 @@
 { stdenv, fetchurl, unzip, SDL, mesa, openal, curl, libXxf86vm }:
+
 stdenv.mkDerivation rec {
   name = "urbanterror-${version}";
-  version = "4.2.023";
+  version = "4.3.1";
+
   srcs =
     [ (fetchurl {
-         url = "http://mirror.urtstats.net/urbanterror/UrbanTerror42_full023.zip";
-         sha256 = "e287e2a17432b81551f5c16e431d752484ce9be10508e756542f653757a29090";
+         url = "http://cdn.fs1.urbanterror.info/urt/43/releases/zips/UrbanTerror431_full.zip";
+         sha256 = "1dfnyb2grf2fxxphwj7p2ff721j2l0gwrj76jzympr32sim5a6cw";
        })
       (fetchurl {
-         url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.2.023.tar.gz";
-         sha256 = "03zrrx5b96c1srf2p24ca7zygq84byvrmcgh42d8bh5ds579ziqp";
+         url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.3.1.zip";
+         sha256 = "1rbiqa1ki73649np3af96cilavkgv66a0b6p0a5x26cxvpgg128k";
        })
     ];
-  buildInputs = [ unzip SDL mesa openal curl libXxf86vm];
-  sourceRoot = "ioq3-for-UrbanTerror-4-release-4.2.023";
+
+  buildInputs = [ unzip SDL mesa openal curl libXxf86vm ];
+  sourceRoot = "ioq3-for-UrbanTerror-4-release-4.3.1";
+
   configurePhase = ''
     echo "USE_OPENAL = 1" > Makefile.local
     echo "USE_OPENAL_DLOPEN = 0" >> Makefile.local
     echo "USE_CURL = 1" >> Makefile.local
     echo "USE_CURL_DLOPEN = 0" >> Makefile.local
   '';
+
   installPhase = ''
     destDir="$out/opt/urbanterror"
     mkdir -p "$destDir"
@@ -28,7 +33,7 @@ stdenv.mkDerivation rec {
           "$destDir/Quake3-UrT"
     cp -v build/release-linux-*/Quake3-UrT-Ded.* \
           "$destDir/Quake3-UrT-Ded"
-    cp -rv ../UrbanTerror42/q3ut4 "$destDir"
+    cp -rv ../UrbanTerror43/q3ut4 "$destDir"
     cat << EOF > "$out/bin/urbanterror"
     #! ${stdenv.shell}
     cd "$destDir"
@@ -42,11 +47,15 @@ stdenv.mkDerivation rec {
     EOF
     chmod +x "$out/bin/urbanterror-ded"
   '';
+
   postFixup = ''
     p=$out/opt/urbanterror/Quake3-UrT
     cur_rpath=$(patchelf --print-rpath $p)
     patchelf --set-rpath $cur_rpath:${mesa}/lib $p
   '';
+
+  hardeningDisable = [ "format" ];
+
   meta = with stdenv.lib; {
     description = "A multiplayer tactical FPS on top of Quake 3 engine";
     longDescription = ''

From ef77fba573f97e0e85df67dfb5b27e2caaef8f4a Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Mon, 30 Jan 2017 00:38:13 -0800
Subject: [PATCH 341/899] gzdoom: 2.2.0 -> 2.3.2

---
 pkgs/games/gzdoom/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix
index 9e6cc48b435..b485c806352 100644
--- a/pkgs/games/gzdoom/default.nix
+++ b/pkgs/games/gzdoom/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchFromGitHub, cmake, zdoom
+{ stdenv, fetchFromGitHub, cmake, zdoom, makeWrapper
 , openal, fluidsynth, soundfont-fluid, mesa_noglu, SDL2
 , bzip2, zlib, libjpeg, libsndfile, mpg123, game-music-emu }:
 
 stdenv.mkDerivation rec {
   name = "gzdoom-${version}";
-  version = "2.2.0";
+  version = "2.3.2";
 
   src = fetchFromGitHub {
     owner = "coelckers";
     repo = "gzdoom";
     rev = "g${version}";
-    sha256 = "0xxgd8fa29pcdir1xah5cvx41bfy76p4dydpp13mf44p9pr29hrb";
+    sha256 = "1ys7wl4ygvm2lm49qjpql6c5i8gydmbg4f436bcpkywf5srr6xrd";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake makeWrapper ];
   buildInputs = [
     SDL2 mesa_noglu openal fluidsynth bzip2 zlib libjpeg libsndfile mpg123
     game-music-emu
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       install -Dm644 "$i" "$out/lib/gzdoom/$i"
     done
     mkdir $out/bin
-    ln -s $out/lib/gzdoom/gzdoom $out/bin/gzdoom
+    makeWrapper $out/lib/gzdoom/gzdoom $out/bin/gzdoom
   '';
 
   meta = with stdenv.lib; {

From 9fcb9035df0de0f355175462b76f27de948c98a4 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Mon, 30 Jan 2017 01:37:48 -0800
Subject: [PATCH 342/899] pulseaudio: 9.0 -> 10.0

dropped json_c as a dependency as it is no longer needed! patches
are still needed for the caps fix and proper testing for TLS
---
 pkgs/servers/pulseaudio/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 09be8c7c587..680c9dfcb60 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, fetchpatch, pkgconfig, intltool, autoreconfHook
-, json_c, libsndfile, libtool
+, libsndfile, libtool
 , xorg, libcap, alsaLib, glib
 , avahi, libjack2, libasyncns, lirc, dbus
 , sbc, bluez5, udev, openssl, fftwFloat
@@ -36,11 +36,11 @@
 
 stdenv.mkDerivation rec {
   name = "${if libOnly then "lib" else ""}pulseaudio-${version}";
-  version = "9.0";
+  version = "10.0";
 
   src = fetchurl {
     url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz";
-    sha256 = "11j682g2mn723sz3bh4i44ggq29z053zcggy0glzn63zh9mxdly3";
+    sha256 = "0mrg8qvpwm4ifarzphl3749p7p050kdx1l6mvsaj03czvqj6h653";
   };
 
   patches = [ ./caps-fix.patch ]
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     lib.optionals stdenv.isLinux [ libcap ];
 
   buildInputs =
-    [ json_c libsndfile speexdsp fftwFloat ]
+    [ libsndfile speexdsp fftwFloat ]
     ++ lib.optionals stdenv.isLinux [ glib dbus ]
     ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit Cocoa ]
     ++ lib.optionals (!libOnly) (

From 55e85a162ae5fba5b68ad69746969408d68b88c0 Mon Sep 17 00:00:00 2001
From: Benjamin Smith <polynomial@gmail.com>
Date: Thu, 2 Feb 2017 15:11:47 -0800
Subject: [PATCH 343/899] opera: 41.0.2353.56 -> 42.0.2393.517

---
 pkgs/applications/networking/browsers/opera/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index 0edd982f0f7..7e9d4cd50b4 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -14,6 +14,7 @@
 , gnome2
 , gtk2
 , libX11
+, libxcb
 , libXScrnSaver
 , libXcomposite
 , libXcursor
@@ -36,7 +37,7 @@
 let
 
   mirror = https://get.geo.opera.com/pub/opera/desktop;
-  version = "41.0.2353.56";
+  version = "42.0.2393.517";
 
   rpath = stdenv.lib.makeLibraryPath [
 
@@ -66,6 +67,7 @@ let
     libXrandr.out
     libXrender.out
     libXtst.out
+    libxcb.out
     libnotify.out
     nspr.out
     nss.out
@@ -89,12 +91,12 @@ in stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "${mirror}/${version}/linux/opera-stable_${version}_i386.deb";
-        sha256 = "0qjkhadlpn5c20wm66hm7rn12kdk4bh2plfgpfkzp85jmsjdxri5";
+        sha256 = "1zdhg6lrnpn8f4rdibnagj3ps3i8s9ygm4dpj5h605rqk24xxpvs";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
-        sha256 = "1f3slbydxkk15banjbm7d8602l3vxy834ijsdqpyj0ckc5mw0g9y";
+        sha256 = "04yklvxprl7kcnl43fmvk1qfj5ifvivj715n26ylzcf29pvcy1mp";
       }
     else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
 

From 201a0fe403395de4dcceac0c9bececc0d38ed3a5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 3 Feb 2017 09:54:07 +0100
Subject: [PATCH 344/899] pythonPackages.ansible_2_1: use jinja2 2.8.1

---
 pkgs/development/python-modules/ansible/2.1.nix | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/ansible/2.1.nix b/pkgs/development/python-modules/ansible/2.1.nix
index 8d7598a90c9..5af0837387d 100644
--- a/pkgs/development/python-modules/ansible/2.1.nix
+++ b/pkgs/development/python-modules/ansible/2.1.nix
@@ -13,7 +13,18 @@
 , pywinrm
 }:
 
-buildPythonPackage rec {
+let
+  jinja = jinja2.override rec {
+    pname = "Jinja2";
+    version = "2.8.1";
+    name = "${pname}-${version}";
+    src = fetchurl {
+      url = "mirror://pypi/J/Jinja2/${name}.tar.gz";
+      sha256 = "35341f3a97b46327b3ef1eb624aadea87a535b8f50863036e085e7c426ac5891";
+    };
+  };
+
+in buildPythonPackage rec {
   pname = "ansible";
   version = "2.1.4.0";
   name = "${pname}-${version}";
@@ -34,7 +45,7 @@ buildPythonPackage rec {
   dontPatchShebangs = false;
   windowsSupport = true;
 
-  propagatedBuildInputs = [ pycrypto paramiko jinja2 pyyaml httplib2
+  propagatedBuildInputs = [ pycrypto paramiko jinja pyyaml httplib2
     boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm;
 
   meta = {
@@ -47,4 +58,4 @@ buildPythonPackage rec {
     ];
     platforms = with lib.platforms; linux ++ darwin;
   };
-}
\ No newline at end of file
+}

From 8b3db9a0dd4ebfe693083a764d3c0812abf448a3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 3 Feb 2017 09:54:12 +0100
Subject: [PATCH 345/899] pythonPackages.ansible_2_2: use jinja2 2.8.1

---
 .../development/python-modules/ansible/2.2.nix | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/ansible/2.2.nix b/pkgs/development/python-modules/ansible/2.2.nix
index 22af2c01265..48a325fec33 100644
--- a/pkgs/development/python-modules/ansible/2.2.nix
+++ b/pkgs/development/python-modules/ansible/2.2.nix
@@ -13,7 +13,19 @@
 , pywinrm
 }:
 
-buildPythonPackage rec {
+let
+  # Shouldn't be needed anymore in next version
+  # https://github.com/NixOS/nixpkgs/pull/22345#commitcomment-20718521
+  jinja = (jinja2.override rec {
+    pname = "Jinja2";
+    version = "2.8.1";
+    name = "${pname}-${version}";
+    src = fetchurl {
+      url = "mirror://pypi/J/Jinja2/${name}.tar.gz";
+      sha256 = "35341f3a97b46327b3ef1eb624aadea87a535b8f50863036e085e7c426ac5891";
+    };
+  });
+in buildPythonPackage rec {
   pname = "ansible";
   version = "2.2.1.0";
   name = "${pname}-${version}";
@@ -34,7 +46,7 @@ buildPythonPackage rec {
   dontPatchShebangs = false;
   windowsSupport = true;
 
-  propagatedBuildInputs = [ pycrypto paramiko jinja2 pyyaml httplib2
+  propagatedBuildInputs = [ pycrypto paramiko jinja pyyaml httplib2
     boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm;
 
   meta = {
@@ -47,4 +59,4 @@ buildPythonPackage rec {
     ];
     platforms = with lib.platforms; linux ++ darwin;
   };
-}
\ No newline at end of file
+}

From 1652a136e48825023b2a7e3989d7dfabba6ef4d2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 3 Feb 2017 10:04:35 +0100
Subject: [PATCH 346/899] pythonPackages.cytoolz: disable failing test

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1880471bb58..477914e3836 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4422,8 +4422,9 @@ in {
     buildInputs = with self; [ nose ];
     propagatedBuildInputs = with self; [ toolz ];
 
+    # Disable failing test https://github.com/pytoolz/cytoolz/issues/97
     checkPhase = ''
-      nosetests -v $out/${python.sitePackages}
+      NOSE_EXCLUDE=test_curried_exceptions nosetests -v $out/${python.sitePackages}
     '';
 
     meta = {

From 0772e27bfd1ab3da5ab8199f27ce5a9c9fe83db0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 3 Feb 2017 10:06:49 +0100
Subject: [PATCH 347/899] haskell.lib.buildStackProject: fix #22386

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

diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix
index cf1e189a38d..1a16cf3683f 100644
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/pkgs/development/haskell-modules/generic-stack-builder.nix
@@ -1,4 +1,4 @@
-{ stdenv, ghc, pkgconfig, glibcLocales }:
+{ stdenv, ghc, pkgconfig, glibcLocales, cacert }:
 
 with stdenv.lib;
 

From 5b759293e09a062373d4b2843c5bad89d5a47165 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 3 Feb 2017 03:15:56 +0300
Subject: [PATCH 348/899] modules lib: type description in type error message

---
 lib/modules.nix      | 2 +-
 lib/tests/modules.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index 256d49ba27d..4eee41306cd 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -326,7 +326,7 @@ rec {
     # Type-check the remaining definitions, and merge them.
     mergedValue = foldl' (res: def:
       if type.check def.value then res
-      else throw "The option value `${showOption loc}' in `${def.file}' is not a ${type.name}.")
+      else throw "The option value `${showOption loc}' in `${def.file}' is not a ${type.description}.")
       (type.merge loc defsFinal) defsFinal;
 
     isDefined = defsFinal != [];
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index e0774383720..8b476a5d3dc 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -118,7 +118,7 @@ checkConfigOutput "true" "$@" ./define-module-check.nix
 # Check coerced value.
 checkConfigOutput "\"42\"" config.value ./declare-coerced-value.nix
 checkConfigOutput "\"24\"" config.value ./declare-coerced-value.nix ./define-value-string.nix
-checkConfigError 'The option value .* in .* is not a coercedTo.' config.value ./declare-coerced-value.nix ./define-value-list.nix
+checkConfigError 'The option value .* in .* is not a string or integer.' config.value ./declare-coerced-value.nix ./define-value-list.nix
 
 cat <<EOF
 ====== module tests ======

From e7c968fbf2edd32bb1d009207f873017e4bf5287 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 3 Feb 2017 12:37:40 +0100
Subject: [PATCH 349/899] linuxPackages*.perf: fix build with default gcc

Broken since 9842a107.
---
 pkgs/os-specific/linux/kernel/perf.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index 76f2662f21b..0bfd8dfe700 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -32,8 +32,11 @@ stdenv.mkDerivation {
   # bad `ld' and other stuff.
   NIX_CFLAGS_COMPILE = [
     "-Wno-error=cpp" "-Wno-error=bool-compare" "-Wno-error=deprecated-declarations"
-    "-Wno-error=unused-const-variable" "-Wno-error=misleading-indentation"
-  ];
+  ]
+    # gcc before 6 doesn't know these options
+    ++ stdenv.lib.optionals (hasPrefix "gcc-6" stdenv.cc.cc) [
+      "-Wno-error=unused-const-variable" "-Wno-error=misleading-indentation"
+    ];
 
   installFlags = "install install-man ASCIIDOC8=1";
 

From 9eb540b807b0bb598352e550635c45c8a92d72b0 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 3 Feb 2017 15:00:34 +0300
Subject: [PATCH 350/899] qemu-vm module: fix boot.tmpOnTmpfs

This option caused systemd to mount /tmp on top of /tmp/{xchg,shared}.

Fixes #21490.
---
 nixos/modules/virtualisation/qemu-vm.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 586f5d9c0a3..e0b3bb2c683 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -443,6 +443,13 @@ in
             options = [ "trans=virtio" "version=9p2000.L" "veryloose" ];
             neededForBoot = true;
           };
+        "/tmp" = mkIf config.boot.tmpOnTmpfs
+          { device = "tmpfs";
+            fsType = "tmpfs";
+            neededForBoot = true;
+            # Sync with systemd's tmp.mount;
+            options = [ "mode=1777" "strictatime" "nosuid" "nodev" ];
+          };
         "/tmp/xchg" =
           { device = "xchg";
             fsType = "9p";

From fd005d0d7283dd62c69598c6bb7969b69ac9ebb8 Mon Sep 17 00:00:00 2001
From: Josef Kemetmueller <josef.kemetmueller@aon.at>
Date: Thu, 2 Feb 2017 20:47:01 +0100
Subject: [PATCH 351/899] catch: use upstream install target

---
 pkgs/development/libraries/catch/default.nix | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix
index 9a3b9d8e8aa..021512a40e7 100644
--- a/pkgs/development/libraries/catch/default.nix
+++ b/pkgs/development/libraries/catch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, cmake, fetchFromGitHub }:
+{ stdenv, cmake, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
 
@@ -13,25 +13,16 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ cmake ];
-  dontUseCmakeConfigure = true;
+  cmakeFlags = [ "-DUSE_CPP14=ON" ];
 
-  buildPhase = ''
-    cmake . -BBuild -DCMAKE_BUILD_TYPE=Release -DUSE_CPP11=ON
-    cd Build
-    make
-    cd ..
-  '';
-
-  installPhase = ''
-    mkdir -p $out
-    mv include $out/.
-  '';
+  doCheck = true;
+  checkTarget = "test";
 
   meta = with stdenv.lib; {
     description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)";
     homepage = "http://catch-lib.net";
     license = licenses.boost;
-    maintainers = with maintainers; [ edwtjo ];
+    maintainers = with maintainers; [ edwtjo knedlsepp ];
     platforms = with platforms; unix;
   };
 }

From 4101f1fd18c1414ad3bbf198a038818906fa1e2f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 3 Feb 2017 13:07:07 +0100
Subject: [PATCH 352/899] iptables: 1.6.0 -> 1.6.1

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

diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix
index bbc63d31a13..ee1d21ddf2b 100644
--- a/pkgs/os-specific/linux/iptables/default.nix
+++ b/pkgs/os-specific/linux/iptables/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, bison, flex
+{ stdenv, fetchurl, bison, flex, pkgconfig
 , libnetfilter_conntrack, libnftnl, libmnl }:
 
 stdenv.mkDerivation rec {
   name = "iptables-${version}";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchurl {
     url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2";
-    sha256 = "0q0w1x4aijid8wj7dg1ny9fqwll483f1sqw7kvkskd8q1c52mdsb";
+    sha256 = "1x8c9y340x79djsq54bc1674ryv59jfphrk4f88i7qbvbnyxghhg";
   };
 
-  nativeBuildInputs = [ bison flex ];
+  nativeBuildInputs = [ bison flex pkgconfig ];
 
   buildInputs = [ libnetfilter_conntrack libnftnl libmnl ];
 

From d6710e3d66c09c0a7485b2079d6e0d01c14faf07 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 3 Feb 2017 13:07:38 +0100
Subject: [PATCH 353/899] shadow: 4.2.1 -> 4.4

---
 pkgs/os-specific/linux/shadow/default.nix | 25 ++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index e99d7d86bfb..8c91dc43666 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, pam ? null, glibcCross ? null }:
+{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, libxslt, libxml2
+, docbook_xml_dtd_412, docbook_xsl, gnome_doc_utils, flex, bison
+, pam ? null, glibcCross ? null }:
 
 let
 
@@ -15,14 +17,20 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "shadow-4.2.1";
+  name = "shadow-${version}";
+  version = "4.4";
 
-  src = fetchurl {
-    url = "http://pkg-shadow.alioth.debian.org/releases/${name}.tar.xz";
-    sha256 = "0h9x1zdbq0pqmygmc1x459jraiqw4gqz8849v268crk78z8r621v";
+  src = fetchFromGitHub {
+    owner = "shadow-maint";
+    repo = "shadow";
+    rev = "${version}";
+    sha256 = "005qk3n86chc8mlg86qhrns2kpl52n5f3las3m5s6266xij3qwka";
   };
 
   buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam;
+  nativeBuildInputs = [autoreconfHook libxslt libxml2 
+    docbook_xml_dtd_412 docbook_xsl gnome_doc_utils flex bison
+    ];
 
   patches = [ ./keep-path.patch dots_in_usernames ];
 
@@ -33,8 +41,15 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     export ac_cv_func_setpgrp_void=yes
     export shadow_cv_logdir=/var/log
+    (
+    head -n -1 "${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml" 
+    tail -n +3 "${docbook_xsl}/share/xml/docbook-xsl/catalog.xml"
+    ) > xmlcatalog
+    configureFlags="$configureFlags --with-xml-catalog=$PWD/xmlcatalog ";
   '';
 
+  configureFlags = " --enable-man ";
+
   preBuild = assert glibc != null;
     ''
       substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc.bin}/bin/nscd

From 426dddd83dc5e4fdaf7dfeb11885cea33046ba29 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 3 Feb 2017 13:08:00 +0100
Subject: [PATCH 354/899] harfbuzz: 1.4.1 -> 1.4.2

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

diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index ec9b4510168..43861e9e195 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "1.4.1";
+  version = "1.4.2";
   inherit (stdenv.lib) optional optionals optionalString;
 in
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
-    sha256 = "85a27fab639a1d651737dcb6b69e4101e3fd09522fdfdcb793df810b5cb315bd";
+    sha256 = "1cxpkhrjd20fwfysyxmi9rjvvggxlbzlyrs39p1dw3q0mg7ls8wg";
   };
 
   outputs = [ "out" "dev" ];

From ae5a27983698efb89f0b176b82d55785d3522492 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 3 Feb 2017 13:08:14 +0100
Subject: [PATCH 355/899] libmwaw: 0.3.9 -> 0.3.10

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

diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix
index a52e25e7cf2..b833945d511 100644
--- a/pkgs/development/libraries/libmwaw/default.nix
+++ b/pkgs/development/libraries/libmwaw/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="libmwaw";
-    version="0.3.9";
+    version="0.3.10";
     name="${baseName}-${version}";
-    hash="185jnp7b7s550xpz3bhaii275qw5yd3j29zijkd2rr8h2p9s9z7p";
-    url="https://heanet.dl.sourceforge.net/project/libmwaw/libmwaw/libmwaw-0.3.9/libmwaw-0.3.9.tar.xz";
-    sha256="185jnp7b7s550xpz3bhaii275qw5yd3j29zijkd2rr8h2p9s9z7p";
+    hash="087j6kx03ggvqwpl944nnf75qkvi9bag8b0z59phg66gbz0s0imj";
+    url="https://netcologne.dl.sourceforge.net/project/libmwaw/libmwaw/libmwaw-0.3.10/libmwaw-0.3.10.tar.xz";
+    sha256="087j6kx03ggvqwpl944nnf75qkvi9bag8b0z59phg66gbz0s0imj";
   };
   buildInputs = [
     boost pkgconfig cppunit zlib libwpg libwpd librevenge

From c20f5102eb908260b41a5576ac145e99bdade88e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 3 Feb 2017 13:08:45 +0100
Subject: [PATCH 356/899] generate-libreoffice-srcs: support jars as well as
 tarballs

---
 .../office/libreoffice/generate-libreoffice-srcs.py             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py
index 3d56c74e3ab..f77829da340 100755
--- a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py
+++ b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py
@@ -293,7 +293,7 @@ def interpret_tarball_with_md5(x):
                'md5': '48d647fbd8ef8889e5a7f422c1bfda94', 'brief': False}}
     """
 
-    match = {'key': re.match('^(.*)_TARBALL$', x['key']),
+    match = {'key': re.match('^(.*)_(TARBALL|JAR)$', x['key']),
              'value': re.match('(?P<md5>[0-9a-fA-F]{32})-(?P<tarball>.+)$',
                                x['value'])}
 

From 14ed123a40a58f6a1a9564d0b0bfa0139765cd88 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 3 Feb 2017 13:09:08 +0100
Subject: [PATCH 357/899] libreoffice-srcs-additions.json: some files are in
 /extern/

---
 .../office/libreoffice/libreoffice-srcs-additions.json        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.json b/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.json
index 75d4cced92a..5b4363189f7 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.json
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.json
@@ -1,3 +1,5 @@
 {
-  "LIBGLTF": {"subdir": "libgltf/"}
+  "LIBGLTF": {"subdir": "libgltf/"},
+  "ODFVALIDATOR": {"subdir": "../extern/"},
+  "OFFICEOTRON": {"subdir": "../extern/"}
 }

From 58711ecf0c9baedbefc7138d1bc1e56c9e536eaf Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 3 Feb 2017 13:10:35 +0100
Subject: [PATCH 358/899] libreoffice-still: 5.1.6.2 -> 5.2.5.1 (branch switch
 upstream)

---
 .../libreoffice/libreoffice-srcs-still.nix    | 231 +++++++++---------
 .../office/libreoffice/still-primary-src.nix  |   8 +-
 .../applications/office/libreoffice/still.nix |  30 ++-
 pkgs/top-level/all-packages.nix               |   1 -
 4 files changed, 137 insertions(+), 133 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
index 3d2514f8414..8bfb54fef55 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
@@ -28,18 +28,25 @@
     md5name = "71a11d037240b292f824ba1eb537b4e3-apr-util-1.5.3.tar.gz";
   }
   {
-    name = "boost_1_59_0.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/boost_1_59_0.tar.bz2";
-    sha256 = "727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca";
-    md5 = "6aa9a5c6a4ca1016edd0ed1178e3cb87";
-    md5name = "6aa9a5c6a4ca1016edd0ed1178e3cb87-boost_1_59_0.tar.bz2";
+    name = "boost_1_60_0.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/boost_1_60_0.tar.bz2";
+    sha256 = "686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b";
+    md5 = "65a840e1a0b13a558ff19eeb2c4f0cbe";
+    md5name = "65a840e1a0b13a558ff19eeb2c4f0cbe-boost_1_60_0.tar.bz2";
   }
   {
-    name = "bsh-2.0b5-src.zip";
-    url = "http://dev-www.libreoffice.org/src/ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip";
-    sha256 = "90993aa17a786996653fc5fcf148e879fb3689b8678f9ba99b376a5a13dff513";
-    md5 = "ec1941a74d3ef513c4ce57a9092b74e1";
-    md5name = "ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip";
+    name = "breakpad.zip";
+    url = "http://dev-www.libreoffice.org/src/breakpad.zip";
+    sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9";
+    md5 = "415ce291aa6f2ee1d5db7b62bf62ade8";
+    md5name = "415ce291aa6f2ee1d5db7b62bf62ade8-breakpad.zip";
+  }
+  {
+    name = "bsh-2.0b6-src.zip";
+    url = "http://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip";
+    sha256 = "9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e622235e01c96";
+    md5 = "beeca87be45ec87d241ddd0e1bad80c1";
+    md5name = "beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip";
   }
   {
     name = "bzip2-1.0.6.tar.gz";
@@ -70,11 +77,11 @@
     md5name = "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz";
   }
   {
-    name = "libcmis-0.5.0.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz";
-    sha256 = "a87e02913dee3ee659db5abf6d7dafcfcd85dd4b24bf4389d8d4afe8c8dcf9b6";
-    md5 = "5821b806a98e6c38370970e682ce76e8";
-    md5name = "5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz";
+    name = "libcmis-0.5.1.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz";
+    sha256 = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e";
+    md5 = "3270154f0f40d86fce849b161f914101";
+    md5name = "3270154f0f40d86fce849b161f914101-libcmis-0.5.1.tar.gz";
   }
   {
     name = "CoinMP-1.7.6.tgz";
@@ -105,11 +112,11 @@
     md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
   }
   {
-    name = "curl-7.43.0.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/curl-7.43.0.tar.bz2";
-    sha256 = "baa654a1122530483ccc1c58cc112fec3724a82c11c6a389f1e6a37dc8858df9";
-    md5 = "11bddbb452a8b766b932f859aaeeed39";
-    md5name = "11bddbb452a8b766b932f859aaeeed39-curl-7.43.0.tar.bz2";
+    name = "curl-7.51.0.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/curl-7.51.0.tar.gz";
+    sha256 = "65b5216a6fbfa72f547eb7706ca5902d7400db9868269017a8888aa91d87977c";
+    md5 = "490e19a8ccd1f4a244b50338a0eb9456";
+    md5name = "490e19a8ccd1f4a244b50338a0eb9456-curl-7.51.0.tar.gz";
   }
   {
     name = "libe-book-0.1.2.tar.bz2";
@@ -133,18 +140,18 @@
     md5name = "77ff46936dcc83670557274e7dd2aa33-libetonyek-0.1.6.tar.bz2";
   }
   {
-    name = "expat-2.1.1.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/expat-2.1.1.tar.bz2";
-    sha256 = "aff584e5a2f759dcfc6d48671e9529f6afe1e30b0cd6a4cec200cbe3f793de67";
-    md5 = "7380a64a8e3a9d66a9887b01d0d7ea81";
-    md5name = "7380a64a8e3a9d66a9887b01d0d7ea81-expat-2.1.1.tar.bz2";
+    name = "expat-2.2.0.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/expat-2.2.0.tar.bz2";
+    sha256 = "d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff";
+    md5 = "2f47841c829facb346eb6e3fab5212e2";
+    md5name = "2f47841c829facb346eb6e3fab5212e2-expat-2.2.0.tar.bz2";
   }
   {
-    name = "Firebird-2.5.4.26856-0.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/Firebird-2.5.4.26856-0.tar.bz2";
-    sha256 = "4e775dcf218640d3af507a816aef0060f52a295b9ee5f66ec66f0b0564da18d3";
-    md5 = "7a17ec9889424b98baa29e001a054434";
-    md5name = "7a17ec9889424b98baa29e001a054434-Firebird-2.5.4.26856-0.tar.bz2";
+    name = "Firebird-2.5.5.26952-0.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/Firebird-2.5.5.26952-0.tar.bz2";
+    sha256 = "b33e63ede88184d9ef2ae6760537ab75bfe641513821410b83e837946162b7d1";
+    md5 = "b0b5293991fcf07347b38431c80be1d4";
+    md5name = "b0b5293991fcf07347b38431c80be1d4-Firebird-2.5.5.26952-0.tar.bz2";
   }
   {
     name = "fontconfig-2.8.0.tar.gz";
@@ -217,11 +224,11 @@
     md5name = "c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz";
   }
   {
-    name = "source-code-font-1.009.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz";
-    sha256 = "9b295127164c81bcf28c7ebb687f1555b71796108b443a04d40202b7364e4cce";
-    md5 = "0279a21fab6f245e85a6f85fea54f511";
-    md5name = "0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz";
+    name = "source-code-pro-2.030R-ro-1.050R-it.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz";
+    sha256 = "09466dce87653333f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f";
+    md5 = "907d6e99f241876695c19ff3db0b8923";
+    md5name = "907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz";
   }
   {
     name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz";
@@ -266,18 +273,18 @@
     md5name = "5d303fb955beb9bf112267316ca9d021-glyphy-0.2.0.tar.bz2";
   }
   {
-    name = "graphite-minimal-1.3.6.tgz";
-    url = "http://dev-www.libreoffice.org/src/17df8301bcc459e83f8a8f3aca6183b2-graphite-minimal-1.3.6.tgz";
-    sha256 = "db27e1a6092b8ea00b5f8eec2a3ea500756fbb769c1023a1afc3386c5918d1b8";
-    md5 = "17df8301bcc459e83f8a8f3aca6183b2";
-    md5name = "17df8301bcc459e83f8a8f3aca6183b2-graphite-minimal-1.3.6.tgz";
+    name = "graphite2-minimal-1.3.8.tgz";
+    url = "http://dev-www.libreoffice.org/src/4311dd9ace498b57c85f611e0670df64-graphite2-minimal-1.3.8.tgz";
+    sha256 = "d16940175822760753e9762d0af9679c9726e64f25955677fe7ab68448601c3b";
+    md5 = "4311dd9ace498b57c85f611e0670df64";
+    md5name = "4311dd9ace498b57c85f611e0670df64-graphite2-minimal-1.3.8.tgz";
   }
   {
-    name = "harfbuzz-0.9.40.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/harfbuzz-0.9.40.tar.bz2";
-    sha256 = "1771d53583be6d91ca961854b2a24fb239ef0545eed221ae3349abae0ab8321f";
-    md5 = "0e27e531f4c4acff601ebff0957755c2";
-    md5name = "0e27e531f4c4acff601ebff0957755c2-harfbuzz-0.9.40.tar.bz2";
+    name = "harfbuzz-1.2.6.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/harfbuzz-1.2.6.tar.bz2";
+    sha256 = "7537bacccb3524df0cd2a4d5bc7e168bcc10e8171e0324f3cd522583868192c1";
+    md5 = "9f4b6831c86135faef011e991f59f77f";
+    md5name = "9f4b6831c86135faef011e991f59f77f-harfbuzz-1.2.6.tar.bz2";
   }
   {
     name = "hsqldb_1_8_0.zip";
@@ -287,11 +294,11 @@
     md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip";
   }
   {
-    name = "hunspell-1.3.3.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/4967da60b23413604c9e563beacc63b4-hunspell-1.3.3.tar.gz";
-    sha256 = "a7b2c0de0e2ce17426821dc1ac8eb115029959b3ada9d80a81739fa19373246c";
-    md5 = "4967da60b23413604c9e563beacc63b4";
-    md5name = "4967da60b23413604c9e563beacc63b4-hunspell-1.3.3.tar.gz";
+    name = "hunspell-1.4.1.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/33d370f7fe5a030985e445a5672b2067-hunspell-1.4.1.tar.gz";
+    sha256 = "c4476aff0ced52eec334eae1e8d3fdaaebdd90f5ecd0b57cf2a92a6fd220d1bb";
+    md5 = "33d370f7fe5a030985e445a5672b2067";
+    md5name = "33d370f7fe5a030985e445a5672b2067-hunspell-1.4.1.tar.gz";
   }
   {
     name = "hyphen-2.8.8.tar.gz";
@@ -301,11 +308,11 @@
     md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz";
   }
   {
-    name = "icu4c-56_1-src.tgz";
-    url = "http://dev-www.libreoffice.org/src/c4a2d71ff56aec5ebfab2a3f059be99d-icu4c-56_1-src.tgz";
-    sha256 = "3a64e9105c734dcf631c0b3ed60404531bce6c0f5a64bfe1a6402a4cc2314816";
-    md5 = "c4a2d71ff56aec5ebfab2a3f059be99d";
-    md5name = "c4a2d71ff56aec5ebfab2a3f059be99d-icu4c-56_1-src.tgz";
+    name = "icu4c-57_1-src.tgz";
+    url = "http://dev-www.libreoffice.org/src/976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz";
+    sha256 = "ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581";
+    md5 = "976734806026a4ef8bdd17937c8898b9";
+    md5name = "976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz";
   }
   {
     name = "flow-engine-0.9.4.zip";
@@ -399,11 +406,11 @@
     md5name = "86b0d5f7507c2e6c21c00219162c3c44-libjpeg-turbo-1.4.2.tar.gz";
   }
   {
-    name = "language-subtag-registry-2016-02-10.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2016-02-10.tar.bz2";
-    sha256 = "1e3a74b39e999bc9ff9fb0dd6fa6a64a0ed6bf7f0775ff3756e7c9e8db45a353";
-    md5 = "d1e7c55a0383f7d720d3ead0b6117284";
-    md5name = "d1e7c55a0383f7d720d3ead0b6117284-language-subtag-registry-2016-02-10.tar.bz2";
+    name = "language-subtag-registry-2016-07-19.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2016-07-19.tar.bz2";
+    sha256 = "e3dc30bdbfdad442c542dc0e165df9d8d2ba06a357cd55957155d8259d1661dc";
+    md5 = "8a037dc60b16bf8c5fe871b33390a4a2";
+    md5name = "8a037dc60b16bf8c5fe871b33390a4a2-language-subtag-registry-2016-07-19.tar.bz2";
   }
   {
     name = "JLanguageTool-1.7.0.tar.bz2";
@@ -455,11 +462,11 @@
     md5name = "aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2";
   }
   {
-    name = "xmlsec1-1.2.14.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz";
-    sha256 = "390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a";
-    md5 = "1f24ab1d39f4a51faf22244c94a6203f";
-    md5name = "1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz";
+    name = "xmlsec1-1.2.20.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz";
+    sha256 = "3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305";
+    md5 = "ce12af00283eb90d9281956524250d6e";
+    md5name = "ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz";
   }
   {
     name = "libxml2-2.9.4.tar.gz";
@@ -469,11 +476,11 @@
     md5name = "ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz";
   }
   {
-    name = "libxslt-1.1.28.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz";
-    sha256 = "5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c";
-    md5 = "9667bf6f9310b957254fdcf6596600b7";
-    md5name = "9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz";
+    name = "libxslt-1.1.29.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz";
+    sha256 = "b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce";
+    md5 = "a129d3c44c022de3b9dcf6d6f288d72e";
+    md5name = "a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz";
   }
   {
     name = "lp_solve_5.5.tar.gz";
@@ -490,11 +497,18 @@
     md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz";
   }
   {
-    name = "mdds_0.12.1.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/mdds_0.12.1.tar.bz2";
-    sha256 = "23565e9d7810a6ac30478833813db847f80e927b414a7be07b7cc03ed3aae83d";
-    md5 = "ef2560ed5416652a7fe195305b14cebe";
-    md5name = "ef2560ed5416652a7fe195305b14cebe-mdds_0.12.1.tar.bz2";
+    name = "mdds-1.2.2.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/mdds-1.2.2.tar.bz2";
+    sha256 = "141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d";
+    md5 = "8855cf852a6088cfdc792c6f7ceb0243";
+    md5name = "8855cf852a6088cfdc792c6f7ceb0243-mdds-1.2.2.tar.bz2";
+  }
+  {
+    name = "mDNSResponder-576.30.4.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/mDNSResponder-576.30.4.tar.gz";
+    sha256 = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0";
+    md5 = "940057ac8b513b00e8e9ca12ef796762";
+    md5name = "940057ac8b513b00e8e9ca12ef796762-mDNSResponder-576.30.4.tar.gz";
   }
   {
     name = "libmspub-0.1.2.tar.bz2";
@@ -532,11 +546,11 @@
     md5name = "231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz";
   }
   {
-    name = "nss-3.22.2-with-nspr-4.12.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/6b254cf2f8cb4b27a3f0b8b7b9966ea7-nss-3.22.2-with-nspr-4.12.tar.gz";
-    sha256 = "7bc7e5483fc90071be5facd3043f94c69b153055a369c8f0b751ad374c5ae09e";
-    md5 = "6b254cf2f8cb4b27a3f0b8b7b9966ea7";
-    md5name = "6b254cf2f8cb4b27a3f0b8b7b9966ea7-nss-3.22.2-with-nspr-4.12.tar.gz";
+    name = "nss-3.27-with-nspr-4.13.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/0e3eee39402386cf16fd7aaa7399ebef-nss-3.27-with-nspr-4.13.tar.gz";
+    sha256 = "c74ad468ed5da0304b58ec56fa627fa388b256451b1a44fd184145c6d8203820";
+    md5 = "0e3eee39402386cf16fd7aaa7399ebef";
+    md5name = "0e3eee39402386cf16fd7aaa7399ebef-nss-3.27-with-nspr-4.13.tar.gz";
   }
   {
     name = "libodfgen-0.1.6.tar.bz2";
@@ -567,11 +581,11 @@
     md5name = "9392e65072ce4b614c1392eefc1f23d0-openssl-1.0.2h.tar.gz";
   }
   {
-    name = "liborcus-0.9.2.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/liborcus-0.9.2.tar.gz";
-    sha256 = "adcf90f6cb1e6546ef1ea11277db39cb875786ea4b283e37f5e37c8c09b4952b";
-    md5 = "e6efcbe50a5fd4d50d513c9a7a4139b0";
-    md5name = "e6efcbe50a5fd4d50d513c9a7a4139b0-liborcus-0.9.2.tar.gz";
+    name = "liborcus-0.11.2.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/liborcus-0.11.2.tar.gz";
+    sha256 = "10afc617fd7600fa02bd4467d2e3c7bd058f84e4d672d558e1db90e82dafd256";
+    md5 = "205badaee72adf99422add8c4c49d669";
+    md5name = "205badaee72adf99422add8c4c49d669-liborcus-0.11.2.tar.gz";
   }
   {
     name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
@@ -581,11 +595,11 @@
     md5name = "593f0aa47bf2efc0efda2d28fae063b2-owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
   }
   {
-    name = "libpagemaker-0.0.2.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.2.tar.bz2";
-    sha256 = "43be46721affcb5a967406c09acfc36c79d2d968917fe36a21cc004230a01e0f";
-    md5 = "795cc7a59ace4db2b12586971d668671";
-    md5name = "795cc7a59ace4db2b12586971d668671-libpagemaker-0.0.2.tar.bz2";
+    name = "libpagemaker-0.0.3.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.3.tar.bz2";
+    sha256 = "3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33";
+    md5 = "5c4985a68be0b79d3f809da5e12b143c";
+    md5name = "5c4985a68be0b79d3f809da5e12b143c-libpagemaker-0.0.3.tar.bz2";
   }
   {
     name = "pixman-0.24.4.tar.bz2";
@@ -595,18 +609,18 @@
     md5name = "c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2";
   }
   {
-    name = "libpng-1.6.24.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/libpng-1.6.24.tar.gz";
-    sha256 = "be46e0d14ccac3800f816ae860d191a1187a40164b7552c44afeee97a9caa0a3";
-    md5 = "65213080dd30a9b16193d9b83adc1ee9";
-    md5name = "65213080dd30a9b16193d9b83adc1ee9-libpng-1.6.24.tar.gz";
+    name = "libpng-1.6.28.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/libpng-1.6.28.tar.gz";
+    sha256 = "b6cec903e74e9fdd7b5bbcde0ab2415dd12f2f9e84d9e4d9ddd2ba26a41623b2";
+    md5 = "897ccec1ebfb0922e83c2bfaa1be8748";
+    md5name = "897ccec1ebfb0922e83c2bfaa1be8748-libpng-1.6.28.tar.gz";
   }
   {
-    name = "poppler-0.26.4.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/poppler-0.26.4.tar.gz";
-    sha256 = "e05a4d8d8252a564ec7a96a99af772042b2d85275ffda8043f427dde31e97fe8";
-    md5 = "35c0660065d023365e9854c13e289d12";
-    md5name = "35c0660065d023365e9854c13e289d12-poppler-0.26.4.tar.gz";
+    name = "poppler-0.46.0.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/poppler-0.46.0.tar.bz2";
+    sha256 = "e3b53c4d1baffb047d4752d68886210fcb279e75cc32c0c61c7165e4d4cf846a";
+    md5 = "38c758d84437378ec4f5aae9f875301d";
+    md5name = "38c758d84437378ec4f5aae9f875301d-poppler-0.46.0.tar.bz2";
   }
   {
     name = "postgresql-9.2.1.tar.bz2";
@@ -685,13 +699,6 @@
     md5 = "0168229624cfac409e766913506961a8";
     md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz";
   }
-  {
-    name = "vigra1.6.0.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz";
-    sha256 = "1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f";
-    md5 = "d62650a6f908e85643e557a236ea989c";
-    md5name = "d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz";
-  }
   {
     name = "libvisio-0.1.5.tar.bz2";
     url = "http://dev-www.libreoffice.org/src/libvisio-0.1.5.tar.bz2";
@@ -714,11 +721,11 @@
     md5name = "dfd066658ec9d2fb2262417039a8a1c3-libwpg-0.3.1.tar.bz2";
   }
   {
-    name = "libwps-0.4.2.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/libwps-0.4.2.tar.bz2";
-    sha256 = "254b8aeb36a3b58eabf682b04a5a6cf9b01267e762c7dc57d4533b95f30dc587";
-    md5 = "8a6c55542ce80203dd6d3b1cba99d4e5";
-    md5name = "8a6c55542ce80203dd6d3b1cba99d4e5-libwps-0.4.2.tar.bz2";
+    name = "libwps-0.4.3.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/libwps-0.4.3.tar.bz2";
+    sha256 = "0c30407865a873ff76b6d5b2d2aa599f6af68936638c81ca8292449324042a6c";
+    md5 = "027fb17fb9e43553aa6624dc18f830ac";
+    md5name = "027fb17fb9e43553aa6624dc18f830ac-libwps-0.4.3.tar.bz2";
   }
   {
     name = "xsltml_2.1.2.zip";
diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix
index 078efa0227d..0fae854f42f 100644
--- a/pkgs/applications/office/libreoffice/still-primary-src.nix
+++ b/pkgs/applications/office/libreoffice/still-primary-src.nix
@@ -2,9 +2,9 @@
 
 rec {
   major = "5";
-  minor = "1";
-  patch = "6";
-  tweak = "2";
+  minor = "2";
+  patch = "5";
+  tweak = "1";
 
   subdir = "${major}.${minor}.${patch}";
 
@@ -12,6 +12,6 @@ rec {
 
   src = fetchurl {
     url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "150xb76pc3889gfy4jrnq8sidymm1aihkm5pzy8b1fdy51zip804";
+    sha256 = "006kn1m5d6c1skgc1scc0gssin922raca2psjv887alplhia6mlp";
   };
 }
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 75d295887f6..f098938ba38 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -42,14 +42,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "0g88dscdmixhv17lzz4k00jrrvmafxzv0bakzf0v9zny2b3hb6r2";
+      sha256 = "0lv3jbnzzkr7nbivsl9jm9b4m9mxvngbmhz6yasblhi0m9ifkxmb";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "1aqdzw4sqwfli9aah7zjir93nc1v5zdrbbgvmbn5wh1kawa8dr5g";
+      sha256 = "1d29ppdkhhy5x8cric0l872x607ng02bnp2gvv5ck3blb759q68i";
     };
 
   };
@@ -58,16 +58,6 @@ in stdenv.mkDerivation rec {
 
   inherit (primary-src) src;
 
-  # we only have this problem on i686 ATM
-  patches = if stdenv.is64bit then null else [
-    (fetchurl {
-      name = "disable-flaky-tests.diff";
-      url = "https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git/plain"
-        + "/patches/disable-flaky-tests.diff?h=libreoffice_5.1.5_rc2-1";
-      sha256 = "1v1aiqdi64iijjraj6v4ljzclrd9lqan54hmy2h6m20x3ab005wb";
-    })
-  ];
-
   # Openoffice will open libcups dynamically, so we link it directly
   # to make its dlopen work.
   # It also seems not to mention libdl explicitly in some places.
@@ -75,9 +65,7 @@ in stdenv.mkDerivation rec {
 
   # For some reason librdf_redland sometimes refers to rasqal.h instead 
   # of rasqal/rasqal.h
-  # curl upgrade to 7.50.0 (#17152) changes the libcurl headers slightly and
-  # therefore requires the -fpermissive flag until this package gets updated
-  NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal -fpermissive";
+  NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal";
 
   # If we call 'configure', 'make' will then call configure again without parameters.
   # It's their system.
@@ -127,8 +115,19 @@ in stdenv.mkDerivation rec {
     sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
     # rendering-dependent test
     sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx
+    # tilde expansion in path processing checks the existence of $HOME
+    sed -e 's@rtl::OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx
+    # rendering-dependent: on my computer the test table actually doesn't fit…
+    # interesting fact: test disabled on macOS by upstream
+    sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx
+    # Segfault on DB access
+    sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk
     # one more fragile test?
     sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
+    # rendering-dependent tests
+    sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
+    sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
+    sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx
   '';
 
   makeFlags = "SHELL=${bash}/bin/bash";
@@ -216,7 +215,6 @@ in stdenv.mkDerivation rec {
     "--without-system-hsqldb"
     "--without-system-altlinuxhyph"
     "--without-system-lpsolve"
-    "--without-system-npapi-headers"
     "--without-system-libetonyek"
     "--without-system-libfreehand"
     "--without-system-liblangtag"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b52ba143f9f..6312fcb3b99 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13981,7 +13981,6 @@ with pkgs;
         freefont_ttf xorg.fontmiscmisc
       ];
     };
-    mdds = mdds_0_12_1;
     clucene_core = clucene_core_2;
     lcms = lcms2;
     harfbuzz = harfbuzz.override {

From 4675cb78cb5fbadb7aab67b125cd450322dcf3d1 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 3 Feb 2017 13:13:38 +0100
Subject: [PATCH 359/899] xorg.libXpm: 3.5.11 -> 3.5.12

---
 pkgs/servers/x11/xorg/overrides.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 889dd58c01b..8c331efeb11 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -235,6 +235,11 @@ in
   };
 
   libXpm = attrs: attrs // {
+    name = "libXpm-3.5.12";
+    src = args.fetchurl {
+      url = mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2;
+      sha256 = "1v5xaiw4zlhxspvx76y3hq4wpxv7mpj6parqnwdqvpj8vbinsspx";
+    };
     outputs = [ "bin" "dev" "out" ]; # tiny man in $bin
     patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in";
   };

From d042a831a376a20f38d2b22e3caf31b94fc9f621 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 3 Feb 2017 13:13:52 +0100
Subject: [PATCH 360/899] libzmf: init at 0.0.1

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

diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/development/libraries/libzmf/default.nix
new file mode 100644
index 00000000000..59b10a897eb
--- /dev/null
+++ b/pkgs/development/libraries/libzmf/default.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchurl, boost, icu, libpng, librevenge, zlib, doxygen, pkgconfig, cppunit}:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "libzmf";
+  version = "0.0.1";
+  
+  src = fetchurl {
+    url = "http://dev-www.libreoffice.org/src/libzmf/${name}.tar.xz";
+    sha256 = "0yp5l1b90xim506zmr3ljkn3qkvbc7qk3dnwq1snxdpr57m37xga";
+  };
+
+  buildInputs = [boost icu libpng librevenge zlib cppunit];
+  nativeBuildInputs = [doxygen pkgconfig];
+
+  meta = {
+    inherit version;
+    description = ''A library that parses the file format of Zoner Callisto/Draw documents'';
+    license = stdenv.lib.licenses.mpl20;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libzmf";
+    downloadPage = "http://dev-www.libreoffice.org/src/libzmf/";
+    updateWalker = true;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6312fcb3b99..cfbd552a3aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2676,6 +2676,8 @@ with pkgs;
 
   libx86emu = callPackage ../development/libraries/libx86emu { };
 
+  libzmf = callPackage ../development/libraries/libzmf {};
+
   librdmacm = callPackage ../development/libraries/librdmacm { };
 
   libreswan = callPackage ../tools/networking/libreswan { };

From 47127e6951938749e46932069ed316007dc748c4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 3 Feb 2017 13:15:59 +0100
Subject: [PATCH 361/899] libreoffice-fresh: 5.2.4.2 -> 5.3.0.3

---
 .../libreoffice/default-primary-src.nix       |   8 +-
 .../office/libreoffice/default.nix            |  20 +-
 .../office/libreoffice/libreoffice-srcs.nix   | 279 ++++++++++--------
 3 files changed, 174 insertions(+), 133 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix
index 497d4305873..919ab01f5f6 100644
--- a/pkgs/applications/office/libreoffice/default-primary-src.nix
+++ b/pkgs/applications/office/libreoffice/default-primary-src.nix
@@ -2,9 +2,9 @@
 
 rec {
   major = "5";
-  minor = "2";
-  patch = "4";
-  tweak = "2";
+  minor = "3";
+  patch = "0";
+  tweak = "3";
 
   subdir = "${major}.${minor}.${patch}";
 
@@ -12,6 +12,6 @@ rec {
 
   src = fetchurl {
     url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "047byvyg13baws1bycaq1s6wqhkcr2pk27xbag0npzx1lspx2wwb";
+    sha256 = "0vjmc8id9krpy9n4f0yil8k782cdzwmk53lvszi7r32b3ig23f84";
   };
 }
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 29cc1dc118f..30fc20b6e4f 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -9,7 +9,7 @@
 , libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra
 , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
 , fontsConf, pkgconfig, libzip, bluez5, libtool, maven
-, libatomic_ops, graphite2, harfbuzz, libodfgen
+, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
 , gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas
 , defaultIconTheme, glib, ncurses
@@ -42,14 +42,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "075f7jpp8qi6piwrw4n8inynvsgp0270pdd9jmc2fqv6j5gsn332";
+      sha256 = "1ld1zj2f0cbyr0fkibsiazyrb4qkshc9yqkfmq7b64hhp9zsa8a3";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "10p1xd077278gm3syd3lc54fzjsvrvzm0zr6csn9iq90kmlsgwzy";
+      sha256 = "0zqs9g6hqjv5z0yzi0ag4ii158249c70ppqhg1v60haip40xan6z";
     };
 
   };
@@ -65,9 +65,7 @@ in stdenv.mkDerivation rec {
 
   # For some reason librdf_redland sometimes refers to rasqal.h instead 
   # of rasqal/rasqal.h
-  # curl upgrade to 7.50.0 (#17152) changes the libcurl headers slightly and
-  # therefore requires the -fpermissive flag until this package gets updated
-  NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal -fpermissive";
+  NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal";
 
   # If we call 'configure', 'make' will then call configure again without parameters.
   # It's their system.
@@ -126,6 +124,13 @@ in stdenv.mkDerivation rec {
     sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk
     # one more fragile test?
     sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
+    # rendering-dependent tests
+    sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
+    sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
+    sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx
+    sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx
+    # not sure about this fragile test
+    sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
   '';
 
   makeFlags = "SHELL=${bash}/bin/bash";
@@ -219,6 +224,7 @@ in stdenv.mkDerivation rec {
     "--without-system-libmspub"
     "--without-system-libpagemaker"
     "--without-system-libgltf"
+    "--without-system-libstaroffice"
     # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f
     "--without-system-orcus"
   ];
@@ -239,7 +245,7 @@ in stdenv.mkDerivation rec {
       gst_all_1.gst-plugins-base gsettings_desktop_schemas glib
       neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
       python3 sablotron sane-backends unzip vigra which zip zlib
-      mdds bluez5 glibc libcmis libwps libabw
+      mdds bluez5 glibc libcmis libwps libabw libzmf
       libxshmfence libatomic_ops graphite2 harfbuzz
       librevenge libe-book libmwaw glm glew ncurses
       libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index 6cacff49fc6..375db389da9 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -14,18 +14,18 @@
     md5name = "ce977548f1cbf46918e93cd38ac35163-commons-logging-1.2-src.tar.gz";
   }
   {
-    name = "apr-1.4.8.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/apr-1.4.8.tar.gz";
-    sha256 = "1689e415bdfab6aaa41f07836b5dd9ed4901d22ddeb99feffdb2cee3124adf49";
-    md5 = "eff9d741b0999a9bbab96862dd2a2a3d";
-    md5name = "eff9d741b0999a9bbab96862dd2a2a3d-apr-1.4.8.tar.gz";
+    name = "apr-1.5.2.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz";
+    sha256 = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb";
+    md5 = "98492e965963f852ab29f9e61b2ad700";
+    md5name = "98492e965963f852ab29f9e61b2ad700-apr-1.5.2.tar.gz";
   }
   {
-    name = "apr-util-1.5.3.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/apr-util-1.5.3.tar.gz";
-    sha256 = "76db34cb508e346e3bf69347c29ed1500bf0b71bcc48d54271ad9d1c25703743";
-    md5 = "71a11d037240b292f824ba1eb537b4e3";
-    md5name = "71a11d037240b292f824ba1eb537b4e3-apr-util-1.5.3.tar.gz";
+    name = "apr-util-1.5.4.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz";
+    sha256 = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19";
+    md5 = "866825c04da827c6e5f53daff5569f42";
+    md5name = "866825c04da827c6e5f53daff5569f42-apr-util-1.5.4.tar.gz";
   }
   {
     name = "boost_1_60_0.tar.bz2";
@@ -56,18 +56,18 @@
     md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz";
   }
   {
-    name = "cairo-1.10.2.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz";
-    sha256 = "32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41";
-    md5 = "f101a9e88b783337b20b2e26dfd26d5f";
-    md5name = "f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz";
+    name = "cairo-1.14.6.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/23a0b2f0235431d35238df1d3a517fdb-cairo-1.14.6.tar.xz";
+    sha256 = "613cb38447b76a93ff7235e17acd55a78b52ea84a9df128c3f2257f8eaa7b252";
+    md5 = "23a0b2f0235431d35238df1d3a517fdb";
+    md5name = "23a0b2f0235431d35238df1d3a517fdb-cairo-1.14.6.tar.xz";
   }
   {
-    name = "libcdr-0.1.2.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/libcdr-0.1.2.tar.bz2";
-    sha256 = "d05a986dab9f960e64466072653a900d03f8257b084440d9d16599e16060581e";
-    md5 = "6e3062b55b149d7b3c6aedb3bb5b86e2";
-    md5name = "6e3062b55b149d7b3c6aedb3bb5b86e2-libcdr-0.1.2.tar.bz2";
+    name = "libcdr-0.1.3.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/libcdr-0.1.3.tar.bz2";
+    sha256 = "5160bbbfefe52bd4880840fad2b07a512813e37bfaf8ccac062fca238f230f4d";
+    md5 = "e369f30b5b861ee0fc4f9e6cbad701fe";
+    md5name = "e369f30b5b861ee0fc4f9e6cbad701fe-libcdr-0.1.3.tar.bz2";
   }
   {
     name = "clucene-core-2.3.3.4.tar.gz";
@@ -147,11 +147,11 @@
     md5name = "2f47841c829facb346eb6e3fab5212e2-expat-2.2.0.tar.bz2";
   }
   {
-    name = "Firebird-2.5.5.26952-0.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/Firebird-2.5.5.26952-0.tar.bz2";
-    sha256 = "b33e63ede88184d9ef2ae6760537ab75bfe641513821410b83e837946162b7d1";
-    md5 = "b0b5293991fcf07347b38431c80be1d4";
-    md5name = "b0b5293991fcf07347b38431c80be1d4-Firebird-2.5.5.26952-0.tar.bz2";
+    name = "Firebird-3.0.0.32483-0.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2";
+    sha256 = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860";
+    md5 = "821260b61dafc22899d1464d4e91ee6a";
+    md5name = "821260b61dafc22899d1464d4e91ee6a-Firebird-3.0.0.32483-0.tar.bz2";
   }
   {
     name = "fontconfig-2.8.0.tar.gz";
@@ -175,18 +175,18 @@
     md5name = "c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz";
   }
   {
-    name = "dejavu-fonts-ttf-2.35.zip";
-    url = "http://dev-www.libreoffice.org/src/d8b5214d35bcd2bfcb2cffa7795b351d-dejavu-fonts-ttf-2.35.zip";
-    sha256 = "7e0d00f20080784c3a38a845d5858c161af14f0073d9474cdbfdedae883cc747";
-    md5 = "d8b5214d35bcd2bfcb2cffa7795b351d";
-    md5name = "d8b5214d35bcd2bfcb2cffa7795b351d-dejavu-fonts-ttf-2.35.zip";
+    name = "dejavu-fonts-ttf-2.37.zip";
+    url = "http://dev-www.libreoffice.org/src/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip";
+    sha256 = "7576310b219e04159d35ff61dd4a4ec4cdba4f35c00e002a136f00e96a908b0a";
+    md5 = "33e1e61fab06a547851ed308b4ffef42";
+    md5name = "33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip";
   }
   {
-    name = "gentiumbasic-fonts-1.10.zip";
-    url = "http://dev-www.libreoffice.org/src/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip";
-    sha256 = "f1691e48d02effdee0701622297394451759f13e0e0b36e788847f4b3e2ba11b";
-    md5 = "35efabc239af896dfb79be7ebdd6e6b9";
-    md5name = "35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip";
+    name = "GentiumBasic_1102.zip";
+    url = "http://dev-www.libreoffice.org/src/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip";
+    sha256 = "2f1a2c5491d7305dffd3520c6375d2f3e14931ee35c6d8ae1e8f098bf1a7b3cc";
+    md5 = "1725634df4bb3dcb1b2c91a6175f8789";
+    md5name = "1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip";
   }
   {
     name = "liberation-fonts-ttf-1.07.4.tar.gz";
@@ -237,6 +237,13 @@
     md5 = "edc4d741888bc0d38e32dbaa17149596";
     md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz";
   }
+  {
+    name = "EmojiOneColor-SVGinOT-1.3.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz";
+    sha256 = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7";
+    md5 = "919389b307ee8696288ea3b8210ab974";
+    md5name = "919389b307ee8696288ea3b8210ab974-EmojiOneColor-SVGinOT-1.3.tar.gz";
+  }
   {
     name = "libfreehand-0.1.1.tar.bz2";
     url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2";
@@ -266,25 +273,18 @@
     md5name = "bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip";
   }
   {
-    name = "glyphy-0.2.0.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/5d303fb955beb9bf112267316ca9d021-glyphy-0.2.0.tar.bz2";
-    sha256 = "9a8f629f7ea40ba118199a37adee8f2dfb084cffa5f7f4db3a47b8b0075777be";
-    md5 = "5d303fb955beb9bf112267316ca9d021";
-    md5name = "5d303fb955beb9bf112267316ca9d021-glyphy-0.2.0.tar.bz2";
+    name = "graphite2-minimal-1.3.9.tgz";
+    url = "http://dev-www.libreoffice.org/src/3069842a88b8f40c6b83ad2850cda293-graphite2-minimal-1.3.9.tgz";
+    sha256 = "4fcbfa52527fd6fd6b54786c82bdbb96ec6b34fa2e799361e5164b6bbb671b76";
+    md5 = "3069842a88b8f40c6b83ad2850cda293";
+    md5name = "3069842a88b8f40c6b83ad2850cda293-graphite2-minimal-1.3.9.tgz";
   }
   {
-    name = "graphite2-minimal-1.3.8.tgz";
-    url = "http://dev-www.libreoffice.org/src/4311dd9ace498b57c85f611e0670df64-graphite2-minimal-1.3.8.tgz";
-    sha256 = "d16940175822760753e9762d0af9679c9726e64f25955677fe7ab68448601c3b";
-    md5 = "4311dd9ace498b57c85f611e0670df64";
-    md5name = "4311dd9ace498b57c85f611e0670df64-graphite2-minimal-1.3.8.tgz";
-  }
-  {
-    name = "harfbuzz-1.2.6.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/harfbuzz-1.2.6.tar.bz2";
-    sha256 = "7537bacccb3524df0cd2a4d5bc7e168bcc10e8171e0324f3cd522583868192c1";
-    md5 = "9f4b6831c86135faef011e991f59f77f";
-    md5name = "9f4b6831c86135faef011e991f59f77f-harfbuzz-1.2.6.tar.bz2";
+    name = "harfbuzz-1.3.2.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/harfbuzz-1.3.2.tar.bz2";
+    sha256 = "8543a6372f08c5987c632dfaa86210c7edb3f43fbacd96095c609bc3539ce027";
+    md5 = "5986e1bfcd983d1f6caa53ef64c4abc5";
+    md5name = "5986e1bfcd983d1f6caa53ef64c4abc5-harfbuzz-1.3.2.tar.bz2";
   }
   {
     name = "hsqldb_1_8_0.zip";
@@ -308,11 +308,11 @@
     md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz";
   }
   {
-    name = "icu4c-57_1-src.tgz";
-    url = "http://dev-www.libreoffice.org/src/976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz";
-    sha256 = "ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581";
-    md5 = "976734806026a4ef8bdd17937c8898b9";
-    md5name = "976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz";
+    name = "icu4c-58_1-src.tgz";
+    url = "http://dev-www.libreoffice.org/src/1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz";
+    sha256 = "0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309";
+    md5 = "1901302aaff1c1633ef81862663d2917";
+    md5name = "1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz";
   }
   {
     name = "flow-engine-0.9.4.zip";
@@ -455,18 +455,25 @@
     md5name = "d63a9f47ab048f5009d90693d6aa6424-libgltf-0.0.2.tar.bz2";
   }
   {
-    name = "liblangtag-0.5.8.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2";
-    sha256 = "08e2f64bfe3f750be7391eb0af53967e164b628c59f02be4d83789eb4f036eaa";
-    md5 = "aa899eff126216dafe721149fbdb511b";
-    md5name = "aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2";
+    name = "liblangtag-0.6.2.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2";
+    sha256 = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e";
+    md5 = "284f120247323a35122ab32b4b359c45";
+    md5name = "284f120247323a35122ab32b4b359c45-liblangtag-0.6.2.tar.bz2";
   }
   {
-    name = "xmlsec1-1.2.20.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz";
-    sha256 = "3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305";
-    md5 = "ce12af00283eb90d9281956524250d6e";
-    md5name = "ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz";
+    name = "ltm-1.0.zip";
+    url = "http://dev-www.libreoffice.org/src/ltm-1.0.zip";
+    sha256 = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483";
+    md5 = "da283d2e3e72137d0c600ac36b991c9d";
+    md5name = "da283d2e3e72137d0c600ac36b991c9d-ltm-1.0.zip";
+  }
+  {
+    name = "xmlsec1-1.2.23.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz";
+    sha256 = "41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f";
+    md5 = "86b1daaa438f5a7bea9a52d7b9799ac0";
+    md5name = "86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz";
   }
   {
     name = "libxml2-2.9.4.tar.gz";
@@ -518,11 +525,11 @@
     md5name = "ff9d0f9dd8fbc523408ea1953d5bde41-libmspub-0.1.2.tar.bz2";
   }
   {
-    name = "libmwaw-0.3.7.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.7.tar.bz2";
-    sha256 = "a66b3e45a5ba5dd89849a766e128585cac8aaf9e9c6f037040200e5bf31f1427";
-    md5 = "4a8a53a9d997cf0e2bd208178797dbfb";
-    md5name = "4a8a53a9d997cf0e2bd208178797dbfb-libmwaw-0.3.7.tar.bz2";
+    name = "libmwaw-0.3.9.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.9.tar.bz2";
+    sha256 = "11a1f318431a052e1d623385351c8e659377d36db3e71e188af55da87ce9461f";
+    md5 = "d8532ad5630d3f3b2189a7ec5639151b";
+    md5name = "d8532ad5630d3f3b2189a7ec5639151b-libmwaw-0.3.9.tar.bz2";
   }
   {
     name = "mysql-connector-c++-1.1.4.tar.gz";
@@ -559,6 +566,20 @@
     md5 = "32572ea48d9021bbd6fa317ddb697abc";
     md5name = "32572ea48d9021bbd6fa317ddb697abc-libodfgen-0.1.6.tar.bz2";
   }
+  {
+    name = "odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar";
+    url = "http://dev-www.libreoffice.org/src/../extern/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar";
+    sha256 = "a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34";
+    md5 = "a084cd548b586552cb7d3ee51f1af969";
+    md5name = "a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar";
+  }
+  {
+    name = "officeotron-0.7.4-master.jar";
+    url = "http://dev-www.libreoffice.org/src/../extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar";
+    sha256 = "f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770";
+    md5 = "8249374c274932a21846fa7629c2aa9b";
+    md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar";
+  }
   {
     name = "OpenCOLLADA-master-6509aa13af.tar.bz2";
     url = "http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2";
@@ -567,11 +588,11 @@
     md5name = "4ca8a6ef0afeefc864e9ef21b9f14bd6-OpenCOLLADA-master-6509aa13af.tar.bz2";
   }
   {
-    name = "openldap-2.4.31.tgz";
-    url = "http://dev-www.libreoffice.org/src/804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz";
-    sha256 = "bde845840df4794b869a6efd6a6b1086f80989038e4844b2e4d7d6b57b39c5b6";
-    md5 = "804c6cb5698db30b75ad0ff1c25baefd";
-    md5name = "804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz";
+    name = "openldap-2.4.44.tgz";
+    url = "http://dev-www.libreoffice.org/src/openldap-2.4.44.tgz";
+    sha256 = "d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400";
+    md5 = "693ac26de86231f8dcae2b4e9d768e51";
+    md5name = "693ac26de86231f8dcae2b4e9d768e51-openldap-2.4.44.tgz";
   }
   {
     name = "openssl-1.0.2h.tar.gz";
@@ -581,11 +602,11 @@
     md5name = "9392e65072ce4b614c1392eefc1f23d0-openssl-1.0.2h.tar.gz";
   }
   {
-    name = "liborcus-0.11.2.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/liborcus-0.11.2.tar.gz";
-    sha256 = "10afc617fd7600fa02bd4467d2e3c7bd058f84e4d672d558e1db90e82dafd256";
-    md5 = "205badaee72adf99422add8c4c49d669";
-    md5name = "205badaee72adf99422add8c4c49d669-liborcus-0.11.2.tar.gz";
+    name = "liborcus-0.12.1.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/liborcus-0.12.1.tar.gz";
+    sha256 = "676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908";
+    md5 = "d0ad3a2fcf7008e5b33604bab33df3ad";
+    md5name = "d0ad3a2fcf7008e5b33604bab33df3ad-liborcus-0.12.1.tar.gz";
   }
   {
     name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
@@ -602,25 +623,25 @@
     md5name = "5c4985a68be0b79d3f809da5e12b143c-libpagemaker-0.0.3.tar.bz2";
   }
   {
-    name = "pixman-0.24.4.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2";
-    sha256 = "3d1bf79329be76103c7d9632a79962178364371807104a10e5f63ae0551731dc";
-    md5 = "c63f411b3ad147db2bcce1bf262a0e02";
-    md5name = "c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2";
+    name = "pixman-0.34.0.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz";
+    sha256 = "21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e";
+    md5 = "e80ebae4da01e77f68744319f01d52a3";
+    md5name = "e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz";
   }
   {
-    name = "libpng-1.6.24.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/libpng-1.6.24.tar.gz";
-    sha256 = "be46e0d14ccac3800f816ae860d191a1187a40164b7552c44afeee97a9caa0a3";
-    md5 = "65213080dd30a9b16193d9b83adc1ee9";
-    md5name = "65213080dd30a9b16193d9b83adc1ee9-libpng-1.6.24.tar.gz";
+    name = "libpng-1.6.28.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/libpng-1.6.28.tar.gz";
+    sha256 = "b6cec903e74e9fdd7b5bbcde0ab2415dd12f2f9e84d9e4d9ddd2ba26a41623b2";
+    md5 = "897ccec1ebfb0922e83c2bfaa1be8748";
+    md5name = "897ccec1ebfb0922e83c2bfaa1be8748-libpng-1.6.28.tar.gz";
   }
   {
-    name = "poppler-0.46.0.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/poppler-0.46.0.tar.bz2";
-    sha256 = "e3b53c4d1baffb047d4752d68886210fcb279e75cc32c0c61c7165e4d4cf846a";
-    md5 = "38c758d84437378ec4f5aae9f875301d";
-    md5name = "38c758d84437378ec4f5aae9f875301d-poppler-0.46.0.tar.bz2";
+    name = "poppler-0.49.0.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/poppler-0.49.0.tar.xz";
+    sha256 = "14485f0e1e43dcddf49cfc02c2ccb92910ba3e0e91e06f4bd2642ec00cb3a79f";
+    md5 = "9e057ed8eee1f9979fa75d8f044783b8";
+    md5name = "9e057ed8eee1f9979fa75d8f044783b8-poppler-0.49.0.tar.xz";
   }
   {
     name = "postgresql-9.2.1.tar.bz2";
@@ -637,32 +658,32 @@
     md5name = "803a75927f8f241ca78633890c798021-Python-3.3.5.tgz";
   }
   {
-    name = "Python-3.5.0.tgz";
-    url = "http://dev-www.libreoffice.org/src/Python-3.5.0.tgz";
-    sha256 = "584e3d5a02692ca52fce505e68ecd77248a6f2c99adf9db144a39087336b0fe0";
-    md5 = "a56c0c0b45d75a0ec9c6dee933c41c36";
-    md5name = "a56c0c0b45d75a0ec9c6dee933c41c36-Python-3.5.0.tgz";
+    name = "Python-3.5.3.tgz";
+    url = "http://dev-www.libreoffice.org/src/Python-3.5.3.tgz";
+    sha256 = "d8890b84d773cd7059e597dbefa510340de8336ec9b9e9032bf030f19291565a";
+    md5 = "6192f0e45f02575590760e68c621a488";
+    md5name = "6192f0e45f02575590760e68c621a488-Python-3.5.3.tgz";
   }
   {
-    name = "raptor2-2.0.9.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz";
-    sha256 = "e26fb9c18e6ebf71100f434070d50196a21d592b715e361850c3b4e789b5f6ef";
-    md5 = "4ceb9316488b0ea01acf011023cf7fff";
-    md5name = "4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz";
+    name = "raptor2-2.0.15.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz";
+    sha256 = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed";
+    md5 = "a39f6c07ddb20d7dd2ff1f95fa21e2cd";
+    md5name = "a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz";
   }
   {
-    name = "rasqal-0.9.30.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz";
-    sha256 = "abf0e93d80cc79bdf383fd3e904255bf98bc729356d6cf2f673bce74b08b1cfd";
-    md5 = "b12c5f9cfdb6b04efce5a4a186b8416b";
-    md5name = "b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz";
+    name = "rasqal-0.9.33.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz";
+    sha256 = "6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c";
+    md5 = "1f5def51ca0026cd192958ef07228b52";
+    md5name = "1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz";
   }
   {
-    name = "redland-1.0.16.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz";
-    sha256 = "d9a274fc086e61119d5c9beafb8d05527e040ec86f4c0961276ca8de0a049dbd";
-    md5 = "32f8e1417a64d3c6f2c727f9053f55ea";
-    md5name = "32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz";
+    name = "redland-1.0.17.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz";
+    sha256 = "de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681";
+    md5 = "e5be03eda13ef68aabab6e42aa67715e";
+    md5name = "e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz";
   }
   {
     name = "librevenge-0.0.4.tar.bz2";
@@ -685,6 +706,13 @@
     md5 = "4f8e76c9c6567aee1d66aba49f76a58b";
     md5name = "4f8e76c9c6567aee1d66aba49f76a58b-serf-1.2.1.tar.bz2";
   }
+  {
+    name = "libstaroffice-0.0.2.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.2.tar.bz2";
+    sha256 = "f06eb29d13357f1aa1944de0be1162de05d9f9333b5f54e9bf762415029a8899";
+    md5 = "4012950240c2bf768c9b29ad376123d7";
+    md5name = "4012950240c2bf768c9b29ad376123d7-libstaroffice-0.0.2.tar.bz2";
+  }
   {
     name = "swingExSrc.zip";
     url = "http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip";
@@ -721,11 +749,11 @@
     md5name = "dfd066658ec9d2fb2262417039a8a1c3-libwpg-0.3.1.tar.bz2";
   }
   {
-    name = "libwps-0.4.3.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/libwps-0.4.3.tar.bz2";
-    sha256 = "0c30407865a873ff76b6d5b2d2aa599f6af68936638c81ca8292449324042a6c";
-    md5 = "027fb17fb9e43553aa6624dc18f830ac";
-    md5name = "027fb17fb9e43553aa6624dc18f830ac-libwps-0.4.3.tar.bz2";
+    name = "libwps-0.4.4.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/libwps-0.4.4.tar.bz2";
+    sha256 = "387c46d9543bb566381fddb8991e2838599fc500ee132fef9631a704c5cbed73";
+    md5 = "dcfd1d18bfa9818cf3ab21663ba857a3";
+    md5name = "dcfd1d18bfa9818cf3ab21663ba857a3-libwps-0.4.4.tar.bz2";
   }
   {
     name = "xsltml_2.1.2.zip";
@@ -741,4 +769,11 @@
     md5 = "44d667c142d7cda120332623eab69f40";
     md5name = "44d667c142d7cda120332623eab69f40-zlib-1.2.8.tar.gz";
   }
+  {
+    name = "libzmf-0.0.1.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/libzmf-0.0.1.tar.bz2";
+    sha256 = "b69f7f6e94cf695c4b672ca65def4825490a1e7dee34c2126309b96d21a19e6b";
+    md5 = "c611df8664240de0276ab95670f413d8";
+    md5name = "c611df8664240de0276ab95670f413d8-libzmf-0.0.1.tar.bz2";
+  }
 ]

From 0cde365745fc9dfbffeb414ec9fb70c272f8f418 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@ruiec.cat>
Date: Fri, 3 Feb 2017 12:51:59 +0100
Subject: [PATCH 362/899] jsoncpp: 1.7.2->1.8.0

I also re-added some stuff lost in previous update (83fd63995af), like
darwin support and maintainers info.
---
 .../development/libraries/jsoncpp/default.nix | 45 ++++++++++++-------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix
index 5c4c4a693df..62e5e7133b4 100644
--- a/pkgs/development/libraries/jsoncpp/default.nix
+++ b/pkgs/development/libraries/jsoncpp/default.nix
@@ -1,34 +1,47 @@
 { stdenv
-, fetchgit
+, fetchFromGitHub
 , cmake
 , python
 }:
 stdenv.mkDerivation rec {
   name = "jsoncpp-${version}";
-  version = "1.7.2";
+  version = "1.8.0";
 
-  src = fetchgit {
-    url = https://github.com/open-source-parsers/jsoncpp.git;
-    sha256 = "04w4cfmvyv52rpqhc370ln8rhlsrr515778bixhgafqbp3p4x34k";
-    rev = "c8054483f82afc3b4db7efe4e5dc034721649ec8";
+  src = fetchFromGitHub {
+    owner = "open-source-parsers";
+    repo = "jsoncpp";
+    rev = version;
+    sha256 = "1lg22zrjnl10x1bw0wfz72xd2kfbzynyggk8vdwd89mp1g8xjl9d";
   };
 
-  configurePhase = ''
-    mkdir -p Build
-    pushd Build
+  /* During darwin bootstrap, we have a cp that doesn't understand the
+   * --reflink=auto flag, which is used in the default unpackPhase for dirs
+   */
+  unpackPhase = ''
+    cp -a ${src} ${src.name}
+    chmod -R +w ${src.name}
+    export sourceRoot=${src.name}
+  '';
 
-    mkdir -p $out
-    cmake .. -DCMAKE_INSTALL_PREFIX=$out \
-             -DBUILD_SHARED_LIBS=ON \
-             -DCMAKE_BUILD_TYPE=Release
-  ''; 
+  # Hack to be able to run the test, broken because we use
+  # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install
+  preBuild = ''
+    export LD_LIBRARY_PATH="`pwd`/src/lib_json:$LD_LIBRARY_PATH"
+  '';
 
-  buildInputs = [ cmake python ];
+  nativeBuildInputs = [ cmake python ];
+
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DBUILD_STATIC_LIBS=OFF"
+  ];
 
   meta = with stdenv.lib; {
+    inherit version;
     homepage = https://github.com/open-source-parsers/jsoncpp;
     description = "A C++ library for interacting with JSON.";
+    maintainers = with maintainers; [ ttuegel page ];
     license = licenses.mit;
-    platforms = platforms.linux;
+    platforms = platforms.all;
   };
 }

From ba596c9ce93691edc0e2e31924c75138ed671506 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@ruiec.cat>
Date: Fri, 3 Feb 2017 12:58:10 +0100
Subject: [PATCH 363/899] jsoncpp: remove unused 1.6 version

---
 .../libraries/jsoncpp/1.6.5/default.nix       | 48 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 50 deletions(-)
 delete mode 100644 pkgs/development/libraries/jsoncpp/1.6.5/default.nix

diff --git a/pkgs/development/libraries/jsoncpp/1.6.5/default.nix b/pkgs/development/libraries/jsoncpp/1.6.5/default.nix
deleted file mode 100644
index 00dffdbc3ce..00000000000
--- a/pkgs/development/libraries/jsoncpp/1.6.5/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake, python }:
-
-stdenv.mkDerivation rec {
-  name = "jsoncpp-${version}";
-  version = "1.6.5";
-
-  src = fetchFromGitHub {
-    owner = "open-source-parsers";
-    repo = "jsoncpp";
-    rev = version;
-    sha256 = "08y54n4v3q18ik8iv8zyziava3x130ilzf1l3qli3vjwf6l42fm0";
-  };
-
-  /* During darwin bootstrap, we have a cp that doesn't understand the
-   * --reflink=auto flag, which is used in the default unpackPhase for dirs
-   */
-  unpackPhase = ''
-    cp -a ${src} ${src.name}
-    chmod -R +w ${src.name}
-    export sourceRoot=${src.name}
-  '';
-
-  # Hack to be able to run the test, broken because we use
-  # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install
-  preBuild = ''
-    export LD_LIBRARY_PATH="`pwd`/src/lib_json:$LD_LIBRARY_PATH"
-  '';
-
-  nativeBuildInputs = [ cmake python ];
-
-  CXXFLAGS = "-Wno-shift-negative-value";
-
-  cmakeFlags = [
-    "-DJSONCPP_LIB_BUILD_SHARED=ON"
-    "-DJSONCPP_LIB_BUILD_STATIC=OFF"
-    "-DJSONCPP_WITH_CMAKE_PACKAGE=ON"
-  ];
-
-  meta = {
-    inherit version;
-    homepage = https://github.com/open-source-parsers/jsoncpp;
-    description = "A simple API to manipulate JSON data in C++";
-    maintainers = with stdenv.lib.maintainers; [ ttuegel cpages ];
-    platforms = stdenv.lib.platforms.all;
-    license = stdenv.lib.licenses.mit;
-    branch = "1.6";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cfbd552a3aa..8e4169c575c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7746,8 +7746,6 @@ with pkgs;
 
   jsoncpp = callPackage ../development/libraries/jsoncpp { };
 
-  jsoncpp_1_6_5 = callPackage ../development/libraries/jsoncpp/1.6.5 { };
-
   jsonnet = callPackage ../development/compilers/jsonnet { };
 
   libjson = callPackage ../development/libraries/libjson { };

From d66fa9acfd65c6a0fdffd71812964a5066a1acea Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 3 Feb 2017 07:34:25 -0500
Subject: [PATCH 364/899] tigervnc: 1.7.0 -> 1.7.1 for CVE-2017-5581

---
 pkgs/tools/admin/tigervnc/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index 901ec06ea65..71c4ebd10a4 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, xorg
+{ stdenv, fetchFromGitHub, xorg
 , autoconf, automake, cvs, libtool, nasm, pixman, xkeyboard_config
 , fontDirectories, libgcrypt, gnutls, pam, flex, bison, gettext
 , cmake, libjpeg_turbo, fltk, nettle, libiconv, libtasn1
@@ -7,13 +7,14 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "1.7.0";
+  version = "1.7.1";
   name = "tigervnc-${version}";
 
-  src = fetchgit {
-    url = "https://github.com/TigerVNC/tigervnc/";
-    sha256 = "1b6n2gq6078x8dwz471a68jrkgpcxmbiivmlsakr42vrndm7niz3";
-    rev = "e25272fc74ef09987ccaa33b9bf1736397c76fdf";
+  src = fetchFromGitHub {
+    owner = "TigerVNC";
+    repo = "tigervnc";
+    sha256 = "0s2v1h24cl5ypnr35hima580xvvsh0cdqi501mvyvi7wz9cp33rj";
+    rev = "v1.7.1";
   };
 
   inherit fontDirectories;

From dea81956fc0904c5723cf56f2bca4497b44ac3c3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 3 Feb 2017 14:47:05 +0100
Subject: [PATCH 365/899] nixUnstable: 1.12pre4911_b30d1e7 ->
 1.12pre4997_1351b0d

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 069eab421ec..49b23fec4ec 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -112,12 +112,12 @@ in rec {
 
   nixUnstable = lib.lowPrio (common rec {
     name = "nix-1.12${suffix}";
-    suffix = "pre4911_b30d1e7";
+    suffix = "pre4997_1351b0d";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "b30d1e7ada0a8fbaacc25e24e5e788d18bfe8d3c";
-      sha256 = "04j6aw2bi3k7m5jyqwn1vrf78br5kdfpjsj15b5r5lvxdqhlknvm";
+      rev = "1351b0df87a0984914769c5dc76489618b3a3fec";
+      sha256 = "09zvphzik9pypi1bnjs0v83qwgl5cfb5w0c788jlr5wbd8x3crv1";
     };
     fromGit = true;
   });

From c4bb0c7bb4ea71823d013788e70013f1d824a3dc Mon Sep 17 00:00:00 2001
From: Tadas Barzdzius <tadas@barzdzius.lt>
Date: Fri, 3 Feb 2017 15:53:09 +0200
Subject: [PATCH 366/899] rustc, cargo: 1.14.0 -> 1.15.0, 0.15.0 -> 0.16.0

---
 pkgs/development/compilers/rust/bootstrap.nix | 12 ++++-----
 pkgs/development/compilers/rust/default.nix   | 15 +++++------
 .../disable-lockfile-check-stable.patch       | 26 -------------------
 pkgs/development/compilers/rust/rustc.nix     |  2 ++
 4 files changed, 15 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch

diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
index 93deee01e56..b582b21dcc4 100644
--- a/pkgs/development/compilers/rust/bootstrap.nix
+++ b/pkgs/development/compilers/rust/bootstrap.nix
@@ -14,16 +14,16 @@ let
     then "x86_64-apple-darwin"
     else abort "missing boostrap url for platform ${stdenv.system}";
 
-  # fetch hashes by running `print-hashes.sh 1.13.0`
+  # fetch hashes by running `print-hashes.sh 1.14.0`
   bootstrapHash =
     if stdenv.system == "i686-linux"
-    then "239734113f6750d31085c7a08c260d492991cc1ef10817b6d44154515f3f9439"
+    then "8d5c75728b44468216f99651dfae9d60ae0696a77105dd2b02942d75f3256840"
     else if stdenv.system == "x86_64-linux"
-    then "95f4c372b1b81ac1038161e87e932dd7ab875d25c167a861c3949b0f6a65516d"
+    then "c71325cfea1b6f0bdc5189fa4c50ff96f828096ff3f7b5056367f9685d6a4d04"
     else if stdenv.system == "i686-darwin"
-    then "f6e01cab3bf8d0a6fe9cc2447aa10ce894569daaa72d44063c229da918b96023"
+    then "fe1b3d67329a22d67e3b8db8858a43022e2e746dde60ef4a2db3f2cac16ea9bd"
     else if stdenv.system == "x86_64-darwin"
-    then "f538ca5732b844cf7f00fc4aaaf200a49a845b58b4ec8aef38da0b00e2cf6efe"
+    then "3381341524b0184da5ed2cdcddc2a25e2e335e87f1cf676f64d98ee5e6479f20"
     else throw "missing boostrap hash for platform ${stdenv.system}";
 
   needsPatchelf = stdenv.isLinux;
@@ -33,7 +33,7 @@ let
      sha256 = bootstrapHash;
   };
 
-  version = "1.13.0";
+  version = "1.14.0";
 in
 
 rec {
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index 7b8d5a3d1ef..e3314732fa4 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -6,15 +6,14 @@ let
 in
 rec {
   rustc = callPackage ./rustc.nix {
-    shortVersion = "1.14";
+    shortVersion = "1.15";
     isRelease = true;
     forceBundledLLVM = false;
     configureFlags = [ "--release-channel=stable" ];
-    srcRev = "e8a0123241f0d397d39cd18fcc4e5e7edde22730";
-    srcSha = "1sla3gnx9dqvivnyhvwz299mc3jmdy805q2y5xpmpi1vhfk0bafx";
+    srcRev = "10893a9a349cdd423f2490a6984acb5b3b7c8046";
+    srcSha = "0861iivb98ir9ixq2qzznfc1b2l9khlwdln5n0gf2mp1fi3w4d4f";
 
     patches = [
-      ./patches/disable-lockfile-check-stable.patch
       ./patches/darwin-disable-fragile-tcp-tests.patch
     ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
 
@@ -25,10 +24,10 @@ rec {
   };
 
   cargo = callPackage ./cargo.nix rec {
-    version = "0.15.0";
-    srcRev = "298a0127f703d4c2500bb06d309488b92ef84ae1";
-    srcSha = "0v74r18vszapw2rfk7w72czkp9gbq4s1sggphm5vx0kyh058dxc5";
-    depsSha256 = "0ksiywli8r4lkprfknm0yz1w27060psi3db6wblqmi8sckzdm44h";
+    version = "0.16.0";
+    srcRev = "6e0c18cccc8b0c06fba8a8d76486f81a792fb420";
+    srcSha = "117ivvs9wz848mwf8bw797n10qpn77agd353z8b0hxgbxhpribya";
+    depsSha256 = "11s2xpgfhl4mb4wa2nk4mzsypr7m9daxxc7l0vraiz5cr77gk7qq";
 
     inherit rustc; # the rustc that will be wrapped by cargo
     inherit rustPlatform; # used to build cargo
diff --git a/pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch b/pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch
deleted file mode 100644
index c5009b7ba67..00000000000
--- a/pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e7378e267bba203bd593b49705c24303b0a46cb7 Mon Sep 17 00:00:00 2001
-From: David Craven <david@craven.ch>
-Date: Wed, 1 Jun 2016 01:41:35 +0200
-Subject: [PATCH] disable-lockfile-check
-
----
- src/tools/tidy/src/main.rs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs
-index 2839bbd..50142ff 100644
---- a/src/tools/tidy/src/main.rs
-+++ b/src/tools/tidy/src/main.rs
-@@ -48,7 +48,7 @@ fn main() {
-     errors::check(&path, &mut bad);
-     cargo::check(&path, &mut bad);
-     features::check(&path, &mut bad);
--    cargo_lock::check(&path, &mut bad);
-+    //cargo_lock::check(&path, &mut bad);
-     pal::check(&path, &mut bad);
- 
-     if bad {
-         panic!("some tidy checks failed");
--- 
-2.8.3
-
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 056177fd265..a693afb8b59 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -56,6 +56,8 @@ stdenv.mkDerivation {
                 ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" ]
                 # ++ [ "--jemalloc-root=${jemalloc}/lib"
                 ++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${binutils.out}/bin/ar" ]
+                # TODO: Remove when fixed build with rustbuild
+                ++ [ "--disable-rustbuild" ]
                 ++ optional (stdenv.cc.cc ? isClang) "--enable-clang"
                 ++ optional (targets != []) "--target=${target}"
                 ++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}";

From 5ba2afe9ba80342c794727d1cd20eaf84aa1ae67 Mon Sep 17 00:00:00 2001
From: Tadas Barzdzius <tadas@barzdzius.lt>
Date: Fri, 3 Feb 2017 15:53:42 +0200
Subject: [PATCH 367/899] racerd: 2016-08-23 -> 2016-12-24

---
 pkgs/development/tools/rust/racerd/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix
index e5d275ec1f5..95f014cc2d7 100644
--- a/pkgs/development/tools/rust/racerd/default.nix
+++ b/pkgs/development/tools/rust/racerd/default.nix
@@ -4,16 +4,16 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "racerd-${version}";
-  version = "2016-08-23";
+  version = "2016-12-24";
   src = fetchgit {
     url = "git://github.com/jwilm/racerd.git";
-    rev = "5d685ed26ba812a1afe892a8c0d12eb6abbeeb3d";
-    sha256 = "1ww96nc00l8p28rnln31n92x0mp2p5jnaqh2nwc8xi3r559p1y5i";
+    rev = "dc090ea11d550cd513416d21227d558dbfd2fcb6";
+    sha256 = "0jfryb1b32m6bn620gd7y670cfipaswj1cppzkybm4xg6abqh07b";
   };
 
   doCheck = false;
 
-  depsSha256 = "13vkabr6bbl2nairxpn3lhqxcr3larasjk03r4hzrn7ff7sy40h2";
+  depsSha256 = "1vv6fyisi11bcajxkq3ihpl59yh504xmnsr222zj15hmivn0jwf2";
 
   buildInputs = [ makeWrapper ];
 

From 127c299efcedb7e2b4e8d7240fbcf718e05eed5c Mon Sep 17 00:00:00 2001
From: Evan Danaher <github@edanaher.net>
Date: Fri, 3 Feb 2017 08:27:19 -0500
Subject: [PATCH 368/899] vim-plugins: add vim-highlightedyank

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 1b6369d87d9..2ed082f0464 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -281,6 +281,17 @@ rec {
     sourceRoot = ".";
   };
 
+  vim-highlightedyank = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-highlightedyank-2017-01-04";
+    src = fetchgit {
+      url = "git://github.com/machakann/vim-highlightedyank";
+      rev = "17327fd1072ac15a30f596a2fc0b6cef122e0640";
+      sha256 = "08rc1br8npvkxxh3jn9hmn4yh4nlxy04c8nwyrnpndhw05kca33a";
+    };
+    dependencies = [];
+
+  };
+
   alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "alchemist.vim-2017-01-02";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 4be4c0a9722..2abf59efb66 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -75,6 +75,7 @@
 "github:lokaltog/vim-easymotion"
 "github:luochen1990/rainbow"
 "github:lyokha/vim-xkbswitch"
+"github:machakann/vim-highlightedyank"
 "github:mhinz/vim-startify"
 "github:mkasa/lushtags"
 "github:mpickering/hlint-refactor-vim"

From b017334b46c7addf83c9935af4f98cdc56d14534 Mon Sep 17 00:00:00 2001
From: Evan Danaher <github@edanaher.net>
Date: Fri, 3 Feb 2017 08:28:48 -0500
Subject: [PATCH 369/899] vim-plugins: add vim-scala

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 2ed082f0464..85a28e8f3ee 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -552,6 +552,17 @@ rec {
 
   };
 
+  vim-scala = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-scala-2016-08-02";
+    src = fetchgit {
+      url = "git://github.com/derekwyatt/vim-scala";
+      rev = "a6a350f7c632d0e640b57f9dcc7e123409a7bcd7";
+      sha256 = "108c5h02vcb3pnr3si8dhwq3mv2pj5d83mj1ljxdk9595xv8j2rp";
+    };
+    dependencies = [];
+
+  };
+
   vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-jade-2016-10-31";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 2abf59efb66..82df05dc04a 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -36,6 +36,7 @@
 "github:ctjhoa/spacevim"
 "github:ctrlpvim/ctrlp.vim"
 "github:derekelkins/agda-vim"
+"github:derekwyatt/vim-scala"
 "github:digitaltoad/vim-jade"
 "github:dracula/vim"
 "github:eagletmt/neco-ghc"

From 20db0d793f72c0bdd0868208d58866f9cd9f0b58 Mon Sep 17 00:00:00 2001
From: Evan Danaher <github@edanaher.net>
Date: Fri, 3 Feb 2017 08:29:33 -0500
Subject: [PATCH 370/899] vim-plugins: add neco-vim

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 85a28e8f3ee..dae7bf059a8 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -596,6 +596,17 @@ rec {
 
   };
 
+  neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "neco-vim-2017-01-16";
+    src = fetchgit {
+      url = "git://github.com/shougo/neco-vim";
+      rev = "d28e1ea78f90d72636895dbd758de6b35aae2dfa";
+      sha256 = "1qsyicxykl350zz86j7k6k9rflcf5nwrc5jbk9135zs5i8g1lqf3";
+    };
+    dependencies = [];
+
+  };
+
   editorconfig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "editorconfig-vim-2016-07-16";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 82df05dc04a..b65831d8c65 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -92,6 +92,7 @@
 "github:rust-lang/rust.vim"
 "github:sbdchd/neoformat"
 "github:sheerun/vim-polyglot"
+"github:shougo/neco-vim"
 "github:shougo/neocomplete.vim"
 "github:shougo/neosnippet-snippets"
 "github:shougo/neosnippet.vim"

From cdb59104f139aafaa2c8fa3f9085c4eee556c0be Mon Sep 17 00:00:00 2001
From: Evan Danaher <github@edanaher.net>
Date: Fri, 3 Feb 2017 08:42:39 -0500
Subject: [PATCH 371/899] neovim-remote: init at v1.4.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 477914e3836..57679082c54 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29806,6 +29806,23 @@ EOF
     '';
   };
 
+  neovim-remote = buildPythonPackage rec {
+    name = "neovim-remote-${version}";
+    version = "v1.4.0";
+    disabled = !isPy3k;
+
+    src = pkgs.fetchFromGitHub {
+      owner = "mhinz";
+      repo = "neovim-remote";
+      rev = version;
+      sha256 = "0msvfh27f56xj5ki59ikzavxz863nal5scm57n43618m49qzg8iz";
+    };
+
+    propagatedBuildInputs = [
+      self.neovim
+    ];
+  };
+
   ghp-import = buildPythonPackage rec {
     version = "0.4.1";
     name = "ghp-import-${version}";

From b02799a020c1742ed0a18b510c8ebf24c91eaaa5 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 3 Feb 2017 17:33:23 +0300
Subject: [PATCH 372/899] qtcreator: 4.2.0 -> 4.2.1

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

diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
index 1461e6232e6..ea7e7d0fb8e 100644
--- a/pkgs/development/qtcreator/default.nix
+++ b/pkgs/development/qtcreator/default.nix
@@ -7,7 +7,7 @@ with stdenv.lib;
 
 let
   baseVersion = "4.2";
-  revision = "0";
+  revision = "1";
 in
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.gz";
-    sha256 = "0yzj1i6hkzl9w1g8d5vidz7z6amwpj8p3cfibn9slf1sphxph18f";
+    sha256 = "0f2slaf579q2anflf524lbhmpwrwy3hzjfxzs10n44r7s7yc4dr5";
   };
 
   buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ];

From 99a83fbe1de57a25fc779a153075cdae7cc3e46e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 3 Feb 2017 17:46:20 +0300
Subject: [PATCH 373/899] qt5.env: use buildEnv

This both simplifies the code and ensures that libraries are linked too.
---
 pkgs/development/libraries/qt-5/qt-env.nix | 44 ++++++++++------------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/qt-env.nix b/pkgs/development/libraries/qt-5/qt-env.nix
index b2b7121d51d..fad68fbd745 100644
--- a/pkgs/development/libraries/qt-5/qt-env.nix
+++ b/pkgs/development/libraries/qt-5/qt-env.nix
@@ -1,28 +1,22 @@
-{ lib, runCommand, lndir, qtbase }: name: paths:
+{ lib, buildEnv, qtbase }: name: paths:
 
-runCommand name { qtbase = qtbase.dev; paths = lib.chooseDevOutputs paths;  } ''
+buildEnv {
+  inherit name;
+  paths = [ qtbase ] ++ paths;
 
-mkdir -p "$out/bin" "$out/mkspecs" "$out/include" "$out/lib" "$out/share"
+  pathsToLink = [ "/bin" "/mkspecs" "/include" "/lib" "/share" ];
+  extraOutputsToInstall = [ "dev" ];
 
-cp "$qtbase/bin/qmake" "$out/bin"
-cat >"$out/bin/qt.conf" <<EOF
-[Paths]
-Prefix = $out
-Plugins = lib/qt5/plugins
-Imports = lib/qt5/imports
-Qml2Imports = lib/qt5/qml
-Documentation = share/doc/qt5
-EOF
-
-for pkg in $paths $qtbase; do
-    if [[ -d "$pkg/mkspecs" ]]; then
-        ${lndir}/bin/lndir -silent "$pkg/mkspecs" "$out/mkspecs"
-
-        for dir in bin include lib share; do
-            if [[ -d "$pkg/$dir" ]]; then
-                ${lndir}/bin/lndir -silent "$pkg/$dir" "$out/$dir"
-            fi
-        done
-    fi
-done
-''
+  postBuild = ''
+    rm "$out/bin/qmake"
+    cp "${qtbase.dev}/bin/qmake" "$out/bin"
+    cat >"$out/bin/qt.conf" <<EOF
+    [Paths]
+    Prefix = $out
+    Plugins = lib/qt5/plugins
+    Imports = lib/qt5/imports
+    Qml2Imports = lib/qt5/qml
+    Documentation = share/doc/qt5
+    EOF
+  '';
+}

From c7d7ad1d9f5cf57970ca15757363c21a6218ca6d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 3 Feb 2017 18:19:44 +0300
Subject: [PATCH 374/899] qjackctl: don't use qt.full

---
 pkgs/applications/audio/qjackctl/default.nix | 9 +++++----
 pkgs/top-level/all-packages.nix              | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index c84e5cdfb49..52b94ca07d9 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, libjack2, dbus, qt5 }:
+{ stdenv, fetchurl, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }:
 
 stdenv.mkDerivation rec {
   version = "0.4.3";
@@ -12,14 +12,15 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    qt5.full
-    qt5.qtx11extras
+    qtbase
+    qtx11extras
+    qttools
     alsaLib
     libjack2
     dbus
   ];
 
-  configureFlags = "--enable-jack-version";
+  configureFlags = [ "--enable-jack-version" ];
 
   meta = with stdenv.lib; {
     description = "A Qt application to control the JACK sound server daemon";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04ce743e2a7..b53569a1195 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14670,7 +14670,7 @@ with pkgs;
 
   qgroundcontrol = qt55.callPackage ../applications/science/robotics/qgroundcontrol { };
 
-  qjackctl = callPackage ../applications/audio/qjackctl { };
+  qjackctl = qt5.callPackage ../applications/audio/qjackctl { };
 
   qmidinet = callPackage ../applications/audio/qmidinet { };
 

From 2c7e3f276db83a8667723a72510f855dfe4ac87e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 3 Feb 2017 18:19:54 +0300
Subject: [PATCH 375/899] keepassx-community: don't use qt.full

---
 pkgs/applications/misc/keepassx/community.nix | 4 ++--
 pkgs/top-level/all-packages.nix               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index 075de4dcb65..58b45786c40 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libgcrypt, qt5, zlib, libmicrohttpd, libXtst }:
+{ stdenv, fetchFromGitHub, cmake, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, qttools }:
 
 stdenv.mkDerivation rec {
   name = "keepassx-community-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0qwmi9f8ik3vkwl1kx7g3079h5ia4wl87y42nr5dal3ic1jc941p";
   };
 
-  buildInputs = [ cmake libgcrypt zlib qt5.full libXtst libmicrohttpd ];
+  buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd ];
 
   meta = {
     description = "Fork of the keepassX password-manager with additional http-interface to allow browser-integration an use with plugins such as PasslFox (https://github.com/pfn/passifox). See also keepassX2.";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b53569a1195..f71d8a00b9b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13142,7 +13142,7 @@ with pkgs;
 
   keepassx = callPackage ../applications/misc/keepassx { };
   keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { };
-  keepassx-community = callPackage ../applications/misc/keepassx/community.nix { };
+  keepassx-community = qt5.callPackage ../applications/misc/keepassx/community.nix { };
 
   inherit (gnome3) evince;
   evolution_data_server = gnome3.evolution_data_server;

From f0564ae299f7474a5555a841e1e2ffc2f2bef8ff Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 3 Feb 2017 18:20:06 +0300
Subject: [PATCH 376/899] cb2bib: don't use qt.full

---
 pkgs/applications/office/cb2bib/default.nix | 15 +++++++++------
 pkgs/top-level/all-packages.nix             |  4 +---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix
index aa246d241ca..abff61b881f 100644
--- a/pkgs/applications/office/cb2bib/default.nix
+++ b/pkgs/applications/office/cb2bib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt5Full, lzo, libX11 }:
+{ stdenv, fetchurl, qmakeHook, qtbase, qtwebkit, qtx11extras, lzo, libX11 }:
 
 stdenv.mkDerivation rec {
   name = pname + "-" + version;
@@ -8,10 +8,13 @@ stdenv.mkDerivation rec {
     url = "http://www.molspaces.com/dl/progs/${name}.tar.gz";
     sha256 = "0yz79v023w1229wzck3gij0iqah1xg8rg4a352q8idvg7bdmyfin";
   };
-  buildInputs = [ qt5Full lzo libX11 ];
-  QTDIR=qt5Full;
-  configurePhase =''
-    ./configure --prefix $out
+  buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ];
+  nativeBuildInputs = [ qmakeHook ];
+
+  configurePhase = ''
+    runHook preConfigure
+    ./configure --prefix $out --qmakepath $QMAKE
+    runHook postConfigure
   '';
 
   meta = with stdenv.lib; {
@@ -21,4 +24,4 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3;
   };
 
-}
\ No newline at end of file
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f71d8a00b9b..361b4408fd1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12627,9 +12627,7 @@ with pkgs;
 
   cava = callPackage ../applications/audio/cava { };
 
-  cb2bib = callPackage ../applications/office/cb2bib {
-    inherit (xorg) libX11;
-  };
+  cb2bib = qt5.callPackage ../applications/office/cb2bib { };
 
   cbatticon = callPackage ../applications/misc/cbatticon { };
 

From de9017ee68dfa4aaf4f7801b40cf377780d073df Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 3 Feb 2017 18:20:14 +0300
Subject: [PATCH 377/899] vokoscreen: don't use qt.full

---
 pkgs/applications/video/vokoscreen/default.nix | 15 ++++++++-------
 pkgs/top-level/all-packages.nix                |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix
index 7a9ea5f9095..204580b108f 100644
--- a/pkgs/applications/video/vokoscreen/default.nix
+++ b/pkgs/applications/video/vokoscreen/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit
-, pkgconfig, qt5, alsaLib, libv4l, xorg
+, pkgconfig, qtbase, qttools, qmakeHook, qtx11extras, alsaLib, libv4l, libXrandr
 , ffmpeg
 }:
 
@@ -12,13 +12,14 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    alsaLib.dev
-    libv4l.dev
+    alsaLib
+    libv4l
     pkgconfig
-    qt5.full
-    qt5.qmakeHook
-    qt5.qtx11extras
-    xorg.libXrandr.dev
+    qtbase
+    qttools
+    qmakeHook
+    qtx11extras
+    libXrandr
   ];
 
   patches = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 361b4408fd1..e657e9686eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17831,7 +17831,7 @@ with pkgs;
   vips = callPackage ../tools/graphics/vips { };
   nip2 = callPackage ../tools/graphics/nip2 { };
 
-  vokoscreen = callPackage ../applications/video/vokoscreen { };
+  vokoscreen = qt5.callPackage ../applications/video/vokoscreen { };
 
   wavegain = callPackage ../applications/audio/wavegain { };
 

From 8a67af13f46a75427958320f2d354294be8a1e62 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 3 Feb 2017 18:20:25 +0300
Subject: [PATCH 378/899] multimc: don't use qt.full

---
 pkgs/games/multimc/default.nix  | 6 +++---
 pkgs/top-level/all-packages.nix | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix
index 71c7e300a63..67f0a87df65 100644
--- a/pkgs/games/multimc/default.nix
+++ b/pkgs/games/multimc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, qt5Full, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qt5 }:
+{ stdenv, fetchFromGitHub, cmake, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, quazip }:
 
 let
   libnbt = fetchFromGitHub {
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     rev = "895d8ab4699f1b50bf03532c967a91f5ecb62a50";
     sha256 = "179vc1iv57fx4g4h1wy8yvyvdm671jnvp6zi8pcr1n6azqhwklds";
   };
-  buildInputs = [ cmake qt5Full jdk zlib file makeWrapper ];
+  buildInputs = [ cmake qtbase jdk zlib file makeWrapper ];
 
   libpath = with xorg; [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ];
   postUnpack = ''
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     cp -r ${libnbt} $sourceRoot/depends/libnbtplusplus
     chmod 755 -R $sourceRoot/depends/libnbtplusplus
     mkdir -pv $sourceRoot/build/
-    cp -v ${qt5.quazip.src} $sourceRoot/build/quazip-0.7.1.tar.gz
+    cp -v ${quazip.src} $sourceRoot/build/quazip-0.7.1.tar.gz
   '';
 
   patches = [ ./multimc.patch ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e657e9686eb..2fd58ceeaca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16133,7 +16133,7 @@ with pkgs;
 
   minecraft-server = callPackage ../games/minecraft-server { };
 
-  multimc = callPackage ../games/multimc { };
+  multimc = qt5.callPackage ../games/multimc { };
 
   minetest = callPackage ../games/minetest {
     libpng = libpng12;

From ddf3498e4f2c1465909fcd6c1782dcee96c3a21f Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Fri, 3 Feb 2017 13:17:41 +0000
Subject: [PATCH 379/899] joblib: Fix tests in python3.5

Failing with a process exited with -9 on occasion.
---
 pkgs/top-level/python-packages.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1880471bb58..a970b0da6f5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9348,6 +9348,9 @@ in {
     # Failing test on Python 3.x
     postPatch = '''' + optionalString isPy3k ''
       sed -i -e '70,84d' joblib/test/test_format_stack.py
+      # test_nested_parallel_warnings: ValueError: Non-zero return code: -9.
+      # Not sure why but it's nix-specific. Try removing for new joblib releases.
+      rm joblib/test/test_parallel.py
     '';
 
     meta = {

From 698f178d4ed1f04f58936fcfb1a0c0753ee69679 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Wed, 1 Feb 2017 10:33:58 +0100
Subject: [PATCH 380/899] default nixos config: add firewall options.

By showing how to open ports in the firewall and how to disable it, we make users aware that there is a firewall enabled by default.
---
 nixos/modules/installer/tools/nixos-generate-config.pl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index e17c02d1374..0a5624ff6a3 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -588,6 +588,12 @@ $bootLoaderConfig
   # Enable the OpenSSH daemon.
   # services.openssh.enable = true;
 
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+
   # Enable CUPS to print documents.
   # services.printing.enable = true;
 

From 500d48f5475fdd46773f2073cf432053602f761f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@ruiec.cat>
Date: Fri, 3 Feb 2017 15:17:36 +0100
Subject: [PATCH 381/899] minetest: use system jsoncpp

It was already in buildInputs but was not being used.
---
 pkgs/games/minetest/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix
index e28a83cc6a2..b8cfe512c37 100644
--- a/pkgs/games/minetest/default.nix
+++ b/pkgs/games/minetest/default.nix
@@ -27,6 +27,7 @@ in stdenv.mkDerivation {
   cmakeFlags = [
     "-DENABLE_FREETYPE=1"
     "-DENABLE_GETTEXT=1"
+    "-DENABLE_SYSTEM_JSONCPP=1"
     "-DGETTEXT_INCLUDE_DIR=${gettext}/include/gettext"
     "-DCURL_INCLUDE_DIR=${curl.dev}/include/curl"
     "-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht"

From eb0eed4205be28b2e661952236701e2742dbf61a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 3 Feb 2017 19:32:45 +0200
Subject: [PATCH 382/899] jenkins-job-builder: 1.4.0 -> 1.6.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 80f01c73477..37485ad9995 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29909,16 +29909,15 @@ EOF
   };
 
   jenkins-job-builder = buildPythonPackage rec {
-    name = "jenkins-job-builder-1.4.0";
+    name = "jenkins-job-builder-1.6.1";
     disabled = ! (isPy26 || isPy27);
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/j/jenkins-job-builder/${name}.tar.gz";
-      sha256 = "10zipq3dyyfhwvrcyk70zky07b0fssiahwig2h8daw977aszsfqb";
+      sha256 = "1v3xknfzgsp35nn3ma4imz233v569v3x75mx2yxlv1xf32nn7yk4";
     };
 
     patchPhase = ''
-      sed -i '/ordereddict/d' requirements.txt
       export HOME=$TMPDIR
     '';
 

From 77b72ae355cc036512bc6dc6a46039290fde04fc Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 3 Feb 2017 18:41:57 +0100
Subject: [PATCH 383/899] wget: 1.18 -> 1.19

See http://lists.gnu.org/archive/html/info-gnu/2017-02/msg00000.html
for release announcement.
---
 pkgs/tools/networking/wget/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index 1d4791ffdde..7362403d060 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -3,11 +3,11 @@
 , libiconv, libpsl ? null, openssl ? null }:
 
 stdenv.mkDerivation rec {
-  name = "wget-1.18";
+  name = "wget-1.19";
 
   src = fetchurl {
     url = "mirror://gnu/wget/${name}.tar.xz";
-    sha256 = "1hcwx8ww3sxzdskkx3l7q70a7wd6569yrnjkw9pw013cf9smpddm";
+    sha256 = "1133c14g19ysv74j7am66jwgwrr0rdn0rdyxw7rikbnsyjxmf48g";
   };
 
   patches = [ ./remove-runtime-dep-on-openssl-headers.patch ];

From 0c31286f753ce39bd73847811eb69e2136520d0f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 3 Feb 2017 18:41:18 +0100
Subject: [PATCH 384/899] grsecurity docs: some polish

Fix minor formatting issues, excessive punctuation, and also some
improved wording.
---
 nixos/modules/security/grsecurity.xml | 38 ++++++++++++++-------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/nixos/modules/security/grsecurity.xml b/nixos/modules/security/grsecurity.xml
index a7bcf4924f0..ef0aab4a3f1 100644
--- a/nixos/modules/security/grsecurity.xml
+++ b/nixos/modules/security/grsecurity.xml
@@ -7,21 +7,20 @@
   <title>Grsecurity/PaX</title>
 
   <para>
-    Grsecurity/PaX is a set of patches against the Linux kernel that make it
-    harder to exploit bugs.  The patchset includes protections such as
-    enforcement of non-executable memory, address space layout randomization,
-    and chroot jail hardening.  These and other
+    Grsecurity/PaX is a set of patches against the Linux kernel that
+    implements an extensive suite of
     <link xlink:href="https://grsecurity.net/features.php">features</link>
-    render entire classes of exploits inert without additional efforts on the
-    part of the adversary.
+    designed to increase the difficulty of exploiting kernel and
+    application bugs.
   </para>
 
   <para>
     The NixOS grsecurity/PaX module is designed with casual users in mind and is
-    intended to be compatible with normal desktop usage, without unnecessarily
-    compromising security.  The following sections describe the configuration
-    and administration of a grsecurity/PaX enabled NixOS system.  For
-    more comprehensive coverage, please refer to the
+    intended to be compatible with normal desktop usage, without
+    <emphasis>unnecessarily</emphasis> compromising security.  The
+    following sections describe the configuration and administration of
+    a grsecurity/PaX enabled NixOS system.  For more comprehensive
+    coverage, please refer to the
     <link xlink:href="https://en.wikibooks.org/wiki/Grsecurity">grsecurity wikibook</link>
     and the
     <link xlink:href="https://wiki.archlinux.org/index.php/Grsecurity">Arch
@@ -35,7 +34,7 @@
     and each configuration requires quite a bit of testing to ensure that the
     resulting packages work as advertised.  Defining additional package sets
     would likely result in a large number of functionally broken packages, to
-    nobody's benefit.</para></note>.
+    nobody's benefit.</para></note>
   </para>
 
   <sect1 xml:id="sec-grsec-enable"><title>Enabling grsecurity/PaX</title>
@@ -126,10 +125,10 @@
     The NixOS kernel is built using upstream's recommended settings for a
     desktop deployment that generally favours security over performance.  This
     section details deviations from upstream's recommendations that may
-    compromise operational security.
+    compromise security.
 
     <warning><para>There may be additional problems not covered here!</para>
-    </warning>.
+    </warning>
   </para>
 
   <itemizedlist>
@@ -159,8 +158,8 @@
     <listitem><para>
       The NixOS module conditionally weakens <command>chroot</command>
       restrictions to accommodate NixOS lightweight containers and sandboxed Nix
-      builds.  This is problematic if the deployment also runs a privileged
-      network facing process that <emphasis>relies</emphasis> on
+      builds.  This can be problematic if the deployment also runs privileged
+      network facing processes that <emphasis>rely</emphasis> on
       <command>chroot</command> for isolation.
     </para></listitem>
 
@@ -221,15 +220,18 @@
   </para>
 
   <para>
-    The wikibook provides an exhaustive listing of
+    The grsecurity/PaX wikibook provides an exhaustive listing of
     <link xlink:href="https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options">kernel configuration options</link>.
   </para>
 
   <para>
     The NixOS module makes several assumptions about the kernel and so
     may be incompatible with your customised kernel. Currently, the only way
-    to work around incompatibilities is to eschew the NixOS module.
+    to work around these incompatibilities is to eschew the NixOS
+    module.
+  </para>
 
+  <para>
     If not using the NixOS module, a custom grsecurity package set can
     be specified inline instead, as in
     <programlisting>
@@ -290,7 +292,7 @@
 
     <listitem><para>User initiated autoloading of modules (e.g., when
     using fuse or loop devices) is disallowed; either load requisite modules
-    as root or add them to<option>boot.kernelModules</option>.</para></listitem>
+    as root or add them to <option>boot.kernelModules</option>.</para></listitem>
 
     <listitem><para>Virtualization: KVM is the preferred virtualization
     solution. Xen, Virtualbox, and VMWare are

From 0911d745f8de004c6230b98f89c8f4bf32902af0 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 3 Feb 2017 18:46:28 +0100
Subject: [PATCH 385/899] os-prober: 1.71 -> 1.73

https://anonscm.debian.org/cgit/d-i/os-prober.git/tree/debian/changelog
---
 pkgs/tools/misc/os-prober/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix
index fb62043739c..87659802e50 100644
--- a/pkgs/tools/misc/os-prober/default.nix
+++ b/pkgs/tools/misc/os-prober/default.nix
@@ -11,11 +11,11 @@ ntfs3g ? null
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.71";
+  version = "1.73";
   name = "os-prober-${version}";
   src = fetchurl {
     url = "mirror://debian/pool/main/o/os-prober/os-prober_${version}.tar.xz";
-    sha256 = "5d6141e02b58e82194422b97d683d61c7ff78175d89c2f055f5d2e7a363bdd20";
+    sha256 = "1prssbwdgj5c33zhl3ldgaxk7lab9qvs4zhyrhag88wiivirb0sq";
   };
 
   buildInputs = [ makeWrapper ];

From 0bae18fb55ea7bf42d6d7fd49630eaaa2906ed84 Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Fri, 3 Feb 2017 15:29:20 -0200
Subject: [PATCH 386/899] sane service: mention the lp group for
 printer+scanners

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

diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix
index 8ddb9ef9c53..d651ccaa577 100644
--- a/nixos/modules/services/hardware/sane.nix
+++ b/nixos/modules/services/hardware/sane.nix
@@ -51,7 +51,7 @@ in
         Enable support for SANE scanners.
 
         <note><para>
-          Users in the "scanner" group will gain access to the scanner.
+          Users in the "scanner" group will gain access to the scanner, or the "lp" group if it's also a printer.
         </para></note>
       '';
     };

From 7d00b5faed8c1caba9ecc146013ad333c5864d37 Mon Sep 17 00:00:00 2001
From: Ollie Charles <ollie@ocharles.org.uk>
Date: Fri, 3 Feb 2017 17:57:35 +0000
Subject: [PATCH 387/899] muchsync: init at 2

---
 .../networking/mailreaders/notmuch/muchsync.nix      | 12 ++++++++++++
 pkgs/top-level/all-packages.nix                      |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/applications/networking/mailreaders/notmuch/muchsync.nix

diff --git a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
new file mode 100644
index 00000000000..284ea1f50c5
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
@@ -0,0 +1,12 @@
+{ stdenv, fetchurl
+, notmuch, openssl, pkgconfig, sqlite, xapian
+}:
+stdenv.mkDerivation rec {
+  version = "2";
+  name = "muchsync-${version}";
+  src = fetchurl {
+    url = "http://www.muchsync.org/src/${name}.tar.gz";
+    sha256 = "1dqp23a043kkzl0g2f4j3m7r7lg303gz7a0fsj0dm5ag3kpvp5f1";
+  };
+  buildInputs = [ notmuch openssl pkgconfig sqlite xapian ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 387d2b232c4..c16ff470645 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14404,6 +14404,8 @@ with pkgs;
 
   notmuch-mutt = callPackage ../applications/networking/mailreaders/notmuch/mutt.nix { };
 
+  muchsync = callPackage ../applications/networking/mailreaders/notmuch/muchsync.nix { };
+
   notmuch-addrlookup = callPackage ../applications/networking/mailreaders/notmuch-addrlookup { };
 
   # Open Stack

From 3c05174f070ad818b2ce8683d008dd755dade9c8 Mon Sep 17 00:00:00 2001
From: Ollie Charles <ollie@ocharles.org.uk>
Date: Fri, 3 Feb 2017 18:01:37 +0000
Subject: [PATCH 388/899] muchsync: Add meta attributes

---
 .../networking/mailreaders/notmuch/muchsync.nix          | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
index 284ea1f50c5..17d66ba6043 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
@@ -4,9 +4,18 @@
 stdenv.mkDerivation rec {
   version = "2";
   name = "muchsync-${version}";
+  passthru = {
+    inherit version;
+  };
   src = fetchurl {
     url = "http://www.muchsync.org/src/${name}.tar.gz";
     sha256 = "1dqp23a043kkzl0g2f4j3m7r7lg303gz7a0fsj0dm5ag3kpvp5f1";
   };
   buildInputs = [ notmuch openssl pkgconfig sqlite xapian ];
+  meta = {
+    description = "Synchronize maildirs and notmuch databases";
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ ocharles ];
+    license = stdenv.lib.licenses.gpl2Plus;
+  };
 }

From ede8adc441242805b343a75dfefa09a9893e2be1 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 3 Feb 2017 20:14:00 +0300
Subject: [PATCH 389/899] tcp_wrappers: 7.6.q -> 7.6.q-26

I've accidentially taken old Debian patchset. Maybe this also helps with Darwin failures.
---
 pkgs/os-specific/linux/tcp-wrappers/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix
index 105a4cacd82..850fbe9f449 100644
--- a/pkgs/os-specific/linux/tcp-wrappers/default.nix
+++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix
@@ -1,23 +1,25 @@
 { fetchurl, stdenv }:
 
-stdenv.mkDerivation rec {
+let
+  vanillaVersion = "7.6.q";
+  patchLevel = "26";
+in stdenv.mkDerivation rec {
   name = "tcp-wrappers-${version}";
-  version = "7.6.q";
+  version = "${vanillaVersion}-${patchLevel}";
 
   src = fetchurl {
-    url = "mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_${version}.orig.tar.gz";
+    url = "mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_${vanillaVersion}.orig.tar.gz";
     sha256 = "0p9ilj4v96q32klavx0phw9va21fjp8vpk11nbh6v2ppxnnxfhwm";
   };
 
   debian = fetchurl {
-    url = "mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_${version}-24.debian.tar.xz";
-    sha256 = "1kgax35rwaj5q8nf8fw60aczvxj99h2jjp7iv1f82y85yz9x0ak7";
+    url = "mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_${version}.debian.tar.xz";
+    sha256 = "1dcdhi9lwzv7g19ggwxms2msq9fy14rl09rjqb10hwv0jix7z8j8";
   };
 
   prePatch = ''
     tar -xaf $debian
-    shopt -s extglob
-    patches="$(echo debian/patches/!(series)) $patches"
+    patches="$(cat debian/patches/series | sed 's,^,debian/patches/,') $patches"
   '';
 
   makeFlags = [ "REAL_DAEMON_DIR=$(out)/bin" "linux" ];

From ef3fc82fc4c5d90e4e062d3b6300baab92b3c825 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 3 Feb 2017 19:41:40 +0100
Subject: [PATCH 390/899] mujs: 2016-11-30 -> 2017-01-24

---
 pkgs/development/interpreters/mujs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix
index 0a87d037454..c7663a11676 100644
--- a/pkgs/development/interpreters/mujs/default.nix
+++ b/pkgs/development/interpreters/mujs/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, clang }:
 
 stdenv.mkDerivation rec {
-  name = "mujs-2016-11-30";
+  name = "mujs-2017-01-24";
 
   src = fetchgit {
     url = git://git.ghostscript.com/mujs.git;
-    rev  = "a0ceaf5050faf419401fe1b83acfa950ec8a8a89";
-    sha256 = "13abghhqrivaip4h0fav80i8hid220dj0ddc1xnhn6w9rbnrriyg";
+    rev  = "4006739a28367c708dea19aeb19b8a1a9326ce08";
+    sha256 = "0wvjl8lkh0ga6fkmxgjqq77yagncbv1bdy6hpnxq31x3mkwn1s51";
   };
 
   buildInputs = [ clang ];

From 0788889220356d31c0444a2b6379a5cf1b090cc0 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Tue, 17 Jan 2017 19:32:43 +0100
Subject: [PATCH 391/899] dnschain: fix build

---
 pkgs/servers/dnschain/default.nix |  56 ++-
 pkgs/servers/dnschain/package.nix | 552 +++++++++++++++---------------
 pkgs/top-level/all-packages.nix   |   2 +-
 3 files changed, 319 insertions(+), 291 deletions(-)

diff --git a/pkgs/servers/dnschain/default.nix b/pkgs/servers/dnschain/default.nix
index b1714101856..52cccae50c5 100644
--- a/pkgs/servers/dnschain/default.nix
+++ b/pkgs/servers/dnschain/default.nix
@@ -1,11 +1,51 @@
-{ stdenv, nodePackages }:
-
-# to update dnschain, run npm2nix package.json package.nix, and
-# then add "coffee-script" manually as a dependecy for "dnschain"
-# in package.nix.
+{ stdenv, fetchFromGitHub, callPackage, makeWrapper, openssl }:
 
 let
-  np = nodePackages.override { generated = ./package.nix; self = np; };
-in
+  nodePackages = callPackage (import ../../top-level/node-packages.nix) {
+    self = nodePackages;
+    generated = ./package.nix;
+  };
 
-np.dnschain
+in nodePackages.buildNodePackage rec {
+  name    = "dnschain-${version}";
+  version = "0.5.3";
+
+  src = fetchFromGitHub {
+    owner  = "okTurtles";
+    repo   = "dnschain";
+    rev    = "a8d477f9ad33d7790f94ffc563e2205823e62515";
+    sha256 = "0j5glbxf0fxnxl4l1lysb3a619b18rk0l1ks57wd255llc2mw7zy";
+  };
+
+  deps = with nodePackages; [
+    by-spec."bluebird"."2.9.9"
+    by-spec."bottleneck"."1.5.x"
+    by-spec."event-stream"."3.2.2"
+    by-spec."express"."4.11.2"
+    by-spec."hiredis"."0.4.1"
+    by-spec."json-rpc2"."0.8.1"
+    by-spec."lodash"."3.1.0"
+    by-spec."native-dns"."git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402"
+    by-spec."native-dns-packet"."0.1.1"
+    by-spec."nconf"."0.7.1"
+    by-spec."properties"."1.2.1"
+    by-spec."redis"."0.12.x"
+    by-spec."string"."2.0.1"
+    by-spec."winston"."0.8.0"
+    by-spec."superagent"."0.21.0"
+  ];
+
+  buildInputs = [ makeWrapper nodePackages.coffee-script ];
+  postInstall = ''
+      wrapProgram $out/bin/dnschain --suffix PATH : ${openssl.bin}/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A blockchain-based DNS + HTTP server";
+    homepage    = https://okturtles.com/;
+    license     = licenses.mpl20;
+    maintainers = with maintainers; [ rnhmjoj ];
+    platforms   = platforms.unix;
+  };
+
+}
diff --git a/pkgs/servers/dnschain/package.nix b/pkgs/servers/dnschain/package.nix
index 8077cb0f01f..600f5a94684 100644
--- a/pkgs/servers/dnschain/package.nix
+++ b/pkgs/servers/dnschain/package.nix
@@ -1,3 +1,4 @@
+
 { self, fetchurl, fetchgit ? null, lib }:
 
 {
@@ -8,12 +9,12 @@
     version = "1.2.13";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz";
+      url = "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz";
       name = "accepts-1.2.13.tgz";
       sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea";
     };
     deps = {
-      "mime-types-2.1.6" = self.by-version."mime-types"."2.1.6";
+      "mime-types-2.1.14" = self.by-version."mime-types"."2.1.14";
       "negotiator-0.5.3" = self.by-version."negotiator"."0.5.3";
     };
     optionalDependencies = {
@@ -22,6 +23,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."assert-plus"."^1.0.0" =
+    self.by-version."assert-plus"."1.0.0";
+  by-version."assert-plus"."1.0.0" = self.buildNodePackage {
+    name = "assert-plus-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";
+      name = "assert-plus-1.0.0.tgz";
+      sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."async"."0.2.x" =
     self.by-version."async"."0.2.10";
   by-version."async"."0.2.10" = self.buildNodePackage {
@@ -29,7 +49,7 @@
     version = "0.2.10";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz";
+      url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz";
       name = "async-0.2.10.tgz";
       sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
     };
@@ -48,7 +68,7 @@
     version = "0.9.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/async/-/async-0.9.2.tgz";
+      url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz";
       name = "async-0.9.2.tgz";
       sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
     };
@@ -67,7 +87,7 @@
     version = "1.6.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/better-curry/-/better-curry-1.6.0.tgz";
+      url = "https://registry.npmjs.org/better-curry/-/better-curry-1.6.0.tgz";
       name = "better-curry-1.6.0.tgz";
       sha1 = "38f716b24c8cee07a262abc41c22c314e20e3869";
     };
@@ -86,7 +106,7 @@
     version = "0.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/binaryheap/-/binaryheap-0.0.3.tgz";
+      url = "https://registry.npmjs.org/binaryheap/-/binaryheap-0.0.3.tgz";
       name = "binaryheap-0.0.3.tgz";
       sha1 = "0d6136c84e9f1a5a90c0b97178c3e00df59820d6";
     };
@@ -105,7 +125,7 @@
     version = "1.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz";
+      url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz";
       name = "bindings-1.2.1.tgz";
       sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
     };
@@ -124,7 +144,7 @@
     version = "2.9.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.9.tgz";
+      url = "https://registry.npmjs.org/bluebird/-/bluebird-2.9.9.tgz";
       name = "bluebird-2.9.9.tgz";
       sha1 = "61a26904d43d7f6b19dff7ed917dbc92452ad6d3";
     };
@@ -143,7 +163,7 @@
     version = "1.5.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bottleneck/-/bottleneck-1.5.3.tgz";
+      url = "https://registry.npmjs.org/bottleneck/-/bottleneck-1.5.3.tgz";
       name = "bottleneck-1.5.3.tgz";
       sha1 = "55fa64920d9670087d44150404525d59f9511c20";
     };
@@ -162,12 +182,12 @@
     version = "0.0.12";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/buffercursor/-/buffercursor-0.0.12.tgz";
+      url = "https://registry.npmjs.org/buffercursor/-/buffercursor-0.0.12.tgz";
       name = "buffercursor-0.0.12.tgz";
       sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779";
     };
     deps = {
-      "verror-1.6.0" = self.by-version."verror"."1.6.0";
+      "verror-1.9.0" = self.by-version."verror"."1.9.0";
     };
     optionalDependencies = {
     };
@@ -178,15 +198,15 @@
   by-spec."buffercursor".">= 0.0.5" =
     self.by-version."buffercursor"."0.0.12";
   by-spec."coffee-script"."*" =
-    self.by-version."coffee-script"."1.10.0";
-  by-version."coffee-script"."1.10.0" = self.buildNodePackage {
-    name = "coffee-script-1.10.0";
-    version = "1.10.0";
+    self.by-version."coffee-script"."1.12.2";
+  by-version."coffee-script"."1.12.2" = self.buildNodePackage {
+    name = "coffee-script-1.12.2";
+    version = "1.12.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.10.0.tgz";
-      name = "coffee-script-1.10.0.tgz";
-      sha1 = "12938bcf9be1948fa006f92e0c4c9e81705108c0";
+      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz";
+      name = "coffee-script-1.12.2.tgz";
+      sha1 = "0d4cbdee183f650da95419570c4929d08ef91376";
     };
     deps = {
     };
@@ -196,7 +216,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "coffee-script" = self.by-version."coffee-script"."1.10.0";
+  "coffee-script" = self.by-version."coffee-script"."1.12.2";
   by-spec."colors"."0.6.x" =
     self.by-version."colors"."0.6.2";
   by-version."colors"."0.6.2" = self.buildNodePackage {
@@ -204,7 +224,7 @@
     version = "0.6.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
+      url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
       name = "colors-0.6.2.tgz";
       sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc";
     };
@@ -223,7 +243,7 @@
     version = "0.0.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
+      url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
       name = "combined-stream-0.0.7.tgz";
       sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
     };
@@ -243,7 +263,7 @@
     version = "1.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz";
+      url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz";
       name = "component-emitter-1.1.2.tgz";
       sha1 = "296594f2753daa63996d2af08d15a95116c9aec3";
     };
@@ -262,7 +282,7 @@
     version = "0.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz";
+      url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz";
       name = "content-disposition-0.5.0.tgz";
       sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e";
     };
@@ -281,7 +301,7 @@
     version = "0.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz";
+      url = "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz";
       name = "cookie-0.1.2.tgz";
       sha1 = "72fec3d24e48a3432073d90c12642005061004b1";
     };
@@ -300,7 +320,7 @@
     version = "1.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz";
+      url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz";
       name = "cookie-signature-1.0.5.tgz";
       sha1 = "a122e3f1503eca0f5355795b0711bb2368d450f9";
     };
@@ -319,7 +339,7 @@
     version = "2.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz";
+      url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz";
       name = "cookiejar-2.0.1.tgz";
       sha1 = "3d12752f6adf68a892f332433492bd5812bb668f";
     };
@@ -331,16 +351,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."core-util-is"."~1.0.0" =
-    self.by-version."core-util-is"."1.0.1";
-  by-version."core-util-is"."1.0.1" = self.buildNodePackage {
-    name = "core-util-is-1.0.1";
-    version = "1.0.1";
+  by-spec."core-util-is"."1.0.2" =
+    self.by-version."core-util-is"."1.0.2";
+  by-version."core-util-is"."1.0.2" = self.buildNodePackage {
+    name = "core-util-is-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz";
-      name = "core-util-is-1.0.1.tgz";
-      sha1 = "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538";
+      url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
+      name = "core-util-is-1.0.2.tgz";
+      sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
     };
     deps = {
     };
@@ -350,6 +370,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."core-util-is"."~1.0.0" =
+    self.by-version."core-util-is"."1.0.2";
   by-spec."crc"."3.2.1" =
     self.by-version."crc"."3.2.1";
   by-version."crc"."3.2.1" = self.buildNodePackage {
@@ -357,7 +379,7 @@
     version = "3.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/crc/-/crc-3.2.1.tgz";
+      url = "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz";
       name = "crc-3.2.1.tgz";
       sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082";
     };
@@ -376,7 +398,7 @@
     version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz";
+      url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz";
       name = "cycle-1.0.3.tgz";
       sha1 = "21e80b2be8580f98b468f379430662b046c34ad2";
     };
@@ -395,7 +417,7 @@
     version = "1.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/debug/-/debug-1.0.4.tgz";
+      url = "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz";
       name = "debug-1.0.4.tgz";
       sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8";
     };
@@ -409,18 +431,18 @@
     cpu = [ ];
   };
   by-spec."debug"."2" =
-    self.by-version."debug"."2.2.0";
-  by-version."debug"."2.2.0" = self.buildNodePackage {
-    name = "debug-2.2.0";
-    version = "2.2.0";
+    self.by-version."debug"."2.6.0";
+  by-version."debug"."2.6.0" = self.buildNodePackage {
+    name = "debug-2.6.0";
+    version = "2.6.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
-      name = "debug-2.2.0.tgz";
-      sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
+      url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz";
+      name = "debug-2.6.0.tgz";
+      sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b";
     };
     deps = {
-      "ms-0.7.1" = self.by-version."ms"."0.7.1";
+      "ms-0.7.2" = self.by-version."ms"."0.7.2";
     };
     optionalDependencies = {
     };
@@ -435,7 +457,7 @@
     version = "2.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/debug/-/debug-2.1.3.tgz";
+      url = "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz";
       name = "debug-2.1.3.tgz";
       sha1 = "ce8ab1b5ee8fbee2bfa3b633cab93d366b63418e";
     };
@@ -455,7 +477,7 @@
     version = "0.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
+      url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
       name = "delayed-stream-0.0.5.tgz";
       sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
     };
@@ -474,7 +496,7 @@
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/depd/-/depd-1.0.1.tgz";
+      url = "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz";
       name = "depd-1.0.1.tgz";
       sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa";
     };
@@ -493,7 +515,7 @@
     version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz";
+      url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz";
       name = "destroy-1.0.3.tgz";
       sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9";
     };
@@ -505,42 +527,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."dnschain"."*" =
-    self.by-version."dnschain"."0.5.3";
-  by-version."dnschain"."0.5.3" = self.buildNodePackage {
-    name = "dnschain-0.5.3";
-    version = "0.5.3";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/dnschain/-/dnschain-0.5.3.tgz";
-      name = "dnschain-0.5.3.tgz";
-      sha1 = "9b21d9ac5e203295f372ac37df470e9f0854c470";
-    };
-    deps = {
-      "bluebird-2.9.9" = self.by-version."bluebird"."2.9.9";
-      "bottleneck-1.5.3" = self.by-version."bottleneck"."1.5.3";
-      "event-stream-3.2.2" = self.by-version."event-stream"."3.2.2";
-      "express-4.11.2" = self.by-version."express"."4.11.2";
-      "hiredis-0.4.1" = self.by-version."hiredis"."0.4.1";
-      "json-rpc2-0.8.1" = self.by-version."json-rpc2"."0.8.1";
-      "lodash-3.1.0" = self.by-version."lodash"."3.1.0";
-      "native-dns-0.6.1" = self.by-version."native-dns"."0.6.1";
-      "native-dns-packet-0.1.1" = self.by-version."native-dns-packet"."0.1.1";
-      "nconf-0.7.1" = self.by-version."nconf"."0.7.1";
-      "properties-1.2.1" = self.by-version."properties"."1.2.1";
-      "redis-0.12.1" = self.by-version."redis"."0.12.1";
-      "string-2.0.1" = self.by-version."string"."2.0.1";
-      "winston-0.8.0" = self.by-version."winston"."0.8.0";
-      "superagent-0.21.0" = self.by-version."superagent"."0.21.0";
-      "coffee-script-1.10.0" = self.by-version."coffee-script"."1.10.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "dnschain" = self.by-version."dnschain"."0.5.3";
   by-spec."duplexer"."~0.1.1" =
     self.by-version."duplexer"."0.1.1";
   by-version."duplexer"."0.1.1" = self.buildNodePackage {
@@ -548,7 +534,7 @@
     version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz";
+      url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz";
       name = "duplexer-0.1.1.tgz";
       sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1";
     };
@@ -567,7 +553,7 @@
     version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz";
+      url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz";
       name = "ee-first-1.1.0.tgz";
       sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4";
     };
@@ -586,7 +572,7 @@
     version = "2.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/es5class/-/es5class-2.3.1.tgz";
+      url = "https://registry.npmjs.org/es5class/-/es5class-2.3.1.tgz";
       name = "es5class-2.3.1.tgz";
       sha1 = "42c5c18a9016bcb0db28a4d340ebb831f55d1b66";
     };
@@ -606,7 +592,7 @@
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz";
+      url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz";
       name = "escape-html-1.0.1.tgz";
       sha1 = "181a286ead397a39a92857cfb1d43052e356bff0";
     };
@@ -625,7 +611,7 @@
     version = "1.5.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/etag/-/etag-1.5.1.tgz";
+      url = "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz";
       name = "etag-1.5.1.tgz";
       sha1 = "54c50de04ee42695562925ac566588291be7e9ea";
     };
@@ -645,7 +631,7 @@
     version = "3.2.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/event-stream/-/event-stream-3.2.2.tgz";
+      url = "https://registry.npmjs.org/event-stream/-/event-stream-3.2.2.tgz";
       name = "event-stream-3.2.2.tgz";
       sha1 = "f79f9984c07ee3fd9b44ffb3cd0422b13e24084d";
     };
@@ -671,7 +657,7 @@
     version = "0.1.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.6.tgz";
+      url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.6.tgz";
       name = "eventemitter3-0.1.6.tgz";
       sha1 = "8c7ac44b87baab55cd50c828dc38778eac052ea5";
     };
@@ -690,7 +676,7 @@
     version = "4.11.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/express/-/express-4.11.2.tgz";
+      url = "https://registry.npmjs.org/express/-/express-4.11.2.tgz";
       name = "express-4.11.2.tgz";
       sha1 = "8df3d5a9ac848585f00a0777601823faecd3b148";
     };
@@ -705,13 +691,13 @@
       "finalhandler-0.3.3" = self.by-version."finalhandler"."0.3.3";
       "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
       "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
-      "methods-1.1.1" = self.by-version."methods"."1.1.1";
+      "methods-1.1.2" = self.by-version."methods"."1.1.2";
       "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
+      "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1";
       "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3";
-      "proxy-addr-1.0.8" = self.by-version."proxy-addr"."1.0.8";
+      "proxy-addr-1.0.10" = self.by-version."proxy-addr"."1.0.10";
       "qs-2.3.3" = self.by-version."qs"."2.3.3";
-      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
+      "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3";
       "send-0.11.1" = self.by-version."send"."0.11.1";
       "serve-static-1.8.1" = self.by-version."serve-static"."1.8.1";
       "type-is-1.5.7" = self.by-version."type-is"."1.5.7";
@@ -733,7 +719,7 @@
     version = "1.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/extend/-/extend-1.2.1.tgz";
+      url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz";
       name = "extend-1.2.1.tgz";
       sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c";
     };
@@ -745,16 +731,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."extsprintf"."1.2.0" =
-    self.by-version."extsprintf"."1.2.0";
-  by-version."extsprintf"."1.2.0" = self.buildNodePackage {
-    name = "extsprintf-1.2.0";
-    version = "1.2.0";
+  by-spec."extsprintf"."^1.2.0" =
+    self.by-version."extsprintf"."1.3.0";
+  by-version."extsprintf"."1.3.0" = self.buildNodePackage {
+    name = "extsprintf-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz";
-      name = "extsprintf-1.2.0.tgz";
-      sha1 = "5ad946c22f5b32ba7f8cd7426711c6e8a3fc2529";
+      url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz";
+      name = "extsprintf-1.3.0.tgz";
+      sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
     };
     deps = {
     };
@@ -771,7 +757,7 @@
     version = "0.1.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
+      url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
       name = "eyes-0.1.8.tgz";
       sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0";
     };
@@ -784,18 +770,18 @@
     cpu = [ ];
   };
   by-spec."faye-websocket"."0.x.x" =
-    self.by-version."faye-websocket"."0.10.0";
-  by-version."faye-websocket"."0.10.0" = self.buildNodePackage {
-    name = "faye-websocket-0.10.0";
-    version = "0.10.0";
+    self.by-version."faye-websocket"."0.11.0";
+  by-version."faye-websocket"."0.11.0" = self.buildNodePackage {
+    name = "faye-websocket-0.11.0";
+    version = "0.11.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz";
-      name = "faye-websocket-0.10.0.tgz";
-      sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4";
+      url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.0.tgz";
+      name = "faye-websocket-0.11.0.tgz";
+      sha1 = "d9ccf0e789e7db725d74bc4877d23aa42972ac50";
     };
     deps = {
-      "websocket-driver-0.6.2" = self.by-version."websocket-driver"."0.6.2";
+      "websocket-driver-0.6.5" = self.by-version."websocket-driver"."0.6.5";
     };
     optionalDependencies = {
     };
@@ -810,7 +796,7 @@
     version = "0.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.3.tgz";
+      url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.3.3.tgz";
       name = "finalhandler-0.3.3.tgz";
       sha1 = "b1a09aa1e6a607b3541669b09bcb727f460cd426";
     };
@@ -832,7 +818,7 @@
     version = "0.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz";
+      url = "https://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz";
       name = "form-data-0.1.3.tgz";
       sha1 = "4ee4346e6eb5362e8344a02075bd8dbd8c7373ea";
     };
@@ -854,7 +840,7 @@
     version = "1.0.14";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz";
+      url = "https://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz";
       name = "formidable-1.0.14.tgz";
       sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a";
     };
@@ -873,7 +859,7 @@
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz";
+      url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz";
       name = "forwarded-0.1.0.tgz";
       sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363";
     };
@@ -892,7 +878,7 @@
     version = "0.2.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz";
+      url = "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz";
       name = "fresh-0.2.4.tgz";
       sha1 = "3582499206c9723714190edd74b4604feb4a614c";
     };
@@ -911,7 +897,7 @@
     version = "0.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/from/-/from-0.1.3.tgz";
+      url = "https://registry.npmjs.org/from/-/from-0.1.3.tgz";
       name = "from-0.1.3.tgz";
       sha1 = "ef63ac2062ac32acf7862e0d40b44b896f22f3bc";
     };
@@ -930,13 +916,13 @@
     version = "0.4.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hiredis/-/hiredis-0.4.1.tgz";
+      url = "https://registry.npmjs.org/hiredis/-/hiredis-0.4.1.tgz";
       name = "hiredis-0.4.1.tgz";
       sha1 = "aab4dcfd0fc4cbdb219d268005f2335a3c639e8f";
     };
     deps = {
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
-      "nan-2.0.8" = self.by-version."nan"."2.0.8";
+      "nan-2.5.0" = self.by-version."nan"."2.5.0";
     };
     optionalDependencies = {
     };
@@ -945,15 +931,15 @@
     cpu = [ ];
   };
   by-spec."inherits"."~2.0.1" =
-    self.by-version."inherits"."2.0.1";
-  by-version."inherits"."2.0.1" = self.buildNodePackage {
-    name = "inherits-2.0.1";
-    version = "2.0.1";
+    self.by-version."inherits"."2.0.3";
+  by-version."inherits"."2.0.3" = self.buildNodePackage {
+    name = "inherits-2.0.3";
+    version = "2.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
-      name = "inherits-2.0.1.tgz";
-      sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
+      url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
+      name = "inherits-2.0.3.tgz";
+      sha1 = "633c2c83e3da42a502f52466022480f4208261de";
     };
     deps = {
     };
@@ -970,7 +956,7 @@
     version = "1.3.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ini/-/ini-1.3.4.tgz";
+      url = "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz";
       name = "ini-1.3.4.tgz";
       sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e";
     };
@@ -982,16 +968,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ipaddr.js"."1.0.1" =
-    self.by-version."ipaddr.js"."1.0.1";
-  by-version."ipaddr.js"."1.0.1" = self.buildNodePackage {
-    name = "ipaddr.js-1.0.1";
-    version = "1.0.1";
+  by-spec."ipaddr.js"."1.0.5" =
+    self.by-version."ipaddr.js"."1.0.5";
+  by-version."ipaddr.js"."1.0.5" = self.buildNodePackage {
+    name = "ipaddr.js-1.0.5";
+    version = "1.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.1.tgz";
-      name = "ipaddr.js-1.0.1.tgz";
-      sha1 = "5f38801dc73e0400fc7076386f6ed5215fbd8f95";
+      url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.5.tgz";
+      name = "ipaddr.js-1.0.5.tgz";
+      sha1 = "5fa78cf301b825c78abc3042d812723049ea23c7";
     };
     deps = {
     };
@@ -1002,15 +988,15 @@
     cpu = [ ];
   };
   by-spec."ipaddr.js".">= 0.1.1" =
-    self.by-version."ipaddr.js"."1.0.3";
-  by-version."ipaddr.js"."1.0.3" = self.buildNodePackage {
-    name = "ipaddr.js-1.0.3";
-    version = "1.0.3";
+    self.by-version."ipaddr.js"."1.2.0";
+  by-version."ipaddr.js"."1.2.0" = self.buildNodePackage {
+    name = "ipaddr.js-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.3.tgz";
-      name = "ipaddr.js-1.0.3.tgz";
-      sha1 = "2a9df7be73ea92aadb0d7f377497decd8e6d01bb";
+      url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.2.0.tgz";
+      name = "ipaddr.js-1.2.0.tgz";
+      sha1 = "8aba49c9192799585bdd643e0ccb50e8ae777ba4";
     };
     deps = {
     };
@@ -1027,7 +1013,7 @@
     version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
+      url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
       name = "isarray-0.0.1.tgz";
       sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
     };
@@ -1046,7 +1032,7 @@
     version = "0.8.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/json-rpc2/-/json-rpc2-0.8.1.tgz";
+      url = "https://registry.npmjs.org/json-rpc2/-/json-rpc2-0.8.1.tgz";
       name = "json-rpc2-0.8.1.tgz";
       sha1 = "efe8c9834605b556c488d1ed7bcf24ee381eeeb2";
     };
@@ -1055,7 +1041,7 @@
       "debug-1.0.4" = self.by-version."debug"."1.0.4";
       "lodash-2.4.2" = self.by-version."lodash"."2.4.2";
       "es5class-2.3.1" = self.by-version."es5class"."2.3.1";
-      "faye-websocket-0.10.0" = self.by-version."faye-websocket"."0.10.0";
+      "faye-websocket-0.11.0" = self.by-version."faye-websocket"."0.11.0";
       "eventemitter3-0.1.6" = self.by-version."eventemitter3"."0.1.6";
     };
     optionalDependencies = {
@@ -1071,7 +1057,7 @@
     version = "0.0.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jsonparse/-/jsonparse-0.0.6.tgz";
+      url = "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.6.tgz";
       name = "jsonparse-0.0.6.tgz";
       sha1 = "ab599f19324d4ae178fa21a930192ab11ab61a4e";
     };
@@ -1090,7 +1076,7 @@
     version = "2.4.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz";
+      url = "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz";
       name = "lodash-2.4.2.tgz";
       sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e";
     };
@@ -1109,7 +1095,7 @@
     version = "3.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash/-/lodash-3.1.0.tgz";
+      url = "https://registry.npmjs.org/lodash/-/lodash-3.1.0.tgz";
       name = "lodash-3.1.0.tgz";
       sha1 = "d41b8b33530cb3be088853208ad30092d2c27961";
     };
@@ -1128,7 +1114,7 @@
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz";
+      url = "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz";
       name = "map-stream-0.1.0.tgz";
       sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194";
     };
@@ -1147,7 +1133,7 @@
     version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz";
+      url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz";
       name = "media-typer-0.3.0.tgz";
       sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
     };
@@ -1166,7 +1152,7 @@
     version = "0.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz";
+      url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz";
       name = "merge-descriptors-0.0.2.tgz";
       sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7";
     };
@@ -1185,7 +1171,7 @@
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/methods/-/methods-1.0.1.tgz";
+      url = "https://registry.npmjs.org/methods/-/methods-1.0.1.tgz";
       name = "methods-1.0.1.tgz";
       sha1 = "75bc91943dffd7da037cf3eeb0ed73a0037cd14b";
     };
@@ -1198,15 +1184,15 @@
     cpu = [ ];
   };
   by-spec."methods"."~1.1.1" =
-    self.by-version."methods"."1.1.1";
-  by-version."methods"."1.1.1" = self.buildNodePackage {
-    name = "methods-1.1.1";
-    version = "1.1.1";
+    self.by-version."methods"."1.1.2";
+  by-version."methods"."1.1.2" = self.buildNodePackage {
+    name = "methods-1.1.2";
+    version = "1.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/methods/-/methods-1.1.1.tgz";
-      name = "methods-1.1.1.tgz";
-      sha1 = "17ea6366066d00c58e375b8ec7dfd0453c89822a";
+      url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz";
+      name = "methods-1.1.2.tgz";
+      sha1 = "5529a4d67654134edcc5266656835b0f851afcee";
     };
     deps = {
     };
@@ -1223,7 +1209,7 @@
     version = "1.2.11";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
+      url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
       name = "mime-1.2.11.tgz";
       sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
     };
@@ -1244,7 +1230,7 @@
     version = "1.12.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz";
+      url = "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz";
       name = "mime-db-1.12.0.tgz";
       sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7";
     };
@@ -1256,16 +1242,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mime-db"."~1.18.0" =
-    self.by-version."mime-db"."1.18.0";
-  by-version."mime-db"."1.18.0" = self.buildNodePackage {
-    name = "mime-db-1.18.0";
-    version = "1.18.0";
+  by-spec."mime-db"."~1.26.0" =
+    self.by-version."mime-db"."1.26.0";
+  by-version."mime-db"."1.26.0" = self.buildNodePackage {
+    name = "mime-db-1.26.0";
+    version = "1.26.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.18.0.tgz";
-      name = "mime-db-1.18.0.tgz";
-      sha1 = "5317e28224c08af1d484f60973dd386ba8f389e0";
+      url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz";
+      name = "mime-db-1.26.0.tgz";
+      sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff";
     };
     deps = {
     };
@@ -1282,7 +1268,7 @@
     version = "2.0.14";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz";
+      url = "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz";
       name = "mime-types-2.0.14.tgz";
       sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6";
     };
@@ -1296,18 +1282,18 @@
     cpu = [ ];
   };
   by-spec."mime-types"."~2.1.6" =
-    self.by-version."mime-types"."2.1.6";
-  by-version."mime-types"."2.1.6" = self.buildNodePackage {
-    name = "mime-types-2.1.6";
-    version = "2.1.6";
+    self.by-version."mime-types"."2.1.14";
+  by-version."mime-types"."2.1.14" = self.buildNodePackage {
+    name = "mime-types-2.1.14";
+    version = "2.1.14";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mime-types/-/mime-types-2.1.6.tgz";
-      name = "mime-types-2.1.6.tgz";
-      sha1 = "949f8788411864ddc70948a0f21c43f29d25667c";
+      url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz";
+      name = "mime-types-2.1.14.tgz";
+      sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee";
     };
     deps = {
-      "mime-db-1.18.0" = self.by-version."mime-db"."1.18.0";
+      "mime-db-1.26.0" = self.by-version."mime-db"."1.26.0";
     };
     optionalDependencies = {
     };
@@ -1322,7 +1308,7 @@
     version = "0.0.10";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz";
+      url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz";
       name = "minimist-0.0.10.tgz";
       sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf";
     };
@@ -1341,7 +1327,7 @@
     version = "0.6.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ms/-/ms-0.6.2.tgz";
+      url = "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz";
       name = "ms-0.6.2.tgz";
       sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c";
     };
@@ -1360,7 +1346,7 @@
     version = "0.7.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ms/-/ms-0.7.0.tgz";
+      url = "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz";
       name = "ms-0.7.0.tgz";
       sha1 = "865be94c2e7397ad8a57da6a633a6e2f30798b83";
     };
@@ -1372,16 +1358,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ms"."0.7.1" =
-    self.by-version."ms"."0.7.1";
-  by-version."ms"."0.7.1" = self.buildNodePackage {
-    name = "ms-0.7.1";
-    version = "0.7.1";
+  by-spec."ms"."0.7.2" =
+    self.by-version."ms"."0.7.2";
+  by-version."ms"."0.7.2" = self.buildNodePackage {
+    name = "ms-0.7.2";
+    version = "0.7.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
-      name = "ms-0.7.1.tgz";
-      sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
+      url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz";
+      name = "ms-0.7.2.tgz";
+      sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765";
     };
     deps = {
     };
@@ -1392,15 +1378,15 @@
     cpu = [ ];
   };
   by-spec."nan"."^2.0.5" =
-    self.by-version."nan"."2.0.8";
-  by-version."nan"."2.0.8" = self.buildNodePackage {
-    name = "nan-2.0.8";
-    version = "2.0.8";
+    self.by-version."nan"."2.5.0";
+  by-version."nan"."2.5.0" = self.buildNodePackage {
+    name = "nan-2.5.0";
+    version = "2.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nan/-/nan-2.0.8.tgz";
-      name = "nan-2.0.8.tgz";
-      sha1 = "c15fd99dd4cc323d1c2f94ac426313680e606392";
+      url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz";
+      name = "nan-2.5.0.tgz";
+      sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8";
     };
     deps = {
     };
@@ -1422,7 +1408,7 @@
       sha256 = "9c3faf4d39fda7bb6dd52a82036625f37ed442d5e948d295acb2f055dd367080";
     };
     deps = {
-      "ipaddr.js-1.0.3" = self.by-version."ipaddr.js"."1.0.3";
+      "ipaddr.js-1.2.0" = self.by-version."ipaddr.js"."1.2.0";
       "native-dns-cache-0.0.2" = self.by-version."native-dns-cache"."0.0.2";
       "native-dns-packet-0.0.4" = self.by-version."native-dns-packet"."0.0.4";
     };
@@ -1460,13 +1446,13 @@
     version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/native-dns-packet/-/native-dns-packet-0.1.1.tgz";
+      url = "https://registry.npmjs.org/native-dns-packet/-/native-dns-packet-0.1.1.tgz";
       name = "native-dns-packet-0.1.1.tgz";
       sha1 = "97da90570b8438a00194701ce24d011fd3cc109a";
     };
     deps = {
       "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12";
-      "ipaddr.js-1.0.3" = self.by-version."ipaddr.js"."1.0.3";
+      "ipaddr.js-1.2.0" = self.by-version."ipaddr.js"."1.2.0";
     };
     optionalDependencies = {
     };
@@ -1487,7 +1473,7 @@
     };
     deps = {
       "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12";
-      "ipaddr.js-1.0.3" = self.by-version."ipaddr.js"."1.0.3";
+      "ipaddr.js-1.2.0" = self.by-version."ipaddr.js"."1.2.0";
     };
     optionalDependencies = {
     };
@@ -1508,7 +1494,7 @@
     };
     deps = {
       "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12";
-      "ipaddr.js-1.0.3" = self.by-version."ipaddr.js"."1.0.3";
+      "ipaddr.js-1.2.0" = self.by-version."ipaddr.js"."1.2.0";
     };
     optionalDependencies = {
     };
@@ -1523,7 +1509,7 @@
     version = "0.7.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nconf/-/nconf-0.7.1.tgz";
+      url = "https://registry.npmjs.org/nconf/-/nconf-0.7.1.tgz";
       name = "nconf-0.7.1.tgz";
       sha1 = "ee4b561dd979a3c58db122e38f196d49d61aeb5b";
     };
@@ -1545,7 +1531,7 @@
     version = "0.5.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz";
+      url = "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz";
       name = "negotiator-0.5.3.tgz";
       sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8";
     };
@@ -1564,7 +1550,7 @@
     version = "2.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz";
+      url = "https://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz";
       name = "on-finished-2.2.1.tgz";
       sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029";
     };
@@ -1584,7 +1570,7 @@
     version = "0.6.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz";
+      url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz";
       name = "optimist-0.6.1.tgz";
       sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
     };
@@ -1599,15 +1585,15 @@
     cpu = [ ];
   };
   by-spec."parseurl"."~1.3.0" =
-    self.by-version."parseurl"."1.3.0";
-  by-version."parseurl"."1.3.0" = self.buildNodePackage {
-    name = "parseurl-1.3.0";
-    version = "1.3.0";
+    self.by-version."parseurl"."1.3.1";
+  by-version."parseurl"."1.3.1" = self.buildNodePackage {
+    name = "parseurl-1.3.1";
+    version = "1.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz";
-      name = "parseurl-1.3.0.tgz";
-      sha1 = "b58046db4223e145afa76009e61bac87cc2281b3";
+      url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz";
+      name = "parseurl-1.3.1.tgz";
+      sha1 = "c8ab8c9223ba34888aa64a297b28853bec18da56";
     };
     deps = {
     };
@@ -1624,7 +1610,7 @@
     version = "0.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz";
+      url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz";
       name = "path-to-regexp-0.1.3.tgz";
       sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb";
     };
@@ -1643,7 +1629,7 @@
     version = "0.0.11";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz";
+      url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz";
       name = "pause-stream-0.0.11.tgz";
       sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445";
     };
@@ -1657,15 +1643,15 @@
     cpu = [ ];
   };
   by-spec."pkginfo"."0.3.x" =
-    self.by-version."pkginfo"."0.3.0";
-  by-version."pkginfo"."0.3.0" = self.buildNodePackage {
-    name = "pkginfo-0.3.0";
-    version = "0.3.0";
+    self.by-version."pkginfo"."0.3.1";
+  by-version."pkginfo"."0.3.1" = self.buildNodePackage {
+    name = "pkginfo-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz";
-      name = "pkginfo-0.3.0.tgz";
-      sha1 = "726411401039fe9b009eea86614295d5f3a54276";
+      url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz";
+      name = "pkginfo-0.3.1.tgz";
+      sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21";
     };
     deps = {
     };
@@ -1682,7 +1668,7 @@
     version = "1.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/properties/-/properties-1.2.1.tgz";
+      url = "https://registry.npmjs.org/properties/-/properties-1.2.1.tgz";
       name = "properties-1.2.1.tgz";
       sha1 = "0ee97a7fc020b1a2a55b8659eda4aa8d869094bd";
     };
@@ -1695,19 +1681,19 @@
     cpu = [ ];
   };
   by-spec."proxy-addr"."~1.0.6" =
-    self.by-version."proxy-addr"."1.0.8";
-  by-version."proxy-addr"."1.0.8" = self.buildNodePackage {
-    name = "proxy-addr-1.0.8";
-    version = "1.0.8";
+    self.by-version."proxy-addr"."1.0.10";
+  by-version."proxy-addr"."1.0.10" = self.buildNodePackage {
+    name = "proxy-addr-1.0.10";
+    version = "1.0.10";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.8.tgz";
-      name = "proxy-addr-1.0.8.tgz";
-      sha1 = "db54ec878bcc1053d57646609219b3715678bafe";
+      url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.10.tgz";
+      name = "proxy-addr-1.0.10.tgz";
+      sha1 = "0d40a82f801fc355567d2ecb65efe3f077f121c5";
     };
     deps = {
       "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0";
-      "ipaddr.js-1.0.1" = self.by-version."ipaddr.js"."1.0.1";
+      "ipaddr.js-1.0.5" = self.by-version."ipaddr.js"."1.0.5";
     };
     optionalDependencies = {
     };
@@ -1722,7 +1708,7 @@
     version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-1.2.0.tgz";
+      url = "https://registry.npmjs.org/qs/-/qs-1.2.0.tgz";
       name = "qs-1.2.0.tgz";
       sha1 = "ed079be28682147e6fd9a34cc2b0c1e0ec6453ee";
     };
@@ -1741,7 +1727,7 @@
     version = "2.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-2.3.3.tgz";
+      url = "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz";
       name = "qs-2.3.3.tgz";
       sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404";
     };
@@ -1754,15 +1740,15 @@
     cpu = [ ];
   };
   by-spec."range-parser"."~1.0.2" =
-    self.by-version."range-parser"."1.0.2";
-  by-version."range-parser"."1.0.2" = self.buildNodePackage {
-    name = "range-parser-1.0.2";
-    version = "1.0.2";
+    self.by-version."range-parser"."1.0.3";
+  by-version."range-parser"."1.0.3" = self.buildNodePackage {
+    name = "range-parser-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz";
-      name = "range-parser-1.0.2.tgz";
-      sha1 = "06a12a42e5131ba8e457cd892044867f2344e549";
+      url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz";
+      name = "range-parser-1.0.3.tgz";
+      sha1 = "6872823535c692e2c2a0103826afd82c2e0ff175";
     };
     deps = {
     };
@@ -1779,15 +1765,15 @@
     version = "1.0.27-1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz";
+      url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz";
       name = "readable-stream-1.0.27-1.tgz";
       sha1 = "6b67983c20357cefd07f0165001a16d710d91078";
     };
     deps = {
-      "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
+      "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2";
       "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
       "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "inherits-2.0.3" = self.by-version."inherits"."2.0.3";
     };
     optionalDependencies = {
     };
@@ -1802,7 +1788,7 @@
     version = "0.12.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/redis/-/redis-0.12.1.tgz";
+      url = "https://registry.npmjs.org/redis/-/redis-0.12.1.tgz";
       name = "redis-0.12.1.tgz";
       sha1 = "64df76ad0fc8acebaebd2a0645e8a48fac49185e";
     };
@@ -1821,7 +1807,7 @@
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz";
+      url = "https://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz";
       name = "reduce-component-1.0.1.tgz";
       sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da";
     };
@@ -1840,7 +1826,7 @@
     version = "0.11.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/send/-/send-0.11.1.tgz";
+      url = "https://registry.npmjs.org/send/-/send-0.11.1.tgz";
       name = "send-0.11.1.tgz";
       sha1 = "1beabfd42f9e2709f99028af3078ac12b47092d5";
     };
@@ -1854,7 +1840,7 @@
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "ms-0.7.0" = self.by-version."ms"."0.7.0";
       "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
-      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
+      "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3";
     };
     optionalDependencies = {
     };
@@ -1869,13 +1855,13 @@
     version = "1.8.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/serve-static/-/serve-static-1.8.1.tgz";
+      url = "https://registry.npmjs.org/serve-static/-/serve-static-1.8.1.tgz";
       name = "serve-static-1.8.1.tgz";
       sha1 = "08fabd39999f050fc311443f46d5888a77ecfc7c";
     };
     deps = {
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
+      "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1";
       "send-0.11.1" = self.by-version."send"."0.11.1";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
@@ -1892,7 +1878,7 @@
     version = "0.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/split/-/split-0.3.3.tgz";
+      url = "https://registry.npmjs.org/split/-/split-0.3.3.tgz";
       name = "split-0.3.3.tgz";
       sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f";
     };
@@ -1912,7 +1898,7 @@
     version = "0.0.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz";
+      url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz";
       name = "stack-trace-0.0.9.tgz";
       sha1 = "a8f6eaeca90674c333e7c43953f275b451510695";
     };
@@ -1931,7 +1917,7 @@
     version = "0.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz";
+      url = "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz";
       name = "stream-combiner-0.0.4.tgz";
       sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14";
     };
@@ -1951,7 +1937,7 @@
     version = "2.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/string/-/string-2.0.1.tgz";
+      url = "https://registry.npmjs.org/string/-/string-2.0.1.tgz";
       name = "string-2.0.1.tgz";
       sha1 = "ef1473b3e11cb8158671856556959b9aff5fd759";
     };
@@ -1970,7 +1956,7 @@
     version = "0.10.31";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
+      url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
       name = "string_decoder-0.10.31.tgz";
       sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
     };
@@ -1989,7 +1975,7 @@
     version = "0.21.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz";
+      url = "https://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz";
       name = "superagent-0.21.0.tgz";
       sha1 = "fb15027984751ee7152200e6cd21cd6e19a5de87";
     };
@@ -2000,7 +1986,7 @@
       "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
       "methods-1.0.1" = self.by-version."methods"."1.0.1";
       "cookiejar-2.0.1" = self.by-version."cookiejar"."2.0.1";
-      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "debug-2.6.0" = self.by-version."debug"."2.6.0";
       "reduce-component-1.0.1" = self.by-version."reduce-component"."1.0.1";
       "extend-1.2.1" = self.by-version."extend"."1.2.1";
       "form-data-0.1.3" = self.by-version."form-data"."0.1.3";
@@ -2019,7 +2005,7 @@
     version = "2.3.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/through/-/through-2.3.8.tgz";
+      url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz";
       name = "through-2.3.8.tgz";
       sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
     };
@@ -2042,7 +2028,7 @@
     version = "1.5.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/type-is/-/type-is-1.5.7.tgz";
+      url = "https://registry.npmjs.org/type-is/-/type-is-1.5.7.tgz";
       name = "type-is-1.5.7.tgz";
       sha1 = "b9368a593cc6ef7d0645e78b2f4c64cbecd05e90";
     };
@@ -2063,7 +2049,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
+      url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
       name = "utils-merge-1.0.0.tgz";
       sha1 = "0294fb922bb9375153541c4f7096231f287c8af8";
     };
@@ -2082,7 +2068,7 @@
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/vary/-/vary-1.0.1.tgz";
+      url = "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz";
       name = "vary-1.0.1.tgz";
       sha1 = "99e4981566a286118dfb2b817357df7993376d10";
     };
@@ -2095,18 +2081,20 @@
     cpu = [ ];
   };
   by-spec."verror"."^1.4.0" =
-    self.by-version."verror"."1.6.0";
-  by-version."verror"."1.6.0" = self.buildNodePackage {
-    name = "verror-1.6.0";
-    version = "1.6.0";
+    self.by-version."verror"."1.9.0";
+  by-version."verror"."1.9.0" = self.buildNodePackage {
+    name = "verror-1.9.0";
+    version = "1.9.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/verror/-/verror-1.6.0.tgz";
-      name = "verror-1.6.0.tgz";
-      sha1 = "7d13b27b1facc2e2da90405eb5ea6e5bdd252ea5";
+      url = "https://registry.npmjs.org/verror/-/verror-1.9.0.tgz";
+      name = "verror-1.9.0.tgz";
+      sha1 = "107a8a2d14c33586fc4bb830057cd2d19ae2a6ee";
     };
     deps = {
-      "extsprintf-1.2.0" = self.by-version."extsprintf"."1.2.0";
+      "assert-plus-1.0.0" = self.by-version."assert-plus"."1.0.0";
+      "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2";
+      "extsprintf-1.3.0" = self.by-version."extsprintf"."1.3.0";
     };
     optionalDependencies = {
     };
@@ -2115,15 +2103,15 @@
     cpu = [ ];
   };
   by-spec."websocket-driver".">=0.5.1" =
-    self.by-version."websocket-driver"."0.6.2";
-  by-version."websocket-driver"."0.6.2" = self.buildNodePackage {
-    name = "websocket-driver-0.6.2";
-    version = "0.6.2";
+    self.by-version."websocket-driver"."0.6.5";
+  by-version."websocket-driver"."0.6.5" = self.buildNodePackage {
+    name = "websocket-driver-0.6.5";
+    version = "0.6.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.2.tgz";
-      name = "websocket-driver-0.6.2.tgz";
-      sha1 = "8281dba3e299e5bd7a42b65d4577a8928c26f898";
+      url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz";
+      name = "websocket-driver-0.6.5.tgz";
+      sha1 = "5cb2556ceb85f4373c6d8238aa691c8454e13a36";
     };
     deps = {
       "websocket-extensions-0.1.1" = self.by-version."websocket-extensions"."0.1.1";
@@ -2141,7 +2129,7 @@
     version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz";
+      url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz";
       name = "websocket-extensions-0.1.1.tgz";
       sha1 = "76899499c184b6ef754377c2dbb0cd6cb55d29e7";
     };
@@ -2160,7 +2148,7 @@
     version = "0.8.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/winston/-/winston-0.8.0.tgz";
+      url = "https://registry.npmjs.org/winston/-/winston-0.8.0.tgz";
       name = "winston-0.8.0.tgz";
       sha1 = "61d0830fa699706212206b0a2b5ca69a93043668";
     };
@@ -2169,7 +2157,7 @@
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
       "cycle-1.0.3" = self.by-version."cycle"."1.0.3";
       "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
-      "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
+      "pkginfo-0.3.1" = self.by-version."pkginfo"."0.3.1";
       "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
     };
     optionalDependencies = {
@@ -2185,7 +2173,7 @@
     version = "0.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz";
+      url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz";
       name = "wordwrap-0.0.3.tgz";
       sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
     };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c16ff470645..f06a0d13eca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10262,7 +10262,7 @@ with pkgs;
 
   diod = callPackage ../servers/diod { lua = lua5_1; };
 
-  #dnschain = callPackage ../servers/dnschain { };
+  dnschain = callPackage ../servers/dnschain { };
 
   dovecot = callPackage ../servers/mail/dovecot { };
   dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { };

From f7d49037a48846e025dd3d8f2ecb47f499431ee8 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Wed, 18 Jan 2017 19:47:29 +0100
Subject: [PATCH 392/899] dnschain service: overhaul option interface &
 implementation

Closes https://github.com/NixOS/nixpkgs/pull/22041
---
 .../modules/services/networking/dnschain.nix  | 181 ++++++++++++------
 1 file changed, 119 insertions(+), 62 deletions(-)

diff --git a/nixos/modules/services/networking/dnschain.nix b/nixos/modules/services/networking/dnschain.nix
index f17f8c832ee..b6492996057 100644
--- a/nixos/modules/services/networking/dnschain.nix
+++ b/nixos/modules/services/networking/dnschain.nix
@@ -3,23 +3,28 @@
 with lib;
 
 let
-  cfg = config.services;
+  cfgs = config.services;
+  cfg  = cfgs.dnschain;
 
-  dnschainConf = pkgs.writeText "dnschain.conf" ''
+  dataDir  = "/var/lib/dnschain";
+  username = "dnschain";
+
+  configFile = pkgs.writeText "dnschain.conf" ''
     [log]
-    level=info
+    level = info
 
     [dns]
-    host = 127.0.0.1
-    port = 5333
+    host = ${cfg.dns.address}
+    port = ${toString cfg.dns.port}
     oldDNSMethod = NO_OLD_DNS
-    # TODO: check what that address is acutally used for
-    externalIP = 127.0.0.1
+    externalIP = ${cfg.dns.address}
 
     [http]
-    host = 127.0.0.1
-    port=8088
-    tlsPort=4443
+    host = ${cfg.api.hostname}
+    port = ${toString cfg.api.port}
+    tlsPort = ${toString cfg.api.tlsPort}
+
+    ${cfg.extraConfig}
   '';
 
 in
@@ -32,28 +37,81 @@ in
 
     services.dnschain = {
 
-      enable = mkOption {
-        type = types.bool;
-        default = false;
+      enable = mkEnableOption ''
+        DNSChain, a blockchain based DNS + HTTP server.
+        To resolve .bit domains set <literal>services.namecoind.enable = true;</literal>
+        and an RPC username/password.
+      '';
+
+      dns.address = mkOption {
+        type = types.str;
+        default = "127.0.0.1";
         description = ''
-          Whether to run dnschain. That implies running
-          namecoind as well, so make sure to configure
-          it appropriately.
+          The IP address that will be used to reach this machine.
+          Leave this unchanged if you do not wish to directly expose the DNSChain resolver.
+        '';
+      };
+
+      dns.port = mkOption {
+        type = types.int;
+        default = 5333;
+        description = ''
+          The port the DNSChain resolver will bind to.
+        '';
+      };
+
+      api.hostname = mkOption {
+        type = types.str;
+        default = "0.0.0.0";
+        description = ''
+          The hostname (or IP address) the DNSChain API server will bind to.
+        '';
+      };
+
+      api.port = mkOption {
+        type = types.int;
+        default = 8080;
+        description = ''
+          The port the DNSChain API server (HTTP) will bind to.
+        '';
+      };
+
+      api.tlsPort = mkOption {
+        type = types.int;
+        default = 4433;
+        description = ''
+          The port the DNSChain API server (HTTPS) will bind to.
+        '';
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        example = ''
+          [log]
+          level = debug
+        '';
+        description = ''
+          Additional options that will be appended to the configuration file.
         '';
       };
 
     };
 
-    services.dnsmasq = {
-      resolveDnschainQueries = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Resolve <literal>.bit</literal> top-level domains
-          with dnschain and namecoind.
-        '';
-      };
+    services.dnsmasq.resolveDNSChainQueries = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Resolve <literal>.bit</literal> top-level domains using DNSChain and namecoin.
+      '';
+    };
 
+    services.pdns-recursor.resolveDNSChainQueries = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Resolve <literal>.bit</literal> top-level domains using DNSChain and namecoin.
+      '';
     };
 
   };
@@ -61,48 +119,47 @@ in
 
   ###### implementation
 
-  config = mkIf cfg.dnschain.enable {
+  config = mkIf cfg.enable {
 
-    services.namecoind.enable = true;
+    services.dnsmasq.servers = optionals cfgs.dnsmasq.resolveDNSChainQueries
+      [ "/.bit/127.0.0.1#${toString cfg.dns.port}"
+        "/.dns/127.0.0.1#${toString cfg.dns.port}"
+      ];
 
-    services.dnsmasq.servers = optionals cfg.dnsmasq.resolveDnschainQueries [ "/.bit/127.0.0.1#5333" ];
-
-    users.extraUsers = singleton
-      { name = "dnschain";
-        uid = config.ids.uids.dnschain;
-        extraGroups = [ "namecoin" ];
-        description = "Dnschain daemon user";
-        home = "/var/lib/dnschain";
-        createHome = true;
+    services.pdns-recursor.forwardZones = mkIf cfgs.pdns-recursor.resolveDNSChainQueries
+      { bit = "127.0.0.1:${toString cfg.dns.port}";
+        dns = "127.0.0.1:${toString cfg.dns.port}";
       };
 
-    systemd.services.dnschain = {
-        description = "Dnschain Daemon";
-        after = [ "namecoind.target" ];
-        wantedBy = [ "multi-user.target" ];
-        path = [ pkgs.openssl ];
-        preStart = ''
-          # Link configuration file into dnschain HOME directory
-          if [ "$(${pkgs.coreutils}/bin/realpath /var/lib/dnschain/.dnschain.conf)" != "${dnschainConf}" ]; then
-              rm -rf /var/lib/dnschain/.dnschain.conf
-              ln -s ${dnschainConf} /var/lib/dnschain/.dnschain.conf
-          fi
+    users.extraUsers = singleton {
+      name = username;
+      description = "DNSChain daemon user";
+      home = dataDir;
+      createHome = true;
+      uid = config.ids.uids.dnschain;
+      extraGroups = optional cfgs.namecoind.enable "namecoin";
+    };
 
-          # Create empty namecoin.conf so that dnschain is not
-          # searching for /etc/namecoin/namecoin.conf
-          if [ ! -e /var/lib/dnschain/.namecoin/namecoin.conf ]; then
-              mkdir -p /var/lib/dnschain/.namecoin
-              touch /var/lib/dnschain/.namecoin/namecoin.conf
-          fi
-        '';
-        serviceConfig = {
-          Type = "simple";
-          User = "dnschain";
-          EnvironmentFile = config.services.namecoind.userFile;
-          ExecStart = "${pkgs.dnschain}/bin/dnschain --rpcuser=\${USER} --rpcpassword=\${PASSWORD} --rpcport=8336";
-          ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
-          ExecStop = "${pkgs.coreutils}/bin/kill -KILL $MAINPID";
-        };
+    systemd.services.dnschain = {
+      description = "DNSChain daemon";
+      after    = optional cfgs.namecoind.enable "namecoind.target";
+      wantedBy = [ "multi-user.target" ];
+
+      serviceConfig = {
+        User = "dnschain";
+        Restart = "on-failure";
+        ExecStart = "${pkgs.dnschain}/bin/dnschain";
+      };
+
+      preStart = ''
+        # Link configuration file into dnschain home directory
+        configPath=${dataDir}/.dnschain/dnschain.conf
+        mkdir -p ${dataDir}/.dnschain
+        if [ "$(realpath $configPath)" != "${configFile}" ]; then
+          rm -f $configPath
+          ln -s ${configFile} $configPath
+        fi
+      '';
     };
 
   };

From 26a27e4657b1fde16c3d8d67f694d0953b7be874 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 3 Feb 2017 19:44:59 +0100
Subject: [PATCH 393/899] exfat-nofuse: init at 2017-01-03

---
 pkgs/os-specific/linux/exfat/default.nix | 31 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/os-specific/linux/exfat/default.nix

diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix
new file mode 100644
index 00000000000..dcdafbcc8f9
--- /dev/null
+++ b/pkgs/os-specific/linux/exfat/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, kernel }:
+
+stdenv.mkDerivation rec {
+  name = "exfat-nofuse-${version}-${kernel.version}";
+  version = "2017-01-03";
+
+  src = fetchFromGitHub {
+    owner = "dorimanx";
+    repo = "exfat-nofuse";
+    rev = "8d291f5";
+    sha256 = "0lg1mykglayswli2aliw8chsbr4g629v9chki5975avh43jn47w9";
+  };
+
+  hardeningDisable = [ "pic" ];
+
+  makeFlags = [
+    "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+  ];
+
+  installPhase = ''
+    install -m644 -b -D exfat.ko $out/lib/modules/${kernel.modDirVersion}/kernel/fs/exfat/exfat.ko
+  '';
+
+  meta = {
+    description = "exfat kernel module";
+    homepage = https://github.com/dorimanx/exfat-nofuse;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ makefu ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d538e21d24..c9f9efbc8a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11245,6 +11245,8 @@ in
 
     dpdk = callPackage ../os-specific/linux/dpdk { };
 
+    exfat-nofuse = callPackage ../os-specific/linux/exfat { };
+
     pktgen = callPackage ../os-specific/linux/pktgen { };
 
     odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { };

From 1e835f23def71dc9b944f34e9370e873f699b152 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Thu, 2 Feb 2017 16:53:24 +0100
Subject: [PATCH 394/899] googleearth: 6.0.3.2197 -> 7.1.4.1529

---
 .../applications/misc/googleearth/default.nix | 96 ++++++++++---------
 1 file changed, 49 insertions(+), 47 deletions(-)

diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix
index 1e6caa93b2d..df8cb71d6f9 100644
--- a/pkgs/applications/misc/googleearth/default.nix
+++ b/pkgs/applications/misc/googleearth/default.nix
@@ -1,77 +1,79 @@
 { stdenv, fetchurl, glibc, mesa, freetype, glib, libSM, libICE, libXi, libXv
 , libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, qt4
-, zlib, fontconfig }:
+, zlib, fontconfig, dpkg }:
 
-/* I haven't found any x86_64 package from them */
-assert stdenv.system == "i686-linux";
-
-stdenv.mkDerivation {
-  name = "googleearth-6.0.3.2197";
-
-  src = fetchurl {
-    url = http://dl.google.com/earth/client/current/GoogleEarthLinux.bin;
-    sha256 = "0bcpmnlk03382x577qbnbw3i6y08hr3qmg85pqj35scnl6van74c";
-  };
-
-  nativeBuildInputs = [
+let
+  arch =
+    if stdenv.system == "x86_64-linux" then "amd64"
+    else if stdenv.system == "i686-linux" then "i386"
+    else abort "Unsupported architecture";
+  sha256 =
+    if arch == "amd64"
+    then "0dwnppn5snl5bwkdrgj4cyylnhngi0g66fn2k41j3dvis83x24k6"
+    else "0gndbxrj3kgc2dhjqwjifr3cl85hgpm695z0wi01wvwzhrjqs0l2";
+  fullPath = stdenv.lib.makeLibraryPath [
     glibc
     glib
     stdenv.cc.cc
-    libSM 
-    libICE 
-    libXi 
+    libSM
+    libICE
+    libXi
     libXv
     mesa
-    libXrender 
-    libXrandr 
-    libXfixes 
-    libXcursor 
-    libXinerama 
-    freetype 
-    libXext 
-    libX11 
+    libXrender
+    libXrandr
+    libXfixes
+    libXcursor
+    libXinerama
+    freetype
+    libXext
+    libX11
     qt4
     zlib
     fontconfig
   ];
+in
+stdenv.mkDerivation rec {
+  version = "7.1.4.1529";
+  name = "googleearth-${version}";
+
+  src = fetchurl {
+    url = "https://dl.google.com/earth/client/current/google-earth-stable_current_${arch}.deb";
+    inherit sha256;
+  };
 
   phases = "unpackPhase installPhase";
-  
+
+  buildInputs = [ dpkg ];
+
   unpackPhase = ''
-    bash $src --noexec --target unpacked
-    cd unpacked
+    dpkg-deb -x ${src} ./
   '';
-  
+
   installPhase =''
-    mkdir -p $out/{opt/googleearth/,bin};
-    tar xf googleearth-data.tar -C $out/opt/googleearth
-    tar xf googleearth-linux-x86.tar -C $out/opt/googleearth
-    cp bin/googleearth $out/opt/googleearth
-    cat > $out/bin/googleearth << EOF
-    #!/bin/sh
-    export GOOGLEEARTH_DATA_PATH=$out/opt/googleearth
-    exec $out/opt/googleearth/googleearth
-    EOF
-    chmod +x $out/bin/googleearth
+    mkdir $out
+    mv usr/* $out/
+    rmdir usr
+    mv * $out/
+    rm $out/bin/google-earth $out/opt/google/earth/free/google-earth
+    ln -s $out/opt/google/earth/free/googleearth $out/bin/google-earth
 
-    fullPath=
-    for i in $nativeBuildInputs; do
-      fullPath=$fullPath:$i/lib
-    done
-          
     patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath $fullPath \
-      $out/opt/googleearth/googleearth-bin
+      --set-rpath "${fullPath}:\$ORIGIN" \
+      $out/opt/google/earth/free/googleearth-bin
 
-    for a in $out/opt/googleearth/*.so* ; do
-      patchelf --set-rpath $fullPath $a
+    for a in $out/opt/google/earth/free/*.so* ; do
+      patchelf --set-rpath "${fullPath}:\$ORIGIN" $a
     done
   '';
 
+  dontPatchELF = true;
+
   meta = {
     description = "A world sphere viewer";
     homepage = http://earth.google.com;
     license = stdenv.lib.licenses.unfree;
     maintainers = [ stdenv.lib.maintainers.viric ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From 50f1d8d2fafe84d0af9f1568275b82663f9b196f Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 1 Feb 2017 01:39:24 +0800
Subject: [PATCH 395/899] minikube: pull kubernetes into PATH and 0.15 -> 0.16

Also add support for KVM
---
 .../networking/cluster/minikube/default.nix   | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index cd1ace993d6..c773d8ac23a 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -1,15 +1,18 @@
-{ stdenv, fetchurl, kubernetes }:
+{ stdenv, lib, fetchurl, makeWrapper, docker-machine-kvm, kubernetes, libvirt, qemu }:
+
 let
   arch = if stdenv.isLinux
          then "linux-amd64"
          else "darwin-amd64";
   checksum = if stdenv.isLinux
-             then "1g6k3va84nm2h9z2ywbbkc8jabgkarqlf8wv1sp2p6s6hw7hi5h3"
-             else "0jpwyvgpl34n07chcyd7ldvk3jq3rx72cp8yf0bh7gnzr5lcnxnc";
-in
-stdenv.mkDerivation rec {
+             then "0njx4vzr0cpr3dba08w0jrlpfb8qrmxq5lqfrk3qrx29x5y6i6hi"
+             else "0i21m1pys6rdxcwsk987l08lhzpcbg4bdrznaam02g6jj6jxvq0x";
+
+# TODO: compile from source
+
+in stdenv.mkDerivation rec {
   pname = "minikube";
-  version = "0.15.0";
+  version = "0.16.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
@@ -17,26 +20,24 @@ stdenv.mkDerivation rec {
     sha256 = "${checksum}";
   };
 
-  buildInputs = [ ];
+  phases = [ "installPhase" ];
 
-  propagatedBuildInputs = [ kubernetes ];
+  buildInputs = [ makeWrapper ];
 
-  phases = [ "buildPhase" "installPhase" ];
-
-  buildPhase = ''
-    mkdir -p $out/bin
-  '';
+  binPath = lib.makeBinPath [ docker-machine-kvm kubernetes libvirt qemu ];
 
   installPhase = ''
-    cp $src $out/bin/${pname}
-    chmod +x $out/bin/${pname}
+    install -Dm755 ${src} $out/bin/${pname}
+
+    wrapProgram $out/bin/${pname} \
+      --prefix PATH : ${binPath}
   '';
 
   meta = with stdenv.lib; {
     homepage = https://github.com/kubernetes/minikube;
     description = "A tool that makes it easy to run Kubernetes locally";
     license = licenses.asl20;
-    maintainers = [ maintainers.ebzzry ];
-    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ ebzzry ];
+    platforms = with platforms; linux ++ darwin;
   };
 }

From a3ff62d48cae111a350bef4a98f8963236284c75 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Wed, 18 Jan 2017 19:53:11 +0100
Subject: [PATCH 396/899] namecoind: refactor nixos module

---
 .../modules/services/networking/namecoind.nix | 215 +++++++++++-------
 1 file changed, 134 insertions(+), 81 deletions(-)

diff --git a/nixos/modules/services/networking/namecoind.nix b/nixos/modules/services/networking/namecoind.nix
index 83fc1ec6667..9df9f67cde8 100644
--- a/nixos/modules/services/networking/namecoind.nix
+++ b/nixos/modules/services/networking/namecoind.nix
@@ -3,25 +3,35 @@
 with lib;
 
 let
-  cfg = config.services.namecoind;
+  cfg     = config.services.namecoind;
+  dataDir = "/var/lib/namecoind";
+  useSSL  = (cfg.rpc.certificate != null) && (cfg.rpc.key != null);
+  useRPC  = (cfg.rpc.user != null) && (cfg.rpc.password != null);
 
-  namecoinConf =
-  let
-    useSSL = (cfg.rpcCertificate != null) && (cfg.rpcKey != null);
-  in
-  pkgs.writeText "namecoin.conf" ''
+  listToConf = option: list:
+    concatMapStrings (value :"${option}=${value}\n") list;
+
+  configFile = pkgs.writeText "namecoin.conf" (''
     server=1
     daemon=0
-    rpcallowip=127.0.0.1
-    walletpath=${cfg.wallet}
-    gen=${if cfg.generate then "1" else "0"}
-    rpcssl=${if useSSL then "1" else "0"}
-    ${optionalString useSSL "rpcsslcertificatechainfile=${cfg.rpcCertificate}"}
-    ${optionalString useSSL "rpcsslprivatekeyfile=${cfg.rpcKey}"}
-    ${optionalString useSSL "rpcsslciphers=TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH"}
     txindex=1
     txprevcache=1
-  '';
+    walletpath=${cfg.wallet}
+    gen=${if cfg.generate then "1" else "0"}
+    ${listToConf "addnode" cfg.extraNodes}
+    ${listToConf "connect" cfg.trustedNodes}
+  '' + optionalString useRPC ''
+    rpcbind=${cfg.rpc.address}
+    rpcport=${toString cfg.rpc.port}
+    rpcuser=${cfg.rpc.user}
+    rpcpassword=${cfg.rpc.password}
+    ${listToConf "rpcallowip" cfg.rpc.allowFrom}
+  '' + optionalString useSSL ''
+    rpcssl=1
+    rpcsslcertificatechainfile=${cfg.rpc.certificate}
+    rpcsslprivatekeyfile=${cfg.rpc.key}
+    rpcsslciphers=TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH
+  '');
 
 in
 
@@ -33,40 +43,17 @@ in
 
     services.namecoind = {
 
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether to run namecoind.
-        '';
-      };
+      enable = mkEnableOption "namecoind, Namecoin client.";
 
       wallet = mkOption {
         type = types.path;
-        example = "/etc/namecoin/wallet.dat";
+        default = "${dataDir}/wallet.dat";
         description = ''
           Wallet file. The ownership of the file has to be
           namecoin:namecoin, and the permissions must be 0640.
         '';
       };
 
-      userFile = mkOption {
-        type = types.nullOr types.path;
-        default = null;
-        example = "/etc/namecoin/user";
-        description = ''
-          File containing the user name and user password to
-          authenticate RPC connections to namecoind.
-          The content of the file is of the form:
-          <literal>
-          USER=namecoin
-          PASSWORD=secret
-          </literal>
-          The ownership of the file has to be namecoin:namecoin,
-          and the permissions must be 0640.
-        '';
-      };
-
       generate = mkOption {
         type = types.bool;
         default = false;
@@ -75,24 +62,83 @@ in
         '';
       };
 
-      rpcCertificate = mkOption {
+      extraNodes = mkOption {
+        type = types.listOf types.str;
+        default = [ ];
+        description = ''
+          List of additional peer IP addresses to connect to.
+        '';
+      };
+
+      trustedNodes = mkOption {
+        type = types.listOf types.str;
+        default = [ ];
+        description = ''
+          List of the only peer IP addresses to connect to. If specified
+          no other connection will be made.
+        '';
+      };
+
+      rpc.user = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          User name for RPC connections.
+        '';
+      };
+
+      rpc.password = mkOption {
+        type = types.str;
+        default = null;
+        description = ''
+          Password for RPC connections.
+        '';
+      };
+
+      rpc.address = mkOption {
+        type = types.str;
+        default = "0.0.0.0";
+        description = ''
+          IP address the RPC server will bind to.
+        '';
+      };
+
+      rpc.port = mkOption {
+        type = types.int;
+        default = 8332;
+        description = ''
+          Port the RPC server will bind to.
+        '';
+      };
+
+      rpc.certificate = mkOption {
         type = types.nullOr types.path;
         default = null;
-        example = "/etc/namecoin/server.cert";
+        example = "/var/lib/namecoind/server.cert";
         description = ''
           Certificate file for securing RPC connections.
         '';
       };
 
-      rpcKey = mkOption {
+      rpc.key = mkOption {
         type = types.nullOr types.path;
         default = null;
-        example = "/etc/namecoin/server.pem";
+        example = "/var/lib/namecoind/server.pem";
         description = ''
           Key file for securing RPC connections.
         '';
       };
 
+
+      rpc.allowFrom = mkOption {
+        type = types.listOf types.str;
+        default = [ "127.0.0.1" ];
+        description = ''
+          List of IP address ranges allowed to use the RPC API.
+          Wiledcards (*) can be user to specify a range.
+        '';
+      };
+
     };
 
   };
@@ -102,47 +148,54 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers = singleton
-      { name = "namecoin";
-        uid = config.ids.uids.namecoin;
-        description = "Namecoin daemon user";
-        home = "/var/lib/namecoin";
-        createHome = true;
-      };
+    services.dnschain.extraConfig = ''
+      [namecoin]
+      config = ${configFile}
+    '';
 
-    users.extraGroups = singleton
-      { name = "namecoin";
-        gid = config.ids.gids.namecoin;
-      };
+    users.extraUsers = singleton {
+      name = "namecoin";
+      uid  = config.ids.uids.namecoin;
+      description = "Namecoin daemon user";
+      home = dataDir;
+      createHome = true;
+    };
+
+    users.extraGroups = singleton {
+      name = "namecoin";
+      gid  = config.ids.gids.namecoin;
+    };
 
     systemd.services.namecoind = {
-        description = "Namecoind Daemon";
-        after = [ "network.target" ];
-        wantedBy = [ "multi-user.target" ];
-        preStart = ''
-          if [  "$(stat --printf '%u' ${cfg.userFile})" != "${toString config.ids.uids.namecoin}" \
-             -o "$(stat --printf '%g' ${cfg.userFile})" != "${toString config.ids.gids.namecoin}" \
-             -o "$(stat --printf '%a' ${cfg.userFile})" != "640" ]; then
-             echo "ERROR: bad ownership or rights on ${cfg.userFile}" >&2
-             exit 1
-          fi
-          if [  "$(stat --printf '%u' ${cfg.wallet})" != "${toString config.ids.uids.namecoin}" \
-             -o "$(stat --printf '%g' ${cfg.wallet})" != "${toString config.ids.gids.namecoin}" \
-             -o "$(stat --printf '%a' ${cfg.wallet})" != "640" ]; then
-             echo "ERROR: bad ownership or rights on ${cfg.wallet}" >&2
-             exit 1
-          fi
-        '';
-        serviceConfig = {
-          Type = "simple";
-          User = "namecoin";
-          EnvironmentFile = cfg.userFile;
-          ExecStart = "${pkgs.altcoins.namecoind}/bin/namecoind -conf=${namecoinConf} -rpcuser=\${USER} -rpcpassword=\${PASSWORD} -printtoconsole";
-          ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
-          ExecStop = "${pkgs.coreutils}/bin/kill -KILL $MAINPID";
-          StandardOutput = "null";
-          Nice = "10";
-        };
+      description = "Namecoind daemon";
+      after    = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      serviceConfig = {
+        User  = "namecoin";
+        Griup = "namecoin";
+        ExecStart  = "${pkgs.altcoins.namecoind}/bin/namecoind -conf=${configFile} -datadir=${dataDir} -printtoconsole";
+        ExecStop   = "${pkgs.coreutils}/bin/kill -KILL $MAINPID";
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        Nice = "10";
+        PrivateTmp = true;
+        TimeoutStopSec     = "60s";
+        TimeoutStartSec    = "2s";
+        Restart            = "always";
+        StartLimitInterval = "120s";
+        StartLimitBurst    = "5";
+      };
+
+      preStart = optionalString (cfg.wallet != "${dataDir}/wallet.dat")  ''
+        # check wallet file permissions
+        if [ "$(stat --printf '%u' ${cfg.wallet})" != "${toString config.ids.uids.namecoin}" \
+           -o "$(stat --printf '%g' ${cfg.wallet})" != "${toString config.ids.gids.namecoin}" \
+           -o "$(stat --printf '%a' ${cfg.wallet})" != "640" ]; then
+           echo "ERROR: bad ownership or rights on ${cfg.wallet}" >&2
+           exit 1
+        fi
+      '';
+
     };
 
   };

From b7bbe2ce0bc93ec44bce2c7eb78686a5c6347ba8 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 3 Feb 2017 20:22:44 +0100
Subject: [PATCH 397/899] pythonPackages.requests-mock: 0.6.0 -> 1.3.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 37485ad9995..9e9c00cfe61 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17834,11 +17834,11 @@ in {
 
   requests-mock = buildPythonPackage rec {
     name = "requests-mock-${version}";
-    version = "0.6.0";
+    version = "1.3.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/r/requests-mock/${name}.tar.gz";
-      sha256 = "0gmd88c224y53b1ai8cfsrcxm9kw3gdqzysclmnaqspg7zjhxwd1";
+      sha256 = "0jr997dvk6zbmhvbpcv3rajrgag69mcsm1ai3w3rgk2jdh6rg1mx";
     };
 
     patchPhase = ''

From 2352099a962261bd41906dc6ed25966ffbae6640 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 3 Feb 2017 21:04:10 +0100
Subject: [PATCH 398/899] ocaml-4.04: dont strip to obtain a working compiler

---
 pkgs/development/compilers/ocaml/4.04.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/compilers/ocaml/4.04.nix b/pkgs/development/compilers/ocaml/4.04.nix
index 7e35c9e1aa8..1ded1aed232 100644
--- a/pkgs/development/compilers/ocaml/4.04.nix
+++ b/pkgs/development/compilers/ocaml/4.04.nix
@@ -3,4 +3,7 @@ import ./generic.nix {
   minor_version = "04";
   patch_version = "0";
   sha256 = "1d2nk3kq4dyzz8dls45r13jprq5by3q8kshc8kvxzm8n4fnnvvb4";
+
+  # If the executable is stipped it does not work
+  dontStrip = true;
 }

From 7a6aac90763e1c92fea53154c876e05a28067235 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 3 Feb 2017 21:05:31 +0100
Subject: [PATCH 399/899] ocaml-lablgl: use camlp5

---
 pkgs/development/ocaml-modules/lablgl/default.nix | 4 ++--
 pkgs/top-level/ocaml-packages.nix                 | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix
index c59f15c57ad..7fd7de1f756 100644
--- a/pkgs/development/ocaml-modules/lablgl/default.nix
+++ b/pkgs/development/ocaml-modules/lablgl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut, camlp4 } :
+{stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut, camlp5 } :
 
 let
   pname = "lablgl";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0qabydd219i4ak7hxgc67496qnnscpnydya2m4ijn3cpbgih7zyq";
   };
 
-  buildInputs = [ocaml findlib lablgtk freeglut camlp4];
+  buildInputs = [ ocaml findlib lablgtk freeglut camlp5 ];
   propagatedBuildInputs = [ mesa ];
 
   patches = [ ./Makefile.config.patch ./META.patch ];
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 4f2a635e6ff..c55c3a5a068 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -225,7 +225,9 @@ let
 
     jsonm = callPackage ../development/ocaml-modules/jsonm { };
 
-    lablgl = callPackage ../development/ocaml-modules/lablgl { };
+    lablgl = callPackage ../development/ocaml-modules/lablgl {
+      camlp5 = camlp5_strict;
+    };
 
     lablgtk_2_14 = callPackage ../development/ocaml-modules/lablgtk/2.14.0.nix {
       inherit (pkgs.gnome2) libgnomecanvas libglade gtksourceview;

From c1604543bfa301584d4f028dda184f13c4cf9607 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 3 Feb 2017 22:12:23 +0100
Subject: [PATCH 400/899] llpp: 2016-05-07 -> 2017-01-18

---
 pkgs/applications/misc/llpp/default.nix | 19 +++++++++++--------
 pkgs/top-level/all-packages.nix         |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix
index e350a9a9530..ee06ea1ad6c 100644
--- a/pkgs/applications/misc/llpp/default.nix
+++ b/pkgs/applications/misc/llpp/default.nix
@@ -1,26 +1,29 @@
-{ stdenv, lib, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf, lablgl
-, gtk3, openjpeg, jbig2dec, mujs, xsel, openssl, freetype, ncurses }:
+{ stdenv, lib, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf
+, lablgl, gtk3, openjpeg, jbig2dec, mujs, xsel, openssl, freetype, ncurses }:
 
 assert lib.versionAtLeast (lib.getVersion ocaml) "4.02";
 
 let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
 in stdenv.mkDerivation rec {
   name = "llpp-${version}";
-  version = "21-git-2016-05-07";
+  version = "25-git-2017-01-18";
 
   src = fetchgit {
     url = "git://repo.or.cz/llpp.git";
-    rev = "1beb003ca0f4ed90fda2823cb07c2eb674fc3ca4";
-    sha256 = "1r59yfm81zmiij401d3wc3zb1zc873ss02gkplbwi4lad2l0chba";
+    rev = "22740b9bca1c60ef18cf90538994ce4981539901";
+    sha256 = "0yg8z2zwhg2f5il2i1clx3b7hl088ncpk686rfxlvwyjg3qs3mv4";
     fetchSubmodules = false;
   };
 
-  buildInputs = [ pkgconfig ninja makeWrapper ocaml findlib mupdf lablgl
-                  gtk3 jbig2dec openjpeg mujs openssl freetype ncurses ];
+  nativeBuildInputs = [ pkgconfig makeWrapper ninja ];
+  buildInputs = [ ocaml findlib mupdf gtk3 jbig2dec # lablgl
+    openjpeg mujs openssl freetype ncurses ];
 
   dontStrip = true;
 
   configurePhase = ''
+    sed -i -e 's+fz_set_use_document_css (state.ctx, usedoccss);+/* fz_set_use_document_css (state.ctx, usedoccss); */+' link.c
+    sed -i -e 's+ocamlc --version+ocamlc -version+' build.sh
     sed -i -e 's+-I \$srcdir/mupdf/include -I \$srcdir/mupdf/thirdparty/freetype/include+-I ${freetype.dev}/include+' build.sh
     sed -i -e 's+-lmupdf +-lfreetype -lz -lharfbuzz -ljbig2dec -lopenjp2 -ljpeg -lmupdf +' build.sh
     sed -i -e 's+-L\$srcdir/mupdf/build/native ++' build.sh
@@ -29,12 +32,12 @@ in stdenv.mkDerivation rec {
   buildPhase = ''
     sh ./build.sh build
   '';
+#        --prefix CAML_LD_LIBRARY_PATH ":" "${lablgl}/lib/ocaml/${ocamlVersion}/site-lib/lablgl" \
 
   installPhase = ''
     install -d $out/bin $out/lib
     install build/llpp $out/bin
     wrapProgram $out/bin/llpp \
-        --prefix CAML_LD_LIBRARY_PATH ":" "${lablgl}/lib/ocaml/${ocamlVersion}/site-lib/lablgl" \
         --prefix CAML_LD_LIBRARY_PATH ":" "$out/lib" \
         --prefix PATH ":" "${xsel}/bin"
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1f9a6fe4fb..1f8fb7a8b02 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14018,7 +14018,7 @@ with pkgs;
     bison = bison2;
   };
 
-  inherit (ocaml-ng.ocamlPackages_4_02) llpp;
+  inherit (ocaml-ng.ocamlPackages_4_04) llpp;
 
   lmms = callPackage ../applications/audio/lmms { };
 

From b2fb95a6cfa9689c2d432be6d6ba96fc17951377 Mon Sep 17 00:00:00 2001
From: Evan Danaher <edanaher@edanaher.net>
Date: Fri, 3 Feb 2017 16:58:22 -0500
Subject: [PATCH 401/899] neovim-remote: move from python-packages to
 /neovim/neovim-remote.

---
 .../editors/neovim/neovim-remote.nix            | 16 ++++++++++++++++
 pkgs/top-level/all-packages.nix                 |  2 ++
 pkgs/top-level/python-packages.nix              | 17 -----------------
 3 files changed, 18 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/applications/editors/neovim/neovim-remote.nix

diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix
new file mode 100644
index 00000000000..2ee269156bb
--- /dev/null
+++ b/pkgs/applications/editors/neovim/neovim-remote.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchFromGitHub, pythonPackages }:
+
+pythonPackages.buildPythonPackage rec {
+  name = "neovim-remote-${version}";
+  version = "v1.4.0";
+  disabled = !pythonPackages.isPy3k;
+
+  src = fetchFromGitHub {
+    owner = "mhinz";
+    repo = "neovim-remote";
+    rev = version;
+    sha256 = "0msvfh27f56xj5ki59ikzavxz863nal5scm57n43618m49qzg8iz";
+  };
+
+  propagatedBuildInputs = [ pythonPackages.neovim ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f8fb7a8b02..28ec4619223 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15385,6 +15385,8 @@ with pkgs;
 
   neovim-pygui = pythonPackages.neovim_gui;
 
+  neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { pythonPackages = python3Packages; };
+
   vis = callPackage ../applications/editors/vis {
     inherit (lua52Packages) lpeg;
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ffcab34122e..2bdd0b91974 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29771,23 +29771,6 @@ EOF
     '';
   };
 
-  neovim-remote = buildPythonPackage rec {
-    name = "neovim-remote-${version}";
-    version = "v1.4.0";
-    disabled = !isPy3k;
-
-    src = pkgs.fetchFromGitHub {
-      owner = "mhinz";
-      repo = "neovim-remote";
-      rev = version;
-      sha256 = "0msvfh27f56xj5ki59ikzavxz863nal5scm57n43618m49qzg8iz";
-    };
-
-    propagatedBuildInputs = [
-      self.neovim
-    ];
-  };
-
   ghp-import = buildPythonPackage rec {
     version = "0.4.1";
     name = "ghp-import-${version}";

From 03c10c64ad70de696608606bc736104006924b90 Mon Sep 17 00:00:00 2001
From: Evan Danaher <edanaher@edanaher.net>
Date: Fri, 3 Feb 2017 16:20:14 -0500
Subject: [PATCH 402/899] vim-plugins: add vim-lawrencium

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index dae7bf059a8..3ee8f32da0c 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -384,6 +384,17 @@ rec {
 
   };
 
+  vim-lawrencium = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-lawrencium-2017-01-10";
+    src = fetchgit {
+      url = "git://github.com/ludovicchabant/vim-lawrencium";
+      rev = "88077183e1f5a9a1f741aeab7a1374cfed9e917f";
+      sha256 = "0z31v93wjycq4lqvbl1jzxi7i5i1vl919m4dyyzphybcqrjjpnab";
+    };
+    dependencies = [];
+
+  };
+
   ghcmod = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "ghcmod-2016-06-19";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index b65831d8c65..f9e79a8019b 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -74,6 +74,7 @@
 "github:lepture/vim-jinja"
 "github:lervag/vimtex"
 "github:lokaltog/vim-easymotion"
+"github:ludovicchabant/vim-lawrencium"
 "github:luochen1990/rainbow"
 "github:lyokha/vim-xkbswitch"
 "github:machakann/vim-highlightedyank"

From 6a5ee4872439a45e9e7eeba7e45e6a9b63437a4f Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Fri, 3 Feb 2017 20:19:37 +0000
Subject: [PATCH 403/899] liberation-fonts: init at 1.07.4

---
 .../fonts/redhat-liberation-fonts/binary.nix  |  20 ----
 .../fonts/redhat-liberation-fonts/default.nix | 100 +++++++++++-------
 pkgs/servers/x11/xquartz/default.nix          |   4 +-
 pkgs/top-level/all-packages.nix               |   9 +-
 4 files changed, 72 insertions(+), 61 deletions(-)
 delete mode 100644 pkgs/data/fonts/redhat-liberation-fonts/binary.nix

diff --git a/pkgs/data/fonts/redhat-liberation-fonts/binary.nix b/pkgs/data/fonts/redhat-liberation-fonts/binary.nix
deleted file mode 100644
index 9cbe951cf4a..00000000000
--- a/pkgs/data/fonts/redhat-liberation-fonts/binary.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, liberation_ttf_from_source }:
-
-stdenv.mkDerivation rec {
-  version = "2.00.1";
-  name = "liberation-fonts-${version}";
-  src = fetchurl {
-    url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
-    sha256 = "010m4zfqan4w04b6bs9pm3gapn9hsb18bmwwgp2p6y6idj52g43q";
-  };
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    cp -v $( find . -name '*.ttf') $out/share/fonts/truetype
-
-    mkdir -p "$out/doc/${name}"
-    cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true
-  '';
-
-  inherit (liberation_ttf_from_source) meta;
-}
diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
index e914501721b..e9462f7a551 100644
--- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix
+++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
@@ -1,42 +1,70 @@
 {stdenv, fetchurl, fontforge, pythonPackages, python}:
 
-stdenv.mkDerivation rec {
-  name = "liberation-fonts-2.00.1";
+let
+  common =
+    {version, url, sha256, buildInputs}:
+    stdenv.mkDerivation rec {
+      name = "liberation-fonts-${version}";
+      src = fetchurl {
+        inherit url sha256;
+      };
 
-  src = fetchurl {
-    url = "https://fedorahosted.org/releases/l/i/liberation-fonts/${name}.tar.gz";
+      inherit buildInputs;
+
+      installPhase = ''
+        mkdir -p $out/share/fonts/truetype
+        cp -v $( find . -name '*.ttf') $out/share/fonts/truetype
+
+        mkdir -p "$out/doc/${name}"
+        cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true
+      '';
+
+      meta = with stdenv.lib; {
+        description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New";
+        longDescription = ''
+          The Liberation Fonts are intended to be replacements for the three most
+          commonly used fonts on Microsoft systems: Times New Roman, Arial, and
+          Courier New. Since 2012 they are based on croscore fonts.
+
+          There are three sets: Sans (a substitute for Arial, Albany, Helvetica,
+          Nimbus Sans L, and Bitstream Vera Sans), Serif (a substitute for Times
+          New Roman, Thorndale, Nimbus Roman, and Bitstream Vera Serif) and Mono
+          (a substitute for Courier New, Cumberland, Courier, Nimbus Mono L, and
+          Bitstream Vera Sans Mono).
+        '';
+
+        license = licenses.ofl;
+        homepage = https://fedorahosted.org/liberation-fonts/;
+        maintainers = [
+          maintainers.raskin
+        ];
+        platforms = platforms.unix;
+      };
+    };
+
+in {
+  liberation_ttf_v1_from_source = common rec {
+    version = "1.07.4";
+    url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-${version}.tar.gz";
+    sha256 = "01jlg88q2s6by7qv6fmnrlx0lwjarrjrpxv811zjz6f2im4vg65d";
+    buildInputs = [ fontforge pythonPackages.fonttools python ];
+  };
+  liberation_ttf_v1_binary = common rec {
+    version = "1.07.4";
+    url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
+    sha256 = "0p7frz29pmjlk2d0j2zs5kfspygwdnpzxkb2hwzcfhrafjvf59v1";
+    buildInputs = [ ];
+  };
+  liberation_ttf_v2_from_source = common rec {
+    version = "2.00.1";
+    url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-${version}.tar.gz";
     sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs";
+    buildInputs = [ fontforge pythonPackages.fonttools python ];
   };
-
-  buildInputs = [ fontforge pythonPackages.fonttools python ];
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    cp -v $(find . -name '*.ttf') $out/share/fonts/truetype
-
-    mkdir -p "$out/doc/${name}"
-    cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New";
-    longDescription = ''
-      The Liberation Fonts are intended to be replacements for the three most
-      commonly used fonts on Microsoft systems: Times New Roman, Arial, and
-      Courier New. Since 2012 they are based on croscore fonts.
-
-      There are three sets: Sans (a substitute for Arial, Albany, Helvetica,
-      Nimbus Sans L, and Bitstream Vera Sans), Serif (a substitute for Times
-      New Roman, Thorndale, Nimbus Roman, and Bitstream Vera Serif) and Mono
-      (a substitute for Courier New, Cumberland, Courier, Nimbus Mono L, and
-      Bitstream Vera Sans Mono).
-    '';
-
-    license = licenses.ofl;
-    homepage = https://fedorahosted.org/liberation-fonts/;
-    maintainers = [
-      maintainers.raskin
-    ];
-    platforms = platforms.unix;
+  liberation_ttf_v2_binary = common rec {
+    version = "2.00.1";
+    url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
+    sha256 = "010m4zfqan4w04b6bs9pm3gapn9hsb18bmwwgp2p6y6idj52g43q";
+    buildInputs = [ ];
   };
-}
+}
\ No newline at end of file
diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix
index 0357c8c17f1..585144f74ed 100644
--- a/pkgs/servers/x11/xquartz/default.nix
+++ b/pkgs/servers/x11/xquartz/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, substituteAll, xterm, makeWrapper, ruby
 , openssl, quartz-wm, fontconfig, xlsfonts, xfontsel
-, ttf_bitstream_vera, freefont_ttf, liberation_ttf_binary
+, ttf_bitstream_vera, freefont_ttf, liberation_ttf
 , shell ? "${bashInteractive}/bin/bash"
 }:
 
@@ -64,7 +64,7 @@ let
     xorg.fontbhlucidatypewriter75dpi
     ttf_bitstream_vera
     freefont_ttf
-    liberation_ttf_binary
+    liberation_ttf
     xorg.fontbh100dpi
     xorg.fontmiscmisc
     xorg.fontcursormisc
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1f9a6fe4fb..6e2106ee7e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12126,9 +12126,12 @@ with pkgs;
 
   league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {};
 
-  liberation_ttf_from_source = callPackage ../data/fonts/redhat-liberation-fonts { };
-  liberation_ttf_binary = callPackage ../data/fonts/redhat-liberation-fonts/binary.nix { };
-  liberation_ttf = liberation_ttf_binary;
+  inherit (callPackages ../data/fonts/redhat-liberation-fonts { })
+    liberation_ttf_v1_from_source
+    liberation_ttf_v1_binary
+    liberation_ttf_v2_from_source
+    liberation_ttf_v2_binary;
+  liberation_ttf = liberation_ttf_v2_binary;
 
   liberationsansnarrow = callPackage ../data/fonts/liberationsansnarrow { };
   liberationsansnarrow_binary = callPackage ../data/fonts/liberationsansnarrow/binary.nix { };

From c54f47b0132e34c7152c764897011b40863255d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@ruiec.cat>
Date: Fri, 3 Feb 2017 23:11:50 +0100
Subject: [PATCH 404/899] kodiPlugins.pvr-hts: 3.4.4 -> 3.4.16

---
 pkgs/applications/video/kodi/plugins.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 463003239d0..c31b97bd5c5 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -236,13 +236,13 @@ in
   pvr-hts = (mkKodiPlugin rec {
     plugin = "pvr-hts";
     namespace = "pvr.hts";
-    version = "3.4.4";
+    version = "3.4.16";
 
     src = fetchFromGitHub {
       owner = "kodi-pvr";
       repo = "pvr.hts";
-      rev = "343ca980982d87c778696e42e52eff763cadee4a";
-      sha256 = "03jk45nk1c5j7zwj6l8s8jyf6ijhisp1r16xg6n5561bm3cfk0b9";
+      rev = "b39e4e9870d68841279cbc7d7214f3ad9b27f330";
+      sha256 = "0pmlgqr4kd0gvckz77mj6v42kcx6lb23anm8jnf2fbn877snnijx";
     };
 
     meta = with stdenv.lib; {

From 26e5b4210640dba7900a1e7e7761bc24d5434dff Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 3 Feb 2017 18:36:50 -0500
Subject: [PATCH 405/899] linux: 4.4.45 -> 4.4.46

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 445ca60ccb4..9dd4fe40ef0 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.45";
+  version = "4.4.46";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0h8p08mgvcvi6g1hl160lc3jaf3jk5d4ilgnkl8dv8s6fwj5kyr2";
+    sha256 = "0n10hx3qgsai72nfcy0ivh3zfgy07saks352vb5a46lhqm34i55v";
   };
 
   kernelPatches = args.kernelPatches;

From 5b83857beeba0bb35a59b527d047a576f59cbf31 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 3 Feb 2017 23:37:31 +0000
Subject: [PATCH 406/899] unison: install unison-fsmonitor

It is necessary for `unison -ui text -repeat watch` to work.
---
 pkgs/applications/networking/sync/unison/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix
index 4cd8c998d41..2daa846990a 100644
--- a/pkgs/applications/networking/sync/unison/default.nix
+++ b/pkgs/applications/networking/sync/unison/default.nix
@@ -11,9 +11,11 @@ stdenv.mkDerivation (rec {
 
   buildInputs = [ ocaml makeWrapper ncurses ];
 
-  preBuild = if enableX11 then ''
+  preBuild = (if enableX11 then ''
     sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" Makefile.OCaml
-  '' else "";
+  '' else "") + ''
+  echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> fsmonitor/linux/Makefile
+  '';
 
   makeFlags = "INSTALLDIR=$(out)/bin/" + (if enableX11 then " UISTYLE=gtk2" else "")
     + (if ! ocaml.nativeCompilers then " NATIVE=false" else "");

From c1e7832591fa5e2b15df27a8cdc91f930ae4c2a4 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 3 Feb 2017 18:54:35 -0500
Subject: [PATCH 407/899] git: 2.11.0 -> 2.11.1

---
 .../version-management/git-and-tools/git/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index c77c746c88f..c93015678e2 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -11,7 +11,7 @@
 }:
 
 let
-  version = "2.11.0";
+  version = "2.11.1";
   svn = subversionClient.override { perlBindings = true; };
 in
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "02zx368id8rys0bh2sjrxz0ln2l2wm5nf1vhp1rj72clsilqszky";
+    sha256 = "05b4jw86w77c3pyh3nm6aw31vhxwzvhnx2x0bcfqmm15wg57k9y0";
   };
 
   hardeningDisable = [ "format" ];

From c45f572c68b108d63b3bf28c5d1ea39c14cef889 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 4 Feb 2017 01:19:08 +0100
Subject: [PATCH 408/899] haskellPackages.mysql-simple: skip check

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a09d4c4a3cd..047bfa33cbb 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -45,6 +45,9 @@ self: super: {
   # test phase requires networking
   mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.lib; });
 
+  # check requires mysql server
+  mysql-simple = dontCheck super.mysql-simple;
+
   # Link the proper version.
   zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; };
 

From fc545322526f67771da21c9ec5978ec1cdad7412 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sat, 4 Feb 2017 11:51:10 +0800
Subject: [PATCH 409/899] wp-cli: 1.0.0 -> 1.1.0

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

diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix
index 6a9d56573e2..c52f2553e3d 100644
--- a/pkgs/development/tools/wp-cli/default.nix
+++ b/pkgs/development/tools/wp-cli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, php }:
 
 let
-  version = "1.0.0";
+  version = "1.1.0";
 
   bin  = "bin/wp";
   ini  = "etc/php/wp-cli.ini";
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url    = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar";
-    sha256 = "06a80fz9na9arjdpmnislwr0121kkg11kxfqmac0axa9vkv9fjcp";
+    sha256 = "08b2lzc8fa9f5xldbdza6x3lg6jsp3wfwpyy187gxqw5pmqp11xc";
   };
 
   buildCommand = ''

From 8454a9e75362d7c5031b927a3ee641b721453f8f Mon Sep 17 00:00:00 2001
From: 3noch <eacameron@gmail.com>
Date: Sat, 4 Feb 2017 02:01:10 -0500
Subject: [PATCH 410/899] haskellPackages.callCabal2nix: provide fallback name
 if source is not package

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

diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index cf30a7699ed..31b20ab19f3 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -87,7 +87,7 @@ let
         # Creates a Haskell package from a source package by calling cabal2nix on the source.
         callCabal2nix = src: self.callPackage (haskellSrc2nix {
           inherit src;
-          name = src.name;
+          name = src.name or baseNameOf src;
         });
 
         ghcWithPackages = selectFrom: withPackages (selectFrom self);

From 7d3db4f491094fa460328cf7e5a073f9f8d8296a Mon Sep 17 00:00:00 2001
From: Bryan Gardiner <bog@khumba.net>
Date: Wed, 25 Jan 2017 21:17:49 -0800
Subject: [PATCH 411/899] squirrel-sql: init at 3.7.1

---
 .../tools/database/squirrel-sql/default.nix   | 69 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 73 insertions(+)
 create mode 100644 pkgs/development/tools/database/squirrel-sql/default.nix

diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix
new file mode 100644
index 00000000000..afac17e121a
--- /dev/null
+++ b/pkgs/development/tools/database/squirrel-sql/default.nix
@@ -0,0 +1,69 @@
+# To enable specific database drivers, override this derivation and pass the
+# driver packages in the drivers argument (e.g. mysql_jdbc, postgresql_jdbc).
+{ stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip
+, jre
+, drivers ? []
+}:
+let
+  version = "3.7.1";
+in stdenv.mkDerivation rec {
+  name = "squirrel-sql-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip";
+    sha256 = "1v141ply57k5krwbnnmz4mbs9hs8rbys0bkjz69gvxlqjizyiq23";
+  };
+
+  buildInputs = [
+    jre makeWrapper stdenv unzip
+  ];
+
+  unpackPhase = ''
+    unzip ${src}
+  '';
+
+  buildPhase = ''
+    cd squirrelsql-${version}-standard
+    chmod +x squirrel-sql.sh
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/squirrel-sql
+    cp -r . $out/share/squirrel-sql
+
+    mkdir -p $out/bin
+    cp=""
+    for pkg in ${builtins.concatStringsSep " " drivers}; do
+      if test -n "$cp"; then
+        cp="$cp:"
+      fi
+      cp="$cp"$(echo $pkg/share/java/*.jar | tr ' ' :)
+    done
+    makeWrapper $out/share/squirrel-sql/squirrel-sql.sh $out/bin/squirrel-sql \
+      --set CLASSPATH "$cp" \
+      --set JAVA_HOME "${jre}"
+
+    mkdir -p $out/share/icons/hicolor/32x32/apps
+    ln -s $out/share/squirrel-sql/icons/acorn.png \
+      $out/share/icons/hicolor/32x32/apps/squirrel-sql.png
+    ln -s ${desktopItem}/share/applications $out/share
+  '';
+
+  desktopItem = makeDesktopItem {
+    name = "squirrel-sql";
+    exec = "squirrel-sql";
+    comment = meta.description;
+    desktopName = "SQuirreL SQL";
+    genericName = "SQL Client";
+    categories = "Development;";
+    icon = "squirrel-sql";
+  };
+
+  meta = {
+    description = "Universal SQL Client";
+    homepage = http://squirrel-sql.sourceforge.net/;
+    license = stdenv.lib.licenses.lgpl21;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ khumba ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1f9a6fe4fb..7c52c377ec7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5443,6 +5443,10 @@ with pkgs;
 
   squeak = callPackage ../development/compilers/squeak { };
 
+  squirrel-sql = callPackage ../development/tools/database/squirrel-sql {
+    drivers = [ mysql_jdbc postgresql_jdbc ];
+  };
+
   stalin = callPackage ../development/compilers/stalin { };
 
   metaBuildEnv = callPackage ../development/compilers/meta-environment/meta-build-env { };

From 433f7c7befcd7bf57341d25c9b617ad4de51c5c6 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Sat, 4 Feb 2017 00:49:53 -0800
Subject: [PATCH 412/899] matrix-synapse: 0.18.7-rc2 -> 0.19.0

---
 pkgs/servers/matrix-synapse/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index fd74ffe54c3..f7890aa8e3c 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -11,26 +11,26 @@ let
   };
   matrix-synapse-ldap3 = pythonPackages.buildPythonApplication rec {
     name = "matrix-synapse-ldap3-${version}";
-    version = "0.1.1";
+    version = "0.1.2";
 
     src = fetchFromGitHub {
       owner = "matrix-org";
       repo = "matrix-synapse-ldap3";
-      rev = "564eb3f109ce7f1082c47d5f8efaa792d90467f1";
-      sha256 = "1mkjlvy7a3rq405m59ihkh1wq7pa4l03fp8hgwwyjnbmz25bqmbk";
+      rev = "v${version}";
+      sha256 = "16pivz1lhs1c3z84rxxy8khyvn0hqxwxaz552br1y9ri0maa0aq8";
     };
 
     propagatedBuildInputs = with pythonPackages; [ service-identity ldap3 twisted ];
   };
 in pythonPackages.buildPythonApplication rec {
   name = "matrix-synapse-${version}";
-  version = "0.18.7-rc2";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "13rx77xfcci7q8xpxxgnh84h6md53akjcy9glwn20vm9vpka3vvj";
+    sha256 = "02zbyfnkc8a0bmaz3ylcwc8010cy0c1vrr7k2yywv5wd3ril4cp6";
   };
 
   patches = [ ./matrix-synapse.patch ];

From 0ca7e01bed9c4afc2c1404101c352cff1fbbd368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 4 Feb 2017 08:56:06 +0100
Subject: [PATCH 413/899] kernelPackages.spl: 0.6.5.8 -> 0.6.5.9

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

diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index f4f39451220..8e0bb935730 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -62,8 +62,8 @@ in
   assert buildKernel -> kernel != null;
   {
     splStable = common {
-      version = "0.6.5.8";
-      sha256 = "000yvaccqlkrq15sdz0734fp3lkmx58182cdcfpm4869i0q7rf0s";
+      version = "0.6.5.9";
+      sha256 = "15qpx2nhprmk14jgb7yqp9dvfb6i3hhhspi77kvian171b0a6112";
     };
     splUnstable = common {
       version = "0.7.0-rc3";

From efd77e06c382c811d7d6b474a46ffb358dd9fd14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 4 Feb 2017 08:56:24 +0100
Subject: [PATCH 414/899] linuxPackages.zfs: 0.6.5.8 -> 0.6.5.9

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

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 7fda9b884d8..602031bab73 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -123,12 +123,12 @@ in
     # to be adapted
     zfsStable = common {
       # comment/uncomment if breaking kernel versions are known
-      incompatibleKernelVersion = "4.9";
+      incompatibleKernelVersion = "4.10";
 
-      version = "0.6.5.8";
+      version = "0.6.5.9";
 
       # this package should point to the latest release.
-      sha256 = "0qccz1832p3i80qlrrrypypspb9sy9hmpgcfx9vmhnqmkf0yri4a";
+      sha256 = "1m8q39j13k46fn0pw3adq87c20rpkg28llxgv2a90994p4127xh0";
       extraPatches = [
         (fetchpatch {
           url = "https://github.com/Mic92/zfs/compare/zfs-0.6.5.8...nixos-zfs-0.6.5.8.patch";

From ac6606fbf4325b50e8bfbf991643d7b3fd6cee37 Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Sat, 4 Feb 2017 10:31:40 +0100
Subject: [PATCH 415/899] bumblebee service: Fix type error when pmMethod =
 "bbswitch"

---
 nixos/modules/hardware/video/bumblebee.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix
index 3ce97ad31c2..fbf3f20885b 100644
--- a/nixos/modules/hardware/video/bumblebee.nix
+++ b/nixos/modules/hardware/video/bumblebee.nix
@@ -76,7 +76,7 @@ in
 
   config = mkIf cfg.enable {
     boot.blacklistedKernelModules = [ "nvidia-drm" "nvidia" "nouveau" ];
-    boot.kernelModules = optional useBbswitch [ "bbswitch" ];
+    boot.kernelModules = optional useBbswitch "bbswitch";
     boot.extraModulePackages = optional useBbswitch kernel.bbswitch ++ optional useNvidia kernel.nvidia_x11;
 
     environment.systemPackages = [ bumblebee primus ];

From 39ac62293c1f9160cc1be3a605873cc226c752b7 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 3 Feb 2017 18:57:21 -0500
Subject: [PATCH 416/899] kotlin: 1.0.5-2 -> 1.0.6

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

diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 52a47c50420..0f2f3d12a1c 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre, unzip }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.5-2";
+  version = "1.0.6";
   name = "kotlin-${version}";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
-    sha512 = "0z8phc51y8dfjnm95fs2dnmvhp7xm2am5xm71byh598flkpjmagnwah4j8z9fpg4qy94dwmqxf5zs3q8nfra89kmwskzpvp7bbibi0h";
+    sha256 = "1dhliqd79hydd62xmrn2nwrcqy7lb5svkahkkpx9w3z9s5r0p8j2";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 45fcefd4bea9ceff7e0c0546c684ae6a7f7f2b40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 4 Feb 2017 11:28:09 +0100
Subject: [PATCH 417/899] qt4: another attempt to fix build on Darwin

---
 pkgs/development/libraries/qt-4.x/4.8/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 4215404a9f6..8c8e311a93e 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -152,7 +152,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = false;
 
-  NIX_CFLAGS_COMPILE = "-std=gnu++98"
+  NIX_CFLAGS_COMPILE =
+    optionalString stdenv.isLinux "-std=gnu++98" # gnu++ in (Obj)C flags is no good on Darwin
     + optionalString (stdenv.isFreeBSD || stdenv.isDarwin)
       " -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"
     + optionalString stdenv.isDarwin " -I${libcxx}/include/c++/v1";

From 94a7a80f0b2981d26f6b75db0ca1a7a308552020 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 4 Feb 2017 11:53:23 +0100
Subject: [PATCH 418/899] Revert "spidermonkey_24: remove"

This reverts commit 5dacc53af3f4537fab693952b5f13b6cafcde6d4.
---
 .../interpreters/spidermonkey/24.nix          | 62 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 63 insertions(+)
 create mode 100644 pkgs/development/interpreters/spidermonkey/24.nix

diff --git a/pkgs/development/interpreters/spidermonkey/24.nix b/pkgs/development/interpreters/spidermonkey/24.nix
new file mode 100644
index 00000000000..6e354c54296
--- /dev/null
+++ b/pkgs/development/interpreters/spidermonkey/24.nix
@@ -0,0 +1,62 @@
+{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi, readline, icu }:
+
+stdenv.mkDerivation rec {
+  version = "24.2.0";
+  name = "spidermonkey-${version}";
+
+  src = fetchurl {
+    url = "mirror://mozilla/js/mozjs-${version}.tar.bz2";
+    sha256 = "1n1phk8r3l8icqrrap4czplnylawa0ddc2cc4cgdz46x3lrkybz6";
+  };
+
+  outputs = [ "out" "dev" "lib" ];
+
+  propagatedBuildInputs = [ nspr ];
+
+  buildInputs = [ pkgconfig perl python2 zip libffi readline icu ];
+
+  postPatch = ''
+    # Fixes an issue with version detection under perl 5.22.x
+    sed -i 's/(defined\((@TEMPLATE_FILE)\))/\1/' config/milestone.pl
+  '';
+
+  postUnpack = "sourceRoot=\${sourceRoot}/js/src";
+
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"
+    export LIBXUL_DIST=$out
+  '';
+
+  setOutputFlags = false;
+  configureFlags = [
+    "--libdir=$(lib)/lib"
+    "--includedir=$(dev)/include"
+    "--enable-threadsafe"
+    "--with-system-icu"
+    "--with-system-nspr"
+    "--with-system-ffi"
+    "--enable-readline"
+  ];
+
+  # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393
+  preBuild = "touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}";
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+  preCheck = "rm jit-test/tests/sunspider/check-date-format-tofte.js"; # https://bugzil.la/600522
+
+  postInstall = ''
+    rm "$lib"/lib/*.a # halve the output size
+    moveToOutput "bin/js*-config" "$dev" # break the cycle
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Mozilla's JavaScript engine written in C/C++";
+    homepage = https://developer.mozilla.org/en/SpiderMonkey;
+    # TODO: MPL/GPL/LGPL tri-license.
+    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f74aa2c4176..07a4ce82a5f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5927,6 +5927,7 @@ with pkgs;
 
   spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { };
   spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { };
+  spidermonkey_24 = callPackage ../development/interpreters/spidermonkey/24.nix { };
   spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.nix { };
   spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix { };
   spidermonkey = spidermonkey_31;

From a558519a55065bc48bbe535d3d0fbc08c183e910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 4 Feb 2017 11:53:37 +0100
Subject: [PATCH 419/899] Revert "gnome3.gjs: 1.46 -> 1.47, use
 spidermonkey_31"

This reverts commit bcfca9224f6ed0933562fdf3d3aa8ff226023d22.
It broke gnome-shell build and I can't see a quick way to fix it;
cause: removal of gjs-internals-1.0.pc.  Stable gnome-shell update
didn't help.
---
 pkgs/desktops/gnome-3/3.22/core/gjs/default.nix | 4 ++--
 pkgs/desktops/gnome-3/3.22/core/gjs/src.nix     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix
index 1141db03c40..ac5572decb8 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix
@@ -1,12 +1,12 @@
 { fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection
-, spidermonkey_31, pango, readline, glib, libxml2, dbus }:
+, spidermonkey_24, pango, readline, glib, libxml2, dbus }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
   buildInputs = [ libxml2 gobjectIntrospection pkgconfig gtk3 glib pango readline dbus ];
 
-  propagatedBuildInputs = [ spidermonkey_31 ];
+  propagatedBuildInputs = [ spidermonkey_24 ];
 
   postInstall = ''
     sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la
diff --git a/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix b/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix
index 7af8d7c531b..1f4ef08f9b1 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix
@@ -1,11 +1,11 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: rec {
-  name = "gjs-${major}.4";
-  major = "1.47";
+  name = "gjs-${major}.0";
+  major = "1.46";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gjs/${major}/${name}.tar.xz";
-    sha256 = "05x9yk3h53wn9fpwbcxl8yz71znhwhzwy7412di77x88ghkxi2c1";
+    sha256 = "2283591fa70785443793e1d7db66071b36052d707075f229baeb468d8dd25ad4";
   };
 }

From 83241c091daec71b1848978a4886e5f8da0f268f Mon Sep 17 00:00:00 2001
From: Tim Jaeger <jger.tm@gmail.com>
Date: Sat, 4 Feb 2017 12:16:37 +0100
Subject: [PATCH 420/899] gogs: fix error on push

Pushing to gogs only works if the `gogs` user's shell is `bash`. For error and
solution, refer to [this SO thread](http://stackoverflow.com/a/22315659)
---
 nixos/modules/services/misc/gogs.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/misc/gogs.nix b/nixos/modules/services/misc/gogs.nix
index 09e5c4fe1ff..ca8fc06e483 100644
--- a/nixos/modules/services/misc/gogs.nix
+++ b/nixos/modules/services/misc/gogs.nix
@@ -208,6 +208,7 @@ in
         group = "gogs";
         home = cfg.stateDir;
         createHome = true;
+        shell = pkgs.bash;
       };
       extraGroups.gogs.gid = config.ids.gids.gogs;
     };

From 7702225ad16ba1e30f506106a8bc36b9eeb5847e Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Sat, 4 Feb 2017 14:13:58 +0100
Subject: [PATCH 421/899] gnused: 4.3 -> 4.4

See https://lists.gnu.org/archive/html/info-gnu/2017-02/msg00001.html
for release information.
---
 pkgs/tools/text/gnused/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix
index ca038b3ccb4..72d632533ff 100644
--- a/pkgs/tools/text/gnused/default.nix
+++ b/pkgs/tools/text/gnused/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnused-${version}";
-  version = "4.3";
+  version = "4.4";
 
   src = fetchurl {
     url = "mirror://gnu/sed/sed-${version}.tar.xz";
-    sha256 = "1anhdgah8h423hlmn9hwzxzr7hjbqjm6hxq3z1p7p7nf8640vhj7";
+    sha256 = "0fv88bcnraixc8jvpacvxshi30p5x9m7yb8ns1hfv07hmb2ypmnb";
   };
 
   outputs = [ "out" "info" ];

From 5b4a8571263477f3163ecf345f059736e173312f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 4 Feb 2017 14:23:41 +0100
Subject: [PATCH 422/899] hydra: 2016-12-09 -> 2017-02-03

Unbreaks the build since commit dea81956fc0904c5723cf56f2bca4497b44ac3c3
("nixUnstable: 1.12pre4911_b30d1e7 -> 1.12pre4997_1351b0d").
---
 pkgs/development/tools/misc/hydra/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index dbd53c65050..0906492ad10 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -61,15 +61,15 @@ let
   };
 in releaseTools.nixBuild rec {
   name = "hydra-${version}";
-  version = "2016-12-09";
+  version = "2017-02-03";
 
   inherit stdenv;
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "hydra";
-    rev = "de55303197d997c4fc5503b52b1321ae9528583d";
-    sha256 = "0nimqsbpjxfwha6d5gp6a7jh50i83z1llmx30da4bscsic8z1xly";
+    rev = "a366f362e197476615a813e2cc904b60db28e65f";
+    sha256 = "0q7bywh59aqgpgj9ca2xscszxal9c3c90bs7sb4cfg7w8g6m69hf";
   };
 
   buildInputs =

From 17b5ae4fe418b5b3c2b62f562c587520259c8269 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 4 Feb 2017 09:09:02 -0500
Subject: [PATCH 423/899] linux: 4.4.46 -> 4.4.47

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 9dd4fe40ef0..a342f0c44f5 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.46";
+  version = "4.4.47";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0n10hx3qgsai72nfcy0ivh3zfgy07saks352vb5a46lhqm34i55v";
+    sha256 = "1rsdz7bqqc3vzh24ii74rwphgi317f9nadxdr2dkxfipdw0w02nf";
   };
 
   kernelPatches = args.kernelPatches;

From 7f69dc48b928e5fd204b357652e1f935f910aafb Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 4 Feb 2017 09:09:19 -0500
Subject: [PATCH 424/899] linux: 4.9.7 -> 4.9.8

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 02a86f0a196..884adc77fd1 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.7";
+  version = "4.9.8";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1p1k1swmpky6iafb6snixhvq3prwbn29fd5cnnv7qff7f4xjhq8b";
+    sha256 = "0i8f1gn7jsl0gcpa54yb3yg24j2a542qvkcc3g9baja8vprbf2qm";
   };
 
   kernelPatches = args.kernelPatches;

From 949f9aff1deef09a96e468131765701702b48254 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 4 Feb 2017 09:18:50 -0500
Subject: [PATCH 425/899] linux: 3.12.69 -> 3.12.70

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index 9a0f314c246..a0d08980719 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.12.69";
+  version = "3.12.70";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1pzghmj0j2shms4n3knryigy73qssskd6awbgk6mmyg42wypbcmm";
+    sha256 = "07l6wjhlii2qlki447d702fi1ycyd85iq750xjmsnnz9xrilw7sc";
   };
 
   kernelPatches = args.kernelPatches;

From d1aa065a5d1924b3315075c03e3206f18378cd42 Mon Sep 17 00:00:00 2001
From: Remy Goldschmidt <taktoa@gmail.com>
Date: Thu, 2 Feb 2017 19:16:45 -0600
Subject: [PATCH 426/899] dotnetPackages.Boogie: init at 2017-01-03

---
 lib/licenses.nix                   |  5 +++++
 pkgs/top-level/dotnet-packages.nix | 31 ++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 90c1cc177cb..4d4a3c1a954 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -379,6 +379,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     fullName = "Mozilla Public License 2.0";
   };
 
+  mspl = spdx {
+    spdxId = "MS-PL";
+    fullName = "Microsoft Public License";
+  };
+
   msrla = {
     fullName  = "Microsoft Research License Agreement";
     url       = "http://research.microsoft.com/en-us/projects/pex/msr-la.txt";
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index c0a7adb1d7f..c3d8b861c76 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -220,6 +220,37 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
 
   # SOURCE PACKAGES
 
+  Boogie = buildDotnetPackage rec {
+    baseName = "Boogie-unstable";
+    version = "2017-01-03";
+
+    src = fetchFromGitHub {
+      owner = "boogie-org";
+      repo = "boogie";
+      rev = "5e42f0dd2891b2b85a9198052e55592a2943b7ef";
+      sha256 = "1mjnf96hbn9abgzyvmrfxlhnm213290xb9wca7rnnl12i4fa4ahl";
+    };
+
+    buildInputs = [ dotnetPackages.NUnitRunners ];
+
+    xBuildFiles = [ "Source/Boogie.sln" ];
+
+    outputFiles = [ "Binaries/*" ];
+
+    postInstall = ''
+        mkdir -pv "$out/lib/dotnet/Boogie"
+        ln -sv "${pkgs.z3}/bin/z3" "$out/lib/dotnet/Boogie/z3.exe"
+    '';
+
+    meta = with stdenv.lib; {
+      description = "An intermediate verification language";
+      homepage = "https://github.com/boogie-org/boogie";
+      license = licenses.mspl;
+      maintainers = [ maintainers.taktoa ];
+      platforms = with platforms; (linux ++ darwin);
+    };
+  };
+
   Deedle = buildDotnetPackage rec {
     baseName = "Deedle";
     version = "1.2.0";

From 913c5b21d5754c78cdf1a376da876ee3bff1de8b Mon Sep 17 00:00:00 2001
From: pngwjpgh <pngwjpgh@users.noreply.github.com>
Date: Sat, 4 Feb 2017 15:36:38 +0100
Subject: [PATCH 427/899] gcs: init at 4.8.0 (#22173)

---
 pkgs/games/gcs/default.nix      | 77 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 +
 2 files changed, 79 insertions(+)
 create mode 100644 pkgs/games/gcs/default.nix

diff --git a/pkgs/games/gcs/default.nix b/pkgs/games/gcs/default.nix
new file mode 100644
index 00000000000..1d96d056a82
--- /dev/null
+++ b/pkgs/games/gcs/default.nix
@@ -0,0 +1,77 @@
+{ stdenv, fetchFromGitHub, runCommand
+, jdk8, ant
+, jre8, makeWrapper
+, findutils
+}:
+
+let
+  gcs = fetchFromGitHub {
+    owner = "richardwilkes";
+    repo = "gcs";
+    rev = "gcs-4.8.0";
+    sha256 = "0k8am8vfwls5s2z4zj1p1aqy8gapn5vbr9zy66s5g048ch8ah1hm";
+  };
+  appleStubs = fetchFromGitHub {
+    owner = "richardwilkes";
+    repo = "apple_stubs";
+    rev = "gcs-4.3.0";
+    sha256 = "0m1qw30b19s04hj7nch1mbvv5s698g5dr1d1r7r07ykvk1yh7zsa";
+  };
+  toolkit = fetchFromGitHub {
+    owner = "richardwilkes";
+    repo = "toolkit";
+    rev = "gcs-4.8.0";
+    sha256 = "1ciwwh0wxk3pzsj6rbggsbg3l2f741qy7yx1ca4v7vflsma84f1n";
+  };
+  library = fetchFromGitHub {
+    owner = "richardwilkes";
+    repo = "gcs_library";
+    rev = "gcs-4.8.0";
+    sha256 = "085jpp9mpv5kw00zds9sywmfq31mrlbrgahnwcjkx0z9i22amz4g";
+  };
+in stdenv.mkDerivation rec {
+  name = "gcs-${version}";
+  version = "4.8.0";
+
+  src = runCommand "${name}-src" { preferLocalBuild = true; } ''
+    mkdir -p $out
+    cd $out
+
+    cp -r ${gcs} gcs
+    cp -r ${appleStubs} apple_stubs
+    cp -r ${toolkit} toolkit
+    cp -r ${library} gcs_library
+  '';
+
+  buildInputs = [ jdk8 jre8 ant makeWrapper ];
+  buildPhase = ''
+    cd apple_stubs
+    ant
+
+    cd ../toolkit
+    ant
+  
+    cd ../gcs
+    ant
+
+    cd ..
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/java
+
+    find gcs/libraries toolkit/libraries apple_stubs/ \( -name '*.jar' -and -not -name '*-src.jar' \) -exec cp '{}' $out/share/java ';'
+    
+    makeWrapper ${jre8}/bin/java $out/bin/gcs \
+      --set GCS_LIBRARY ${library} \
+      --add-flags "-cp $out/share/java/gcs-${version}.jar com.trollworks.gcs.app.GCS"
+  '';  
+
+  meta = with stdenv.lib; {
+    description = "A stand-alone, interactive, character sheet editor for the GURPS 4th Edition roleplaying game system";
+    homepage = "http://gurpscharactersheet.com/";
+    license = licenses.mpl20;
+    platforms = platforms.all;
+    maintainers = with maintainers; [];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1264013db36..9f870bc76ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16062,6 +16062,8 @@ with pkgs;
 
   gav = callPackage ../games/gav { };
 
+  gcs = callPackage ../games/gcs { };
+
   gemrb = callPackage ../games/gemrb { };
 
   ghostOne = callPackage ../servers/games/ghost-one { };

From 762cc106b489a0eba55a72a8fdd17d24054132d9 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sat, 4 Feb 2017 15:07:45 +0000
Subject: [PATCH 428/899] virt-top: init at 1.0.8 (#21536)

---
 .../virtualization/virt-top/default.nix       | 23 ++++++++++++
 .../ocaml-modules/curses/default.nix          | 31 ++++++++++++++++
 .../ocaml-modules/ocaml-gettext/default.nix   | 36 +++++++++++++++++++
 .../ocaml-modules/ocaml-libvirt/default.nix   | 29 +++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 pkgs/top-level/ocaml-packages.nix             |  6 ++++
 6 files changed, 127 insertions(+)
 create mode 100644 pkgs/applications/virtualization/virt-top/default.nix
 create mode 100644 pkgs/development/ocaml-modules/curses/default.nix
 create mode 100644 pkgs/development/ocaml-modules/ocaml-gettext/default.nix
 create mode 100644 pkgs/development/ocaml-modules/ocaml-libvirt/default.nix

diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix
new file mode 100644
index 00000000000..f411ea5c83e
--- /dev/null
+++ b/pkgs/applications/virtualization/virt-top/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, ocamlPackages }:
+
+stdenv.mkDerivation rec {
+  name = "virt-top-${version}";
+  version = "1.0.8";
+
+  src = fetchurl {
+    url = "https://people.redhat.com/~rjones/virt-top/files/virt-top-${version}.tar.gz";
+    sha256 = "04i1sf2d3ghilmzvr2vh74qcy009iifyc2ymj9kxnbkp97lrz13w";
+  };
+
+  buildInputs = with ocamlPackages; [ ocaml findlib ocaml_extlib ocaml_libvirt ocaml_gettext curses csv xml-light ];
+
+  buildPhase = "make opt";
+
+  meta = with stdenv.lib; {
+    description = "A top-like utility for showing stats of virtualized domains";
+    homepage = https://people.redhat.com/~rjones/virt-top/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.volth ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix
new file mode 100644
index 00000000000..4fd75e7aac5
--- /dev/null
+++ b/pkgs/development/ocaml-modules/curses/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, ocaml, findlib, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "ocaml-curses-${version}";
+  version = "1.0.3";
+
+  src = fetchurl {
+    url = "http://ocaml.phauna.org/distfiles/ocaml-curses-${version}.ogunden1.tar.gz";
+    sha256 = "0fxya4blx4zcp9hy8gxxm2z7aas7hfvwnjdlj9pmh0s5gijpwsll";
+  };
+
+  propagatedBuildInputs = [ ncurses ];
+
+  buildInputs = [ ocaml findlib ];
+
+  createFindlibDestdir = true;
+
+  postPatch = ''
+    substituteInPlace curses.ml --replace "pp gcc" "pp $CC"
+  '';
+
+  buildPhase = "make all opt";
+
+  meta = with stdenv.lib; {
+    description = "OCaml Bindings to curses/ncurses";
+    homepage = https://opam.ocaml.org/packages/curses/curses.1.0.3/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.volth ];
+    platforms = ocaml.meta.platforms or [];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix
new file mode 100644
index 00000000000..d8a874a7e2f
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, ocaml, findlib, camlp4, ounit, gettext, fileutils, camomile }:
+
+stdenv.mkDerivation rec {
+  name = "ocaml-gettext-${version}";
+  version = "0.3.5";
+
+  src = fetchurl {
+    url = "https://forge.ocamlcore.org/frs/download.php/1433/ocaml-gettext-${version}.tar.gz";
+    sha256 = "0s625h7y9xxqvzk4bnw45k4wvl4fn8gblv56bp47il0lgsx8956i";
+  };
+
+  propagatedBuildInputs = [ gettext fileutils camomile ];
+
+  buildInputs = [ ocaml findlib camlp4 ounit ];
+
+  postPatch = stdenv.lib.optionalString (camlp4 != null) ''
+    substituteInPlace test/test.ml                  --replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4"
+    substituteInPlace ocaml-gettext/OCamlGettext.ml --replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4"
+    substituteInPlace ocaml-gettext/Makefile        --replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4"
+    substituteInPlace ocaml-gettext/Makefile        --replace "unix.cma" ""
+    substituteInPlace libgettext-ocaml/Makefile     --replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4"
+    substituteInPlace libgettext-ocaml/Makefile     --replace "\$(shell ocamlc -where)" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib"
+  '';
+
+  configureFlags = [ "--disable-doc" ];
+
+  createFindlibDestdir = true;
+
+  meta = with stdenv.lib; {
+    description = "OCaml Bindings to gettext";
+    homepage = https://forge.ocamlcore.org/projects/ocaml-gettext;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.volth ];
+    platforms = ocaml.meta.platforms or [];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
new file mode 100644
index 00000000000..439beaa24ff
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, libvirt, ocaml, findlib }:
+
+stdenv.mkDerivation rec {
+  name = "ocaml-libvirt-${version}";
+  version = "0.6.1.4";
+
+  src = fetchurl {
+    url = "http://libvirt.org/sources/ocaml/ocaml-libvirt-${version}.tar.gz";
+    sha256 = "06q2y36ckb34n179bwczxkl82y3wrba65xb2acg8i04jpiyxadjd";
+  };
+
+  propagatedBuildInputs = [ libvirt ];
+
+  buildInputs = [ ocaml findlib ];
+
+  createFindlibDestdir = true;
+
+  buildPhase = if stdenv.cc.isClang then "make all opt CPPFLAGS=-Wno-error" else "make all opt";
+
+  installPhase = "make install-opt";
+
+  meta = with stdenv.lib; {
+    description = "OCaml bindings for libvirt";
+    homepage = https://libvirt.org/ocaml/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.volth ];
+    platforms = ocaml.meta.platforms or [];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f870bc76ea..05f903b8d80 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15400,6 +15400,8 @@ with pkgs;
     spice_gtk = spice_gtk;
   };
 
+  virt-top = callPackage ../applications/virtualization/virt-top { };
+
   virtmanager = callPackage ../applications/virtualization/virt-manager {
     vte = gnome3.vte;
     dconf = gnome3.dconf;
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index c55c3a5a068..bcca2aaf0f8 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -142,6 +142,8 @@ let
 
     csv = callPackage ../development/ocaml-modules/csv { };
 
+    curses = callPackage ../development/ocaml-modules/curses { };
+
     custom_printf = callPackage ../development/ocaml-modules/custom_printf { };
 
     ctypes = callPackage ../development/ocaml-modules/ctypes { };
@@ -309,10 +311,14 @@ let
 
     ocamlfuse = callPackage ../development/ocaml-modules/ocamlfuse { };
 
+    ocaml_gettext = callPackage ../development/ocaml-modules/ocaml-gettext { };
+
     ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { };
 
     ocaml_http = callPackage ../development/ocaml-modules/http { };
 
+    ocaml_libvirt = callPackage ../development/ocaml-modules/ocaml-libvirt { };
+
     ocamlify = callPackage ../development/tools/ocaml/ocamlify { };
 
     ocaml_lwt = callPackage ../development/ocaml-modules/lwt { };

From 9e299acf873285e30008588ac3e21cda12f865fb Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sat, 4 Feb 2017 15:38:01 +0000
Subject: [PATCH 429/899] liberastika: init at 1.1.5 (#22420)

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

diff --git a/pkgs/data/fonts/liberastika/default.nix b/pkgs/data/fonts/liberastika/default.nix
new file mode 100644
index 00000000000..964210c8dfe
--- /dev/null
+++ b/pkgs/data/fonts/liberastika/default.nix
@@ -0,0 +1,33 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation rec {
+  name = "liberastika-${version}";
+  version = "1.1.5";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/lib-ka/liberastika-ttf-${version}.zip";
+    sha256 = "0vg5ki120lb577ihvq8w0nxs8yacqzcvsmnsygksmn6281hyj0xj";
+  };
+
+  buildInputs = [ unzip ];
+
+  sourceRoot = ".";
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp -v $(find . -name '*.ttf') $out/share/fonts/truetype
+
+    mkdir -p "$out/doc/${name}"
+    cp -v AUTHORS ChangeLog COPYING README "$out/doc/${name}" || true
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Liberation Sans fork with improved cyrillic support";
+    homepage = https://sourceforge.net/projects/lib-ka/;
+
+    license = licenses.gpl2;
+    platforms = platforms.all;
+    hydraPlatforms = [];
+    maintainers = [ maintainers.volth ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05f903b8d80..7f4c71a0048 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12140,6 +12140,8 @@ with pkgs;
   liberationsansnarrow = callPackage ../data/fonts/liberationsansnarrow { };
   liberationsansnarrow_binary = callPackage ../data/fonts/liberationsansnarrow/binary.nix { };
 
+  liberastika = callPackage ../data/fonts/liberastika { };
+
   libertine = callPackage ../data/fonts/libertine { };
 
   libre-baskerville = callPackage ../data/fonts/libre-baskerville { };

From 42fd61b6601d4078662033cf6780b0d310323e55 Mon Sep 17 00:00:00 2001
From: Danny Arnold <despair.blue@gmail.com>
Date: Sat, 4 Feb 2017 18:27:22 +0100
Subject: [PATCH 430/899] Spotify: 1.0.47 -> 1.0.48

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

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 9e310d6e4e4..b678380f12d 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -6,7 +6,7 @@ assert stdenv.system == "x86_64-linux";
 
 let
   # Please update the stable branch!
-  version = "1.0.47.13.gd8e05b1f-47";
+  version = "1.0.48.103.g15edf1ec-94";
 
   deps = [
     alsaLib
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
   src =
     fetchurl {
       url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
-      sha256 = "0079vq2nw07795jyqrjv68sc0vqjy6abjh6jjd5cg3hqlxdf4ckz";
+      sha256 = "0rpwxgxv2ihfhlri98k4n87ynlcp569gm9q6hd8jg0vd2jgji8b3";
     };
 
   buildInputs = [ dpkg makeWrapper ];

From ab983c4dbdaa5c3028dbe60f097c705f6af33592 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Sat, 4 Feb 2017 18:31:31 +0100
Subject: [PATCH 431/899] bdf2psf 1.152 -> 1.158

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

diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix
index e61f99d2bbf..bf1377419a5 100644
--- a/pkgs/tools/misc/bdf2psf/default.nix
+++ b/pkgs/tools/misc/bdf2psf/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "bdf2psf-${version}";
-  version = "1.152";
+  version = "1.158";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
-    sha256 = "1hk5g0zhj78p74z0hdx3v29s5bpx0npabwdawaigwwxrrj03q9mw";
+    sha256 = "12zaj7hi5gzdh9r7rcyqnkwik1ljw1qzj6j7rw80bgw6fn611rs9";
   };
 
   buildInputs = [ dpkg ];

From 4ee66dbc7c8d4e7289956a58766d1c8011c0be75 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Sat, 4 Feb 2017 18:51:44 +0100
Subject: [PATCH 432/899] btfs: 2.12 -> 2.13

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

diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix
index 84f1abcca36..28efa6fcea8 100644
--- a/pkgs/os-specific/linux/btfs/default.nix
+++ b/pkgs/os-specific/linux/btfs/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "btfs-${version}";
-  version = "2.12";
+  version = "2.13";
 
   src = fetchFromGitHub {
-    owner = "johang";
-    repo = "btfs";
-    rev = "daeb2fd43795f0bb9a4861279b6064b35186ff25";
-    sha256 = "1apvf1gp5973s4wlzwndxp711yd9pj9zf2ypdssfxv2a3rihly2b";
+    owner  = "johang";
+    repo   = "btfs";
+    rev    = "v${version}";
+    sha256 = "1nd021xbxrikd8p0w9816xjwlrs9m1nc6954q23qxfw2jbmszlk2";
   };
 
   buildInputs = [

From 67dcb6aa4c7dae60462444c2d69747570ffa948e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@ruiec.cat>
Date: Fri, 3 Feb 2017 17:32:33 +0100
Subject: [PATCH 433/899] jsoncpp: fix build on darwin

Also, fixed maintainer attrib
---
 pkgs/development/libraries/jsoncpp/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix
index 62e5e7133b4..18ea6370634 100644
--- a/pkgs/development/libraries/jsoncpp/default.nix
+++ b/pkgs/development/libraries/jsoncpp/default.nix
@@ -25,7 +25,9 @@ stdenv.mkDerivation rec {
 
   # Hack to be able to run the test, broken because we use
   # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install
-  preBuild = ''
+  preBuild = if stdenv.isDarwin then ''
+    export DYLD_LIBRARY_PATH="`pwd`/src/lib_json:$DYLD_LIBRARY_PATH"
+  '' else ''
     export LD_LIBRARY_PATH="`pwd`/src/lib_json:$LD_LIBRARY_PATH"
   '';
 
@@ -40,7 +42,7 @@ stdenv.mkDerivation rec {
     inherit version;
     homepage = https://github.com/open-source-parsers/jsoncpp;
     description = "A C++ library for interacting with JSON.";
-    maintainers = with maintainers; [ ttuegel page ];
+    maintainers = with maintainers; [ ttuegel cpages ];
     license = licenses.mit;
     platforms = platforms.all;
   };

From d91b39b3f966cde10058d43ccc226e934b3c5e80 Mon Sep 17 00:00:00 2001
From: Hannu Hartikainen <hannu.hartikainen@gmail.com>
Date: Wed, 25 Jan 2017 18:25:36 +0200
Subject: [PATCH 434/899] illum: init at 0.4

---
 lib/maintainers.nix                       |  1 +
 nixos/modules/module-list.nix             |  1 +
 nixos/modules/services/hardware/illum.nix | 35 ++++++++++++++++++++++
 pkgs/tools/system/illum/default.nix       | 36 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 5 files changed, 75 insertions(+)
 create mode 100644 nixos/modules/services/hardware/illum.nix
 create mode 100644 pkgs/tools/system/illum/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 4672dc59d43..c956d0a4a37 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -111,6 +111,7 @@
   cwoac = "Oliver Matthews <oliver@codersoffortune.net>";
   DamienCassou = "Damien Cassou <damien@cassou.me>";
   danbst = "Danylo Hlynskyi <abcz2.uprola@gmail.com>";
+  dancek = "Hannu Hartikainen <hannu.hartikainen@gmail.com>";
   danielfullmer = "Daniel Fullmer <danielrf12@gmail.com>";
   dasuxullebt = "Christoph-Simon Senjak <christoph.senjak@googlemail.com>";
   davidak = "David Kleuker <post@davidak.de>";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 1398542a5c1..bd427bc679c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -197,6 +197,7 @@
   ./services/hardware/bluetooth.nix
   ./services/hardware/brltty.nix
   ./services/hardware/freefall.nix
+  ./services/hardware/illum.nix
   ./services/hardware/irqbalance.nix
   ./services/hardware/nvidia-optimus.nix
   ./services/hardware/pcscd.nix
diff --git a/nixos/modules/services/hardware/illum.nix b/nixos/modules/services/hardware/illum.nix
new file mode 100644
index 00000000000..ff73c99a653
--- /dev/null
+++ b/nixos/modules/services/hardware/illum.nix
@@ -0,0 +1,35 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.illum;
+in {
+
+  options = {
+
+    services.illum = {
+
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Enable illum, a daemon for controlling screen brightness with brightness buttons.
+        '';
+      };
+
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    systemd.services.illum = {
+      description = "Backlight Adjustment Service";
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig.ExecStart = "${pkgs.illum}/bin/illum-d";
+    };
+
+  };
+
+}
diff --git a/pkgs/tools/system/illum/default.nix b/pkgs/tools/system/illum/default.nix
new file mode 100644
index 00000000000..4cdfeec12b7
--- /dev/null
+++ b/pkgs/tools/system/illum/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchgit, pkgconfig, ninja, libevdev, libev }:
+
+stdenv.mkDerivation rec {
+  version = "0.4";
+  name = "illum-${version}";
+
+  src = fetchgit {
+    url = "https://github.com/jmesmon/illum.git";
+    fetchSubmodules = true;
+    rev = "48ce8631346b1c88a901a8e4fa5fa7e8ffe8e418";
+    sha256 = "05v3hz7n6b1mlhc6zqijblh1vpl0ja1y8y0lafw7mjdz03wxhfdb";
+  };
+
+  buildInputs = [ pkgconfig ninja libevdev libev ];
+
+  configurePhase = ''
+    bash ./configure
+  '';
+
+  buildPhase = ''
+    ninja
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv illum-d $out/bin
+  '';
+
+  meta = {
+    homepage = https://github.com/jmesmon/illum;
+    description = "Daemon that wires button presses to screen backlight level";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.dancek ];
+    license = stdenv.lib.licenses.agpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7f4c71a0048..d7b8c4e8ee0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17545,6 +17545,8 @@ with pkgs;
 
   hplipWithPlugin_3_15_9 = hplip_3_15_9.override { withPlugin = true; };
 
+  illum = callPackage ../tools/system/illum { };
+
   # using the new configuration style proposal which is unstable
   jack1 = callPackage ../misc/jackaudio/jack1.nix { };
 

From 4e83364a1df7e854d5ad3ffc871422f1f2e5cb27 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Sat, 4 Feb 2017 19:32:13 +0100
Subject: [PATCH 435/899] zimg: 2.3 -> 2.4

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

diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix
index d1d0735e46d..7fb14de7951 100644
--- a/pkgs/development/libraries/zimg/default.nix
+++ b/pkgs/development/libraries/zimg/default.nix
@@ -2,22 +2,22 @@
 
 stdenv.mkDerivation rec{
   name = "zimg-${version}";
-  version = "2.3";
+  version = "2.4";
 
   src = fetchFromGitHub {
-    owner = "sekrit-twc";
-    repo  = "zimg";
-    rev    = "9cbe9b0de66a690bdd142bae0e656e27c1f50ade";
-    sha256 = "1qj5fr8ghgnyfjzdvgkvplicqsgyp05g3pvsdrg9yivvx32291hp";
+    owner  = "sekrit-twc";
+    repo   = "zimg";
+    rev    = "v${version}";
+    sha256 = "11pk8a5manr751jhy0xrql57jzab57lwqjxbpd8kvm9m8b51icwq";
   };
 
   buildInputs = [ autoreconfHook ];
 
   meta = with stdenv.lib; {
     description = "Scaling, colorspace conversion and dithering library";
-    homepage = https://github.com/sekrit-twc/zimg;
-    license  = licenses.wtfpl;
-    platforms = platforms.linux; # check upstream issue #52
+    homepage    = https://github.com/sekrit-twc/zimg;
+    license     = licenses.wtfpl;
+    platforms   = platforms.linux; # check upstream issue #52
     maintainers = with maintainers; [ rnhmjoj ];
   };
 }

From 98eb852deecf0a73c47801d5981d4585a5f32bf9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 4 Feb 2017 14:07:30 +0100
Subject: [PATCH 436/899] libzmf: configure with --disable-werror, needed on
 i686

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

diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/development/libraries/libzmf/default.nix
index 59b10a897eb..f4b7aaf3fe2 100644
--- a/pkgs/development/libraries/libzmf/default.nix
+++ b/pkgs/development/libraries/libzmf/default.nix
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [boost icu libpng librevenge zlib cppunit];
   nativeBuildInputs = [doxygen pkgconfig];
+  configureFlags = " --disable-werror ";
 
   meta = {
     inherit version;

From d4c996093d2834e3e1979db109547c8c6683a652 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 4 Feb 2017 19:51:44 +0100
Subject: [PATCH 437/899] libreoffice-still, libreoffice-fresh: remove a test
 that fails on i686

---
 pkgs/applications/office/libreoffice/default.nix | 1 +
 pkgs/applications/office/libreoffice/still.nix   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 30fc20b6e4f..ea265ae6661 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -129,6 +129,7 @@ in stdenv.mkDerivation rec {
     sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
     sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx
     sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx
+    sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
     # not sure about this fragile test
     sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
   '';
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index f098938ba38..40ab4e6a2d6 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -128,6 +128,7 @@ in stdenv.mkDerivation rec {
     sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
     sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
     sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx
+    sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
   '';
 
   makeFlags = "SHELL=${bash}/bin/bash";

From c9f4358e37e928c2ade4b06d7d04e417d29f2960 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Sat, 4 Feb 2017 19:56:22 +0100
Subject: [PATCH 438/899] vapoursynth: R35 -> R36

---
 .../libraries/vapoursynth/default.nix            | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix
index cfa2c3fa1f2..0922a5e3785 100644
--- a/pkgs/development/libraries/vapoursynth/default.nix
+++ b/pkgs/development/libraries/vapoursynth/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "vapoursynth-${version}";
-  version = "R35";
+  version = "R36";
 
   src = fetchFromGitHub {
-    owner = "vapoursynth";
-    repo  = "vapoursynth";
-    rev    = "dcab1529d445776a5575859aea655e613c23c8bc";
-    sha256 = "0nhpqws91b19lql2alc5pxgzfgh1wjrws0kyvir41jhfxhhjaqpi";
+    owner  = "vapoursynth";
+    repo   = "vapoursynth";
+    rev    = version;
+    sha256 = "10yiccj7yd4bd3a6k15xahb5y3ymcagyaqavh0wal2rwzfck9k8c";
   };
 
   buildInputs = [
@@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A video processing framework with the future in mind";
-    homepage = http://www.vapoursynth.com/;
-    license   = licenses.lgpl21;
-    platforms = platforms.unix;
+    homepage    = http://www.vapoursynth.com/;
+    license     = licenses.lgpl21;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ rnhmjoj ];
   };
 

From d2a571aacde26a3b09ac01b4ca77831a7ac6e4ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 4 Feb 2017 20:46:49 +0100
Subject: [PATCH 439/899] audacity: fixup build also with default gcc

and enableParallelBuilding.
---
 pkgs/applications/audio/audacity/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index 8b81fd7c35a..92e6adbaa96 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -20,12 +20,13 @@ stdenv.mkDerivation rec {
         + "/audacity-ffmpeg.patch?h=packages/audacity&id=0c1e35798d4d70692";
       sha256 = "19fr674mw844zmkp1476yigkcnmb6zyn78av64ccdwi3p68i00rf";
     })
-    (fetchpatch {
-      name = "gcc6.patch";
-      url = "https://github.com/audacity/audacity/commit/60f2322055756e8cacfe96530a12c63e9694482c.patch";
-      sha256 = "07jlxr8y7ap3nsblx3zh8v9rcx7ajbcfnvwzhwykmbwbsyirgqf2";
-    })
-  ];
+  ]
+    ++ optional (hasPrefix "gcc-6" stdenv.cc.cc.name)
+      (fetchpatch {
+        name = "gcc6.patch";
+        url = "https://github.com/audacity/audacity/commit/60f2322055756e8cacfe96530a12c63e9694482c.patch";
+        sha256 = "07jlxr8y7ap3nsblx3zh8v9rcx7ajbcfnvwzhwykmbwbsyirgqf2";
+      });
 
   preConfigure = /* we prefer system-wide libs */ ''
     mv lib-src lib-src-rm
@@ -64,6 +65,8 @@ stdenv.mkDerivation rec {
     ffmpeg libmad lame libvorbis flac soundtouch
   ]; #ToDo: detach sbsms
 
+  enableParallelBuilding = true;
+
   dontDisableStatic = true;
   doCheck = false; # Test fails
 

From 73d798549fdc5a77245558ac27976ac76a2c44e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 4 Feb 2017 20:58:47 +0100
Subject: [PATCH 440/899] protobuf, perf: fix my bad condition on gcc version

---
 pkgs/development/libraries/protobuf/generic-v3.nix | 2 +-
 pkgs/os-specific/linux/kernel/perf.nix             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix
index 39cf0a1741d..44ecdcb2f65 100644
--- a/pkgs/development/libraries/protobuf/generic-v3.nix
+++ b/pkgs/development/libraries/protobuf/generic-v3.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = with stdenv.lib;
     # gcc before 6 doesn't know this option
-    optionalString (hasPrefix "gcc-6" stdenv.cc.cc) "-Wno-error=misleading-indentation";
+    optionalString (hasPrefix "gcc-6" stdenv.cc.cc.name) "-Wno-error=misleading-indentation";
 
   meta = {
     description = "Google's data interchange format";
diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index 0bfd8dfe700..fa4ac3b513d 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
     "-Wno-error=cpp" "-Wno-error=bool-compare" "-Wno-error=deprecated-declarations"
   ]
     # gcc before 6 doesn't know these options
-    ++ stdenv.lib.optionals (hasPrefix "gcc-6" stdenv.cc.cc) [
+    ++ stdenv.lib.optionals (hasPrefix "gcc-6" stdenv.cc.cc.name) [
       "-Wno-error=unused-const-variable" "-Wno-error=misleading-indentation"
     ];
 

From b0f1881440b29b8c681671648a483a45b8fb277e Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Sat, 4 Feb 2017 20:58:55 +0100
Subject: [PATCH 441/899] fish: 2.3.1 -> 2.5.0

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

diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index f4da2f6fcda..5bdf295cc6e 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -8,13 +8,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "fish-${version}";
-  version = "2.3.1";
+  version = "2.5.0";
 
   patches = [ ./etc_config.patch ];
 
   src = fetchurl {
     url = "http://fishshell.com/files/${version}/${name}.tar.gz";
-    sha256 = "0r46p64lg6da3v6chsa4gisvl04kd3rpy60yih8r870kbp9wm2ij";
+    sha256 = "19djav128nkhjxgfhwhc32i5y9d9c3karbh5yg67kqrdranyvh7q";
   };
 
   buildInputs = [ ncurses libiconv pcre2 ];

From 927b8159aa9eec096d262d8cabd0ad785945c3fa Mon Sep 17 00:00:00 2001
From: Jake Waksbaum <jake.waksbaum@gmail.com>
Date: Sat, 4 Feb 2017 16:18:28 -0500
Subject: [PATCH 442/899] nodePackages: Add tern (#22418)

* nodePackages: Add tern

* Remove duplicate tapable
---
 .../node-packages/node-packages-v4.nix        | 258 +++++++++++-------
 .../node-packages/node-packages-v6.nix        | 225 +++++++++------
 .../node-packages/node-packages.json          |   1 +
 3 files changed, 304 insertions(+), 180 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index 72f0f0a24d9..54687d92bbd 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -868,22 +868,22 @@ let
         sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82";
       };
     };
-    "ms-rest-1.15.2" = {
+    "ms-rest-1.15.4" = {
       name = "ms-rest";
       packageName = "ms-rest";
-      version = "1.15.2";
+      version = "1.15.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.2.tgz";
-        sha1 = "882f7d22bd2360505f03b0cbfdd19a8f71e012ff";
+        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.4.tgz";
+        sha1 = "7af7038fe843fd89d407fec346320db6b010ef8c";
       };
     };
-    "ms-rest-azure-1.15.2" = {
+    "ms-rest-azure-1.15.4" = {
       name = "ms-rest-azure";
       packageName = "ms-rest-azure";
-      version = "1.15.2";
+      version = "1.15.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.2.tgz";
-        sha1 = "8375437c2199d8d4bc001d2308b5fc1c1fcf3d83";
+        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.4.tgz";
+        sha1 = "ea89bce23c6ddd4593db1e86f6557cc6374e3492";
       };
     };
     "node-forge-0.6.23" = {
@@ -1435,24 +1435,6 @@ let
         sha1 = "44c5ee151aece6c4bf5364cfc7c28fe4e58f18df";
       };
     };
-    "uuid-2.0.1" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz";
-        sha1 = "c2a30dedb3e535d72ccf82e343941a50ba8533ac";
-      };
-    };
-    "azure-arm-resource-1.4.4-preview" = {
-      name = "azure-arm-resource";
-      packageName = "azure-arm-resource";
-      version = "1.4.4-preview";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.4.4-preview.tgz";
-        sha1 = "557696d45a89d8320c1aa0916297024b71b73fe2";
-      };
-    };
     "debug-0.7.4" = {
       name = "debug";
       packageName = "debug";
@@ -2209,13 +2191,13 @@ let
         sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505";
       };
     };
-    "bcrypt-pbkdf-1.0.0" = {
+    "bcrypt-pbkdf-1.0.1" = {
       name = "bcrypt-pbkdf";
       packageName = "bcrypt-pbkdf";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz";
-        sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4";
+        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz";
+        sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d";
       };
     };
     "mime-db-1.26.0" = {
@@ -9035,13 +9017,13 @@ let
         sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3";
       };
     };
-    "espree-3.3.2" = {
+    "espree-3.4.0" = {
       name = "espree";
       packageName = "espree";
-      version = "3.3.2";
+      version = "3.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/espree/-/espree-3.3.2.tgz";
-        sha1 = "dbf3fadeb4ecb4d4778303e50103b3d36c88b89c";
+        url = "https://registry.npmjs.org/espree/-/espree-3.4.0.tgz";
+        sha1 = "41656fa5628e042878025ef467e78f125cb86e1d";
       };
     };
     "estraverse-4.2.0" = {
@@ -10052,13 +10034,13 @@ let
         sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61";
       };
     };
-    "node-pre-gyp-0.6.32" = {
+    "node-pre-gyp-0.6.33" = {
       name = "node-pre-gyp";
       packageName = "node-pre-gyp";
-      version = "0.6.32";
+      version = "0.6.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz";
-        sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5";
+        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.33.tgz";
+        sha1 = "640ac55198f6a925972e0c16c4ac26a034d5ecc9";
       };
     };
     "npmlog-4.0.2" = {
@@ -15606,8 +15588,8 @@ let
       version = "1.3.6";
       src = fetchgit {
         url = "https://github.com/gwicke/kad.git";
-        rev = "f35971036f43814043245da82b12d035b7bbfd16";
-        sha256 = "9529b2615547db37851d15b39155c608d6b8d0641366d14cce728824b6135a35";
+        rev = "936c91652d757ea6f9dd30e44698afb0daaa1d17";
+        sha256 = "69b2ef001b9f4161dad34f5305a5895cfa9f98f124689277293fd544d06f9251";
       };
     };
     "clarinet-0.11.0" = {
@@ -17573,6 +17555,42 @@ let
         sha1 = "316545bf22229225a2cecaa6824cd2f56a9709ed";
       };
     };
+    "enhanced-resolve-2.3.0" = {
+      name = "enhanced-resolve";
+      packageName = "enhanced-resolve";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-2.3.0.tgz";
+        sha1 = "a115c32504b6302e85a76269d7a57ccdd962e359";
+      };
+    };
+    "resolve-from-2.0.0" = {
+      name = "resolve-from";
+      packageName = "resolve-from";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz";
+        sha1 = "9480ab20e94ffa1d9e80a804c7ea147611966b57";
+      };
+    };
+    "tapable-0.2.6" = {
+      name = "tapable";
+      packageName = "tapable";
+      version = "0.2.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tapable/-/tapable-0.2.6.tgz";
+        sha1 = "206be8e188860b514425375e6f1ae89bfb01fd8d";
+      };
+    };
+    "memory-fs-0.3.0" = {
+      name = "memory-fs";
+      packageName = "memory-fs";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz";
+        sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20";
+      };
+    };
     "async-2.1.2" = {
       name = "async";
       packageName = "async";
@@ -18266,15 +18284,6 @@ let
         sha1 = "a3a59ec97024985b46e958379646f96c4b616646";
       };
     };
-    "tapable-0.2.6" = {
-      name = "tapable";
-      packageName = "tapable";
-      version = "0.2.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tapable/-/tapable-0.2.6.tgz";
-        sha1 = "206be8e188860b514425375e6f1ae89bfb01fd8d";
-      };
-    };
     "watchpack-1.2.0" = {
       name = "watchpack";
       packageName = "watchpack";
@@ -18780,16 +18789,14 @@ in
         ];
       })
       sources."moment-2.17.1"
-      (sources."ms-rest-1.15.2" // {
+      (sources."ms-rest-1.15.4" // {
         dependencies = [
           sources."duplexer-0.1.1"
         ];
       })
-      (sources."ms-rest-azure-1.15.2" // {
+      (sources."ms-rest-azure-1.15.4" // {
         dependencies = [
           sources."async-0.2.7"
-          sources."uuid-2.0.1"
-          sources."azure-arm-resource-1.4.4-preview"
         ];
       })
       sources."node-forge-0.6.23"
@@ -18975,7 +18982,7 @@ in
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
-                  sources."bcrypt-pbkdf-1.0.0"
+                  sources."bcrypt-pbkdf-1.0.1"
                 ];
               })
             ];
@@ -21494,7 +21501,7 @@ in
                           sources."tweetnacl-0.14.5"
                           sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
-                          sources."bcrypt-pbkdf-1.0.0"
+                          sources."bcrypt-pbkdf-1.0.1"
                         ];
                       })
                     ];
@@ -21877,7 +21884,7 @@ in
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
-                      sources."bcrypt-pbkdf-1.0.0"
+                      sources."bcrypt-pbkdf-1.0.1"
                     ];
                   })
                 ];
@@ -22660,10 +22667,10 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "3.0.2";
+    version = "3.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.0.2.tgz";
-      sha1 = "0f010dbd6e26db0270abd88e3e5403062eb4f7a4";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.1.0.tgz";
+      sha1 = "4bec1f64f7931b84884306fb5b37a0d269d81e8d";
     };
     dependencies = [
       (sources."JSONStream-1.3.0" // {
@@ -22679,6 +22686,7 @@ in
       })
       sources."aws4-1.5.0"
       sources."awscred-1.2.0"
+      sources."ini-1.3.4"
       (sources."optimist-0.6.1" // {
         dependencies = [
           sources."wordwrap-0.0.3"
@@ -22772,7 +22780,7 @@ in
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
-                  sources."bcrypt-pbkdf-1.0.0"
+                  sources."bcrypt-pbkdf-1.0.1"
                 ];
               })
             ];
@@ -23133,7 +23141,7 @@ in
           })
         ];
       })
-      (sources."espree-3.3.2" // {
+      (sources."espree-3.4.0" // {
         dependencies = [
           sources."acorn-4.0.4"
           (sources."acorn-jsx-3.0.1" // {
@@ -23771,7 +23779,7 @@ in
                                   sources."tweetnacl-0.14.5"
                                   sources."jodid25519-1.0.2"
                                   sources."ecc-jsbn-0.1.1"
-                                  sources."bcrypt-pbkdf-1.0.0"
+                                  sources."bcrypt-pbkdf-1.0.1"
                                 ];
                               })
                             ];
@@ -25474,7 +25482,7 @@ in
                               sources."tweetnacl-0.14.5"
                               sources."jodid25519-1.0.2"
                               sources."ecc-jsbn-0.1.1"
-                              sources."bcrypt-pbkdf-1.0.0"
+                              sources."bcrypt-pbkdf-1.0.1"
                             ];
                           })
                         ];
@@ -26579,7 +26587,7 @@ in
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
-                      sources."bcrypt-pbkdf-1.0.0"
+                      sources."bcrypt-pbkdf-1.0.1"
                     ];
                   })
                 ];
@@ -26992,7 +27000,7 @@ in
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
-                  sources."bcrypt-pbkdf-1.0.0"
+                  sources."bcrypt-pbkdf-1.0.1"
                 ];
               })
             ];
@@ -27511,7 +27519,7 @@ in
                           sources."tweetnacl-0.14.5"
                           sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
-                          sources."bcrypt-pbkdf-1.0.0"
+                          sources."bcrypt-pbkdf-1.0.1"
                         ];
                       })
                     ];
@@ -27779,7 +27787,7 @@ in
                           sources."tweetnacl-0.14.5"
                           sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
-                          sources."bcrypt-pbkdf-1.0.0"
+                          sources."bcrypt-pbkdf-1.0.1"
                         ];
                       })
                     ];
@@ -27961,10 +27969,10 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.6.32";
+    version = "0.6.33";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz";
-      sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.33.tgz";
+      sha1 = "640ac55198f6a925972e0c16c4ac26a034d5ecc9";
     };
     dependencies = [
       (sources."mkdirp-0.5.1" // {
@@ -28120,7 +28128,7 @@ in
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
-                  sources."bcrypt-pbkdf-1.0.0"
+                  sources."bcrypt-pbkdf-1.0.1"
                 ];
               })
             ];
@@ -28515,7 +28523,7 @@ in
                               sources."tweetnacl-0.14.5"
                               sources."jodid25519-1.0.2"
                               sources."ecc-jsbn-0.1.1"
-                              sources."bcrypt-pbkdf-1.0.0"
+                              sources."bcrypt-pbkdf-1.0.1"
                             ];
                           })
                         ];
@@ -29574,7 +29582,7 @@ in
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
-                      sources."bcrypt-pbkdf-1.0.0"
+                      sources."bcrypt-pbkdf-1.0.1"
                     ];
                   })
                 ];
@@ -29793,7 +29801,7 @@ in
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
-                      sources."bcrypt-pbkdf-1.0.0"
+                      sources."bcrypt-pbkdf-1.0.1"
                     ];
                   })
                 ];
@@ -29974,7 +29982,7 @@ in
                           sources."tweetnacl-0.14.5"
                           sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
-                          sources."bcrypt-pbkdf-1.0.0"
+                          sources."bcrypt-pbkdf-1.0.1"
                         ];
                       })
                     ];
@@ -30655,7 +30663,7 @@ in
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
-                  sources."bcrypt-pbkdf-1.0.0"
+                  sources."bcrypt-pbkdf-1.0.1"
                 ];
               })
             ];
@@ -30869,7 +30877,7 @@ in
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
-                      sources."bcrypt-pbkdf-1.0.0"
+                      sources."bcrypt-pbkdf-1.0.1"
                     ];
                   })
                 ];
@@ -31097,10 +31105,10 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "2.8.9";
+    version = "2.8.10";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.9.tgz";
-      sha1 = "c084b087a08ecf9292352e2cd591de903f8129c3";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.10.tgz";
+      sha1 = "20a65b4293a4594df74e98dbc5cfbddee39a756b";
     };
     dependencies = [
       sources."bluebird-3.4.7"
@@ -31549,7 +31557,7 @@ in
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
-                      sources."bcrypt-pbkdf-1.0.0"
+                      sources."bcrypt-pbkdf-1.0.1"
                     ];
                   })
                 ];
@@ -32221,7 +32229,7 @@ in
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
-                  sources."bcrypt-pbkdf-1.0.0"
+                  sources."bcrypt-pbkdf-1.0.1"
                 ];
               })
             ];
@@ -34000,7 +34008,7 @@ in
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
-                  sources."bcrypt-pbkdf-1.0.0"
+                  sources."bcrypt-pbkdf-1.0.1"
                 ];
               })
             ];
@@ -34359,7 +34367,7 @@ in
                           sources."tweetnacl-0.14.5"
                           sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
-                          sources."bcrypt-pbkdf-1.0.0"
+                          sources."bcrypt-pbkdf-1.0.1"
                         ];
                       })
                     ];
@@ -34693,7 +34701,7 @@ in
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
-                  sources."bcrypt-pbkdf-1.0.0"
+                  sources."bcrypt-pbkdf-1.0.1"
                 ];
               })
             ];
@@ -35301,6 +35309,70 @@ in
     };
     production = true;
   };
+  tern = nodeEnv.buildNodePackage {
+    name = "tern";
+    packageName = "tern";
+    version = "0.20.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/tern/-/tern-0.20.0.tgz";
+      sha1 = "5058e1ae15a121a1f421500ced0c852c11e6fb34";
+    };
+    dependencies = [
+      sources."acorn-3.3.0"
+      (sources."enhanced-resolve-2.3.0" // {
+        dependencies = [
+          sources."tapable-0.2.6"
+          (sources."memory-fs-0.3.0" // {
+            dependencies = [
+              (sources."errno-0.1.4" // {
+                dependencies = [
+                  sources."prr-0.0.0"
+                ];
+              })
+              (sources."readable-stream-2.2.2" // {
+                dependencies = [
+                  sources."buffer-shims-1.0.0"
+                  sources."core-util-is-1.0.2"
+                  sources."isarray-1.0.0"
+                  sources."inherits-2.0.3"
+                  sources."process-nextick-args-1.0.7"
+                  sources."string_decoder-0.10.31"
+                  sources."util-deprecate-1.0.2"
+                ];
+              })
+            ];
+          })
+          sources."graceful-fs-4.1.11"
+          sources."object-assign-4.1.1"
+        ];
+      })
+      (sources."glob-3.2.11" // {
+        dependencies = [
+          sources."inherits-2.0.3"
+          (sources."minimatch-0.3.0" // {
+            dependencies = [
+              sources."lru-cache-2.7.3"
+              sources."sigmund-1.0.1"
+            ];
+          })
+        ];
+      })
+      (sources."minimatch-0.2.14" // {
+        dependencies = [
+          sources."lru-cache-2.7.3"
+          sources."sigmund-1.0.1"
+        ];
+      })
+      sources."resolve-from-2.0.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A JavaScript code analyzer for deep, cross-editor language support";
+      homepage = "https://github.com/ternjs/tern#readme";
+      license = "MIT";
+    };
+    production = true;
+  };
   titanium = nodeEnv.buildNodePackage {
     name = "titanium";
     packageName = "titanium";
@@ -35455,7 +35527,7 @@ in
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
-                      sources."bcrypt-pbkdf-1.0.0"
+                      sources."bcrypt-pbkdf-1.0.1"
                     ];
                   })
                 ];
@@ -35618,7 +35690,7 @@ in
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
-                  sources."bcrypt-pbkdf-1.0.0"
+                  sources."bcrypt-pbkdf-1.0.1"
                 ];
               })
             ];
@@ -36428,7 +36500,7 @@ in
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
-                      sources."bcrypt-pbkdf-1.0.0"
+                      sources."bcrypt-pbkdf-1.0.1"
                     ];
                   })
                 ];
@@ -36663,7 +36735,7 @@ in
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
-                      sources."bcrypt-pbkdf-1.0.0"
+                      sources."bcrypt-pbkdf-1.0.1"
                     ];
                   })
                 ];
@@ -37323,7 +37395,7 @@ in
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
-                      sources."bcrypt-pbkdf-1.0.0"
+                      sources."bcrypt-pbkdf-1.0.1"
                     ];
                   })
                 ];
@@ -37999,7 +38071,7 @@ in
                                   sources."tweetnacl-0.14.5"
                                   sources."jodid25519-1.0.2"
                                   sources."ecc-jsbn-0.1.1"
-                                  sources."bcrypt-pbkdf-1.0.0"
+                                  sources."bcrypt-pbkdf-1.0.1"
                                 ];
                               })
                             ];
@@ -38628,7 +38700,7 @@ in
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
-                  sources."bcrypt-pbkdf-1.0.0"
+                  sources."bcrypt-pbkdf-1.0.1"
                 ];
               })
             ];
@@ -38743,4 +38815,4 @@ in
     };
     production = true;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 59e73e58070..dc11038fcd0 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -868,22 +868,22 @@ let
         sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82";
       };
     };
-    "ms-rest-1.15.2" = {
+    "ms-rest-1.15.4" = {
       name = "ms-rest";
       packageName = "ms-rest";
-      version = "1.15.2";
+      version = "1.15.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.2.tgz";
-        sha1 = "882f7d22bd2360505f03b0cbfdd19a8f71e012ff";
+        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.4.tgz";
+        sha1 = "7af7038fe843fd89d407fec346320db6b010ef8c";
       };
     };
-    "ms-rest-azure-1.15.2" = {
+    "ms-rest-azure-1.15.4" = {
       name = "ms-rest-azure";
       packageName = "ms-rest-azure";
-      version = "1.15.2";
+      version = "1.15.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.2.tgz";
-        sha1 = "8375437c2199d8d4bc001d2308b5fc1c1fcf3d83";
+        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.4.tgz";
+        sha1 = "ea89bce23c6ddd4593db1e86f6557cc6374e3492";
       };
     };
     "node-forge-0.6.23" = {
@@ -1435,24 +1435,6 @@ let
         sha1 = "44c5ee151aece6c4bf5364cfc7c28fe4e58f18df";
       };
     };
-    "uuid-2.0.1" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz";
-        sha1 = "c2a30dedb3e535d72ccf82e343941a50ba8533ac";
-      };
-    };
-    "azure-arm-resource-1.4.4-preview" = {
-      name = "azure-arm-resource";
-      packageName = "azure-arm-resource";
-      version = "1.4.4-preview";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.4.4-preview.tgz";
-        sha1 = "557696d45a89d8320c1aa0916297024b71b73fe2";
-      };
-    };
     "debug-0.7.4" = {
       name = "debug";
       packageName = "debug";
@@ -2209,13 +2191,13 @@ let
         sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505";
       };
     };
-    "bcrypt-pbkdf-1.0.0" = {
+    "bcrypt-pbkdf-1.0.1" = {
       name = "bcrypt-pbkdf";
       packageName = "bcrypt-pbkdf";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz";
-        sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4";
+        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz";
+        sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d";
       };
     };
     "mime-db-1.26.0" = {
@@ -9026,13 +9008,13 @@ let
         sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3";
       };
     };
-    "espree-3.3.2" = {
+    "espree-3.4.0" = {
       name = "espree";
       packageName = "espree";
-      version = "3.3.2";
+      version = "3.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/espree/-/espree-3.3.2.tgz";
-        sha1 = "dbf3fadeb4ecb4d4778303e50103b3d36c88b89c";
+        url = "https://registry.npmjs.org/espree/-/espree-3.4.0.tgz";
+        sha1 = "41656fa5628e042878025ef467e78f125cb86e1d";
       };
     };
     "estraverse-4.2.0" = {
@@ -10043,13 +10025,13 @@ let
         sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61";
       };
     };
-    "node-pre-gyp-0.6.32" = {
+    "node-pre-gyp-0.6.33" = {
       name = "node-pre-gyp";
       packageName = "node-pre-gyp";
-      version = "0.6.32";
+      version = "0.6.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz";
-        sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5";
+        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.33.tgz";
+        sha1 = "640ac55198f6a925972e0c16c4ac26a034d5ecc9";
       };
     };
     "npmlog-4.0.2" = {
@@ -15606,8 +15588,8 @@ let
       version = "1.3.6";
       src = fetchgit {
         url = "https://github.com/gwicke/kad.git";
-        rev = "f35971036f43814043245da82b12d035b7bbfd16";
-        sha256 = "9529b2615547db37851d15b39155c608d6b8d0641366d14cce728824b6135a35";
+        rev = "936c91652d757ea6f9dd30e44698afb0daaa1d17";
+        sha256 = "69b2ef001b9f4161dad34f5305a5895cfa9f98f124689277293fd544d06f9251";
       };
     };
     "clarinet-0.11.0" = {
@@ -17573,6 +17555,42 @@ let
         sha1 = "316545bf22229225a2cecaa6824cd2f56a9709ed";
       };
     };
+    "enhanced-resolve-2.3.0" = {
+      name = "enhanced-resolve";
+      packageName = "enhanced-resolve";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-2.3.0.tgz";
+        sha1 = "a115c32504b6302e85a76269d7a57ccdd962e359";
+      };
+    };
+    "resolve-from-2.0.0" = {
+      name = "resolve-from";
+      packageName = "resolve-from";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz";
+        sha1 = "9480ab20e94ffa1d9e80a804c7ea147611966b57";
+      };
+    };
+    "tapable-0.2.6" = {
+      name = "tapable";
+      packageName = "tapable";
+      version = "0.2.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tapable/-/tapable-0.2.6.tgz";
+        sha1 = "206be8e188860b514425375e6f1ae89bfb01fd8d";
+      };
+    };
+    "memory-fs-0.3.0" = {
+      name = "memory-fs";
+      packageName = "memory-fs";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz";
+        sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20";
+      };
+    };
     "async-2.1.2" = {
       name = "async";
       packageName = "async";
@@ -18266,15 +18284,6 @@ let
         sha1 = "a3a59ec97024985b46e958379646f96c4b616646";
       };
     };
-    "tapable-0.2.6" = {
-      name = "tapable";
-      packageName = "tapable";
-      version = "0.2.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tapable/-/tapable-0.2.6.tgz";
-        sha1 = "206be8e188860b514425375e6f1ae89bfb01fd8d";
-      };
-    };
     "watchpack-1.2.0" = {
       name = "watchpack";
       packageName = "watchpack";
@@ -18660,12 +18669,10 @@ in
         ];
       })
       sources."moment-2.17.1"
-      sources."ms-rest-1.15.2"
-      (sources."ms-rest-azure-1.15.2" // {
+      sources."ms-rest-1.15.4"
+      (sources."ms-rest-azure-1.15.4" // {
         dependencies = [
           sources."async-0.2.7"
-          sources."uuid-2.0.1"
-          sources."azure-arm-resource-1.4.4-preview"
         ];
       })
       sources."node-forge-0.6.23"
@@ -18863,7 +18870,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.0"
+      sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."ctype-0.5.2"
@@ -20116,7 +20123,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.0"
+      sources."bcrypt-pbkdf-1.0.1"
       sources."are-we-there-yet-1.1.2"
       sources."gauge-1.2.7"
       sources."delegates-1.0.0"
@@ -20530,16 +20537,17 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "3.0.2";
+    version = "3.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.0.2.tgz";
-      sha1 = "0f010dbd6e26db0270abd88e3e5403062eb4f7a4";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.1.0.tgz";
+      sha1 = "4bec1f64f7931b84884306fb5b37a0d269d81e8d";
     };
     dependencies = [
       sources."JSONStream-1.3.0"
       sources."async-2.1.4"
       sources."aws4-1.5.0"
       sources."awscred-1.2.0"
+      sources."ini-1.3.4"
       sources."optimist-0.6.1"
       sources."request-2.79.0"
       sources."jsonparse-1.3.0"
@@ -20614,7 +20622,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.0"
+      sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
     ];
@@ -20748,7 +20756,7 @@ in
       sources."debug-2.6.0"
       sources."doctrine-1.5.0"
       sources."escope-3.6.0"
-      sources."espree-3.3.2"
+      sources."espree-3.4.0"
       sources."estraverse-4.2.0"
       sources."esutils-2.0.2"
       sources."file-entry-cache-2.0.0"
@@ -21170,7 +21178,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.0"
+      sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
@@ -22138,7 +22146,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.0"
+      sources."bcrypt-pbkdf-1.0.1"
       sources."punycode-1.4.1"
       sources."block-stream-0.0.9"
       sources."fstream-1.0.10"
@@ -22714,7 +22722,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.0"
+      sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
@@ -22898,7 +22906,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.0"
+      sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."block-stream-0.0.9"
@@ -23192,7 +23200,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.0"
+      sources."bcrypt-pbkdf-1.0.1"
       sources."punycode-1.4.1"
       sources."fs.realpath-1.0.0"
       sources."block-stream-0.0.9"
@@ -23220,10 +23228,10 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.6.32";
+    version = "0.6.33";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz";
-      sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.33.tgz";
+      sha1 = "640ac55198f6a925972e0c16c4ac26a034d5ecc9";
     };
     dependencies = [
       sources."mkdirp-0.5.1"
@@ -23343,7 +23351,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.0"
+      sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
@@ -23562,7 +23570,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.0"
+      sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
@@ -24014,7 +24022,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.0"
+      sources."bcrypt-pbkdf-1.0.1"
       sources."punycode-1.4.1"
       sources."nodemailer-1.11.0"
       sources."poplib-0.1.7"
@@ -24494,7 +24502,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.0"
+      sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."stream-iterate-1.2.0"
@@ -24631,7 +24639,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.0"
+      sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
@@ -24709,10 +24717,10 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "2.8.9";
+    version = "2.8.10";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.9.tgz";
-      sha1 = "c084b087a08ecf9292352e2cd591de903f8129c3";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.10.tgz";
+      sha1 = "20a65b4293a4594df74e98dbc5cfbddee39a756b";
     };
     dependencies = [
       sources."bluebird-3.4.7"
@@ -24965,7 +24973,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.0"
+      sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."block-stream-0.0.9"
@@ -25284,7 +25292,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.0"
+      sources."bcrypt-pbkdf-1.0.1"
       sources."punycode-1.4.1"
       sources."bluebird-3.4.7"
       sources."bunyan-1.8.5"
@@ -26053,7 +26061,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.0"
+      sources."bcrypt-pbkdf-1.0.1"
       sources."hoek-2.16.3"
       sources."boom-2.10.1"
       sources."cryptiles-2.0.5"
@@ -26286,7 +26294,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.0"
+      sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."events.node-0.4.9"
@@ -26486,7 +26494,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.0"
+      sources."bcrypt-pbkdf-1.0.1"
       sources."punycode-1.4.1"
       sources."lru-cache-2.7.3"
       sources."sigmund-1.0.1"
@@ -26814,6 +26822,49 @@ in
     };
     production = true;
   };
+  tern = nodeEnv.buildNodePackage {
+    name = "tern";
+    packageName = "tern";
+    version = "0.20.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/tern/-/tern-0.20.0.tgz";
+      sha1 = "5058e1ae15a121a1f421500ced0c852c11e6fb34";
+    };
+    dependencies = [
+      sources."acorn-3.3.0"
+      sources."enhanced-resolve-2.3.0"
+      (sources."glob-3.2.11" // {
+        dependencies = [
+          sources."minimatch-0.3.0"
+        ];
+      })
+      sources."minimatch-0.2.14"
+      sources."resolve-from-2.0.0"
+      sources."tapable-0.2.6"
+      sources."memory-fs-0.3.0"
+      sources."graceful-fs-4.1.11"
+      sources."object-assign-4.1.1"
+      sources."errno-0.1.4"
+      sources."readable-stream-2.2.2"
+      sources."prr-0.0.0"
+      sources."buffer-shims-1.0.0"
+      sources."core-util-is-1.0.2"
+      sources."isarray-1.0.0"
+      sources."inherits-2.0.3"
+      sources."process-nextick-args-1.0.7"
+      sources."string_decoder-0.10.31"
+      sources."util-deprecate-1.0.2"
+      sources."lru-cache-2.7.3"
+      sources."sigmund-1.0.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A JavaScript code analyzer for deep, cross-editor language support";
+      homepage = "https://github.com/ternjs/tern#readme";
+      license = "MIT";
+    };
+    production = true;
+  };
   titanium = nodeEnv.buildNodePackage {
     name = "titanium";
     packageName = "titanium";
@@ -26950,7 +27001,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.0"
+      sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.26.0"
       sources."uglify-to-browserify-1.0.2"
       sources."yargs-3.10.0"
@@ -27524,7 +27575,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.0"
+      sources."bcrypt-pbkdf-1.0.1"
       sources."punycode-1.4.1"
       sources."stream-iterate-1.2.0"
       sources."block-stream-0.0.9"
@@ -27762,7 +27813,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.0"
+      sources."bcrypt-pbkdf-1.0.1"
       sources."hoek-2.16.3"
       sources."boom-2.10.1"
       sources."cryptiles-2.0.5"
@@ -28089,7 +28140,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.0"
+      sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.26.0"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
@@ -28351,7 +28402,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.0"
+      sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."is-utf8-0.2.1"
@@ -28374,4 +28425,4 @@ in
     };
     production = true;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 999582950ea..89f0075a3a3 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -56,6 +56,7 @@
 , "smartdc"
 , "stylus"
 , "svgo"
+, "tern"
 , "titanium"
 , "typescript"
 , "uglify-js"

From 01d03cb5e7faaf8d6e44f4c12d81fe45f92e364f Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 4 Feb 2017 23:38:12 +0200
Subject: [PATCH 443/899] binutils: Fix cross build

Broken after commit 17a344a ("binutils: Add lib output").
---
 pkgs/development/tools/misc/binutils/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index e61acd598cf..6ac9f3febc4 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   ];
 
   outputs = [ "out" ]
-    ++ optional (!stdenv.isDarwin) "lib" # problems in Darwin stdenv
+    ++ optional (cross == null && !stdenv.isDarwin) "lib" # problems in Darwin stdenv
     ++ [ "info" ]
     ++ optional (cross == null) "dev";
 

From b2343099ab9667108b8dca9d1b3efc056b6ceb4e Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 4 Feb 2017 23:38:48 +0200
Subject: [PATCH 444/899] make-bootstrap-tools{,-cross}.nix: Fix build after
 binutils changes

Broken after commit 17a344a ("binutils: Add lib output").
---
 pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 2 +-
 pkgs/stdenv/linux/make-bootstrap-tools.nix       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index dda1f7e0b33..1a762bd87c7 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -229,7 +229,7 @@ rec {
         for i in as ld ar ranlib nm strip readelf objdump; do
           cp ${binutils.out}/bin/$i $out/bin
         done
-        cp -d ${binutils.out}/lib/lib*.so* $out/lib
+        cp -d ${binutils.lib}/lib/lib*.so* $out/lib
 
         chmod -R u+w $out
 
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 2e7b24af131..42015a79a3e 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -126,7 +126,7 @@ rec {
         for i in as ld ar ranlib nm strip readelf objdump; do
           cp ${binutils.out}/bin/$i $out/bin
         done
-        cp -d ${binutils.out}/lib/lib*.so* $out/lib
+        cp -d ${binutils.lib}/lib/lib*.so* $out/lib
 
         chmod -R u+w $out
 

From 04f50f2466955f04aac019d19cecc874ee4eaa0c Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sat, 4 Feb 2017 16:56:13 -0500
Subject: [PATCH 445/899] melpa-stable-packages: 2017-02-04

---
 .../emacs-modes/melpa-stable-generated.nix    | 84 ++++++++++++++-----
 1 file changed, 63 insertions(+), 21 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 2e546092c6b..07748209b7e 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -1031,12 +1031,12 @@
     alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "alect-themes";
-        version = "0.7";
+        version = "0.8";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "alect-themes";
-          rev = "db7cc6ebf695a71881d803966d672f80fe967da6";
-          sha256 = "1pk5dgjqrynap85700wdivq41bdqvwd5hkfimgmcd48l5lhj9pbj";
+          rev = "1812abbe0079d1075525d9fb2da6fcfec7db3766";
+          sha256 = "0sl2njnhm37cya06y39ls8p3zwpjwyv1pd7w3yfk5frz24vaxlcq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes";
@@ -3208,12 +3208,12 @@
     cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
     melpaBuild {
         pname = "cargo";
-        version = "0.2.0";
+        version = "0.4.0";
         src = fetchFromGitHub {
           owner = "kwrooijen";
           repo = "cargo.el";
-          rev = "9db98208c1086dffdb351c85a74a096b48e6141f";
-          sha256 = "0xgnq21fb37y05535ipy0z584pnaglxy5bfqzdppyzsy7lpbb4k3";
+          rev = "25ca2fcbd6b664cc7a20b0cccca3adc19e79917a";
+          sha256 = "1fzrczx1aq0q130qrvzq8dssc1qm5qc9pclsyd3zn27xbn5lsag3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo";
@@ -4101,12 +4101,12 @@
     cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cm-mode";
-        version = "1.5";
+        version = "1.6";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "criticmarkup-emacs";
-          rev = "12b7460691dc502d27329d6ac11c51cc83cd098e";
-          sha256 = "018limfwcb396yr2kn6jixxdmpmiif3l7gp0p1pmwbg07fldllha";
+          rev = "276d49c859822265070ae5dfbb403fd7d8d06436";
+          sha256 = "0mqbjw9wiaq735v307hd7g0g6i3a4k7h71bi4g9rr2jbgiljmql4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42dda804ec0c7338c39c57eec6ba479609a38555/recipes/cm-mode";
@@ -5658,6 +5658,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dante";
+        version = "1.2";
+        src = fetchFromGitHub {
+          owner = "jyp";
+          repo = "dante";
+          rev = "385dd8114bb9eaba44943f00f9f7aea71af7bf34";
+          sha256 = "1jkdq9li3vqzdmmznpaxak7mf9y9vlk0abdb7ffzvvlry19dvgs8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
+          sha256 = "1j0qwjshh2227k63vd06bvrsccymqssx26yfzams1xf7bp6y0krs";
+          name = "dante";
+        };
+        packageRequires = [ dash emacs flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/dante";
+          license = lib.licenses.free;
+        };
+      }) {};
     darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darcula-theme";
@@ -10815,12 +10836,12 @@
     floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "floobits";
-        version = "1.7.2";
+        version = "1.8.1";
         src = fetchFromGitHub {
           owner = "Floobits";
           repo = "floobits-emacs";
-          rev = "6fea6eb2a1841d163acdeb5d9d59e51a5d7f61c4";
-          sha256 = "1n6x8n3fzxfwgpkvvnbxv6w3b08zzmx95pwv9yhqxl5b4pwyl31i";
+          rev = "643dbefca9754765e6d0f88a8953dc3689f5f93f";
+          sha256 = "1wh4y53vqi2zb03gxa2g2s14i280yqv0i7432ifi10v2qdwkilna";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits";
@@ -12206,6 +12227,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    fstar-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fstar-mode";
+        version = "0.9.4.0";
+        src = fetchFromGitHub {
+          owner = "FStarLang";
+          repo = "fstar-mode.el";
+          rev = "3a9be64827bbed8e34d38803b5c44d8d4f6cd688";
+          sha256 = "0manmkd66355g1fw2q1q96ispd0vxf842i8dcr6g592abrz5lhi7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode";
+          sha256 = "0kyzkghdkrnqqbd5b969pjyz9jxgq0j8hkmvlcwikl7ynnhm9lgy";
+          name = "fstar-mode";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/fstar-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     fuel = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "fuel";
         version = "0.96";
@@ -17863,12 +17905,12 @@
     ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-erlang-complete";
-        version = "0.1.3";
+        version = "0.1.4";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "914dfbeb2d9ccaed2e830637ecc814ac1da2f82f";
-          sha256 = "0a5fmqkasy87vq9x95qavqszmb9jalsi8ihgxx120rbrzfib28ys";
+          rev = "f5bee7c5368d55be4ebca30610b73c33978830cf";
+          sha256 = "0lcydjg8kyxdv5bbly0jf4d5wl4z7s63i536gvnlz0wfgj5swp5v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -25093,12 +25135,12 @@
     php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "php-mode";
-        version = "1.18.1";
+        version = "1.18.2";
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "php-mode";
-          rev = "349b85c1a9c79505d218b43940470c862dcdff32";
-          sha256 = "15mlzk7mvv3wfz73k30a7syb274myls6d44nibwg00r794drr57g";
+          rev = "e41a44f39d5d78acc2bd59d2a614f5fc9ff80cd3";
+          sha256 = "0ykdi8k6qj97r6nx9icd5idakksw1p10digfgl8r8z4qgwb00gcr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -30670,12 +30712,12 @@
     systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "systemd";
-        version = "1.4.1";
+        version = "1.5";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "systemd-mode";
-          rev = "7769000ba6b395dfaa2c6b0fce48ae5d5cd9a035";
-          sha256 = "1vqcqrq8qk9n512rbwi2lcvjiy0wqmybwa2lmrkv49yshqjhm5ld";
+          rev = "4c1b2befd0c853dcc7bca52d9b084933c3a08254";
+          sha256 = "1sdrga3mmajai2jcf4zpcii0l2b9wch8rhdsbjlzx76ia5snp23l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd";

From 339089fa2825539fa43f77aeedd44fa034761d4f Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sat, 4 Feb 2017 16:56:32 -0500
Subject: [PATCH 446/899] melpa-packages: 2017-02-04

---
 .../editors/emacs-modes/melpa-generated.nix   | 484 ++++++++++--------
 1 file changed, 263 insertions(+), 221 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 49af6c23177..a0a6b2ec53b 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -1465,12 +1465,12 @@
     alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "alect-themes";
-        version = "20170117.217";
+        version = "20170202.6";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "alect-themes";
-          rev = "714516d3f3695d0673f07721d4cff0043a287495";
-          sha256 = "1cxc27579ik7yrjvahdk5ciji1gfwzlzbjrwzx55v67v13y9kz6r";
+          rev = "1812abbe0079d1075525d9fb2da6fcfec7db3766";
+          sha256 = "0sl2njnhm37cya06y39ls8p3zwpjwyv1pd7w3yfk5frz24vaxlcq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes";
@@ -1549,12 +1549,12 @@
     all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "all-the-icons";
-        version = "20161219.329";
+        version = "20170203.1928";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "all-the-icons.el";
-          rev = "1e4a1a0b53ffcb427fdbc6d13ee6e9c8d23e6216";
-          sha256 = "0nrihr280aqq58x65fjyrpci4bsam9ddhsnid2cf8jmsngpvhcdc";
+          rev = "34a6bf1b036e162b61cdfbad2165c8f8b63dec0d";
+          sha256 = "1j11453x3229mm28sw88nc2pvdbw4i97ddgqnjy0s2hqz9z2ykzn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
@@ -2756,6 +2756,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    async-await = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, promise }:
+    melpaBuild {
+        pname = "async-await";
+        version = "20170203.2134";
+        src = fetchFromGitHub {
+          owner = "chuntaro";
+          repo = "emacs-async-await";
+          rev = "0a7a504a6a1b38fffc037b4c5671b20047c55402";
+          sha256 = "12xrcms2jhps63mjisd81pcam14larpascdix7lcdqd38vcxnzdm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9d74ecf94e5dbb46a939d26833b7cd0efd159ca1/recipes/async-await";
+          sha256 = "1534rhr4j74qbndafdj9q2wggcn8gphhjn3id8p27wyxr5sh93ms";
+          name = "async-await";
+        };
+        packageRequires = [ emacs promise ];
+        meta = {
+          homepage = "https://melpa.org/#/async-await";
+          license = lib.licenses.free;
+        };
+      }) {};
     at = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, queue }:
     melpaBuild {
         pname = "at";
@@ -6506,12 +6527,12 @@
     cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
     melpaBuild {
         pname = "cargo";
-        version = "20170124.1149";
+        version = "20170203.35";
         src = fetchFromGitHub {
           owner = "kwrooijen";
           repo = "cargo.el";
-          rev = "d17c66ac4eb9b226df23b0dbe12eec976d93093d";
-          sha256 = "1fmplh1r6xs7md5x7fwvfw6fkkblcbnfzh5j4adqci9j42cgcnfx";
+          rev = "25ca2fcbd6b664cc7a20b0cccca3adc19e79917a";
+          sha256 = "1fzrczx1aq0q130qrvzq8dssc1qm5qc9pclsyd3zn27xbn5lsag3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo";
@@ -6907,8 +6928,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "84c81f4701a2e8e8f8f5473377ae858dc9c40597";
-          sha256 = "0wkz94al5jnavz5lpq5kr91yb2zqkini69i7zq1x91z6zy3i0wlr";
+          rev = "6ac74e951bf11593ce134cf002456ae5d420a2b4";
+          sha256 = "0ywq2lg95a1r1hls4pnns7pjii42ai8qyp87hsxbbci88ay0i81i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -6947,7 +6968,7 @@
         version = "20170201.347";
         src = fetchsvn {
           url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "11991";
+          rev = "11993";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
@@ -7804,7 +7825,7 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "293835";
+          rev = "294096";
           sha256 = "13516xv7ypswhlarh4sd97sc17zar10snbmrcn14wd53jgxx440y";
         };
         recipeFile = fetchurl {
@@ -8379,12 +8400,12 @@
     cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cm-mode";
-        version = "20170112.614";
+        version = "20170203.1307";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "criticmarkup-emacs";
-          rev = "64913b0107a5ccf3ba4a3569ee03c020c45a3566";
-          sha256 = "1smj4iig5x3va3jl91aassk0smcg67naknk81fshigshif1vs273";
+          rev = "276d49c859822265070ae5dfbb403fd7d8d06436";
+          sha256 = "0mqbjw9wiaq735v307hd7g0g6i3a4k7h71bi4g9rr2jbgiljmql4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42dda804ec0c7338c39c57eec6ba479609a38555/recipes/cm-mode";
@@ -8421,12 +8442,12 @@
     cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "cmake-ide";
-        version = "20170130.451";
+        version = "20170202.1402";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "cmake-ide";
-          rev = "7cea81b31d73e84084d4eec4134556f501911eaf";
-          sha256 = "0q2zxnkr4l9dqf29rgc4877x6wmqx3j5q0ky2b77079mp160ljy4";
+          rev = "916f35e775c721a97fca8e11565c12207448c2f1";
+          sha256 = "1c7y2zyk8ihzn2za9mlpvjv5fp559rd2a5b42jz7lm2zkyn5a8b8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide";
@@ -8446,8 +8467,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "2d357ea267a5ab0f54f7b411befbadc583dd41d7";
-          sha256 = "08sz807iclkjav2fzrapc5h4m4nc7jb7k64ywar9dpq7944z7zkj";
+          rev = "d5f0c696116541ff4d58513d5fa2970ab70cccf7";
+          sha256 = "12pl3wy4cp457ha58w9xk6jd6x66nk4sq08h02hhpyrz7d3wi3cp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -10469,12 +10490,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20170201.726";
+        version = "20170203.1430";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "dbcee946f462e0fe2aa26f2a9e7ff4784c9e0e70";
-          sha256 = "199wg32ai117zkww4nzanksvdvzhmnnrn4cmp7l74z8i18cn2j2p";
+          rev = "7c73f7166486eeca829446a62efdb9520802ebea";
+          sha256 = "0q8wjynrlq2n6wf0x2nnmvj9h1i2pl39xpz6b7f3jbm7720182ld";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -11013,12 +11034,12 @@
     csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "csharp-mode";
-        version = "20170127.1100";
+        version = "20170203.1122";
         src = fetchFromGitHub {
           owner = "josteink";
           repo = "csharp-mode";
-          rev = "8ab3cc8d0143c878cab0f3424916cd9c0edc3217";
-          sha256 = "1p1q56399bfmdmzm453y18wkvxva5i1glkd4s5173dswgw9kh2gg";
+          rev = "571c4c70fe2de790e093cff23050827c5f6e96aa";
+          sha256 = "14wr98hq1banf0dbyi83rar0apj9gvwdqfvmnmhzxfr6dnzxsybf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode";
@@ -11488,8 +11509,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "d92a718a26c9354fbf35f31a17de5c069865a447";
-          sha256 = "0qxkxwkkx4343mmy38dh3cbxvi4vk3cv1b8ralvh6h7jas09qnzq";
+          rev = "68336b38580db34bb85cfed03a3243522c328d09";
+          sha256 = "04qcq9nsy57hy23r6crrk7i7hy95424bag5ymqa378vkqw490s9s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -14665,7 +14686,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1781330";
+          rev = "1781698";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -15925,11 +15946,11 @@
       }) {};
     eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "eide";
-        version = "20160926.1332";
+        version = "20170202.1345";
         src = fetchgit {
           url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git";
-          rev = "72c07fdbe6c8507147e997a22abcc2b42e45fce8";
-          sha256 = "1v64b6ii4xl3cyr6cvyq25i2xzyk6czr4m1z82pknb3qmxx3m26w";
+          rev = "c812097018143642cf8164309581b805fb947c78";
+          sha256 = "0ynxz0xlb2iak8riz404gb4spy6x7xr3rmhsm65apylkmj999g06";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d384f185f76039b06a1b5b12c792b346c6d47a22/recipes/eide";
@@ -16075,8 +16096,8 @@
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "71717d7d3ac575045f215ab27dd8a86e80b44c9d";
-          sha256 = "1k95szxx0f8ksa8lr8hs3rcyrg86whnv0x5pd8d3wnf1vxyhgcqs";
+          rev = "f98bbc72303e17fe6833ece472c5f110ccd97911";
+          sha256 = "19l295g5ryx95jxgxgh55s1j97la30qjl7xkgkd5gn01hdvn9v97";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -16155,12 +16176,12 @@
     el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-patch";
-        version = "20170129.2111";
+        version = "20170201.1652";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "el-patch";
-          rev = "787b320080043de457a953f05915ed8e83334492";
-          sha256 = "1ki15pl2snf3qvdcdjgfpsa48frksx3j5ygckaylfyrfs1yikp8q";
+          rev = "2714aa06af088155bc3d163f8ebde7d410c0694a";
+          sha256 = "0fdf05g6lsjwa1qx5h1yx3lzvkcw26lbn90022jb3f70b38adhf0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -18725,8 +18746,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "2896c966d9456721a0b9c11dbd8a14c474a3ace0";
-          sha256 = "0pk5847m8mxlsmhysd482wlr0lzbrs2svr9nkv6lghr4a4rg0l2p";
+          rev = "181d1c60def42e938dc3642cf798a73fa73d1425";
+          sha256 = "14fpiyq68nw4z4wykrxhqic0y9ghr7yjx0wx3zff4l001c0lqr4w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -20223,12 +20244,12 @@
     evil-mc-extras = callPackage ({ cl-lib ? null, emacs, evil, evil-mc, evil-numbers, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-mc-extras";
-        version = "20160731.1641";
+        version = "20170202.849";
         src = fetchFromGitHub {
           owner = "gabesoft";
           repo = "evil-mc-extras";
-          rev = "22f9b4cdb66cd6dffc89a66ee3a70593946a7d16";
-          sha256 = "0cbpx6ynang74g7w3hv43vp57nf00axfsprc9zyl6q10mpzdpkhn";
+          rev = "ba3252ae129c3b79aeb70ec3d276cbda32b00421";
+          sha256 = "0a7mn1z0db4xi8wclqp41hcbzh017q6pndxr9mrfxb67sqs601id";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd7c9aa0f4c17e7f27836e75a0b83c44a68ad744/recipes/evil-mc-extras";
@@ -20286,12 +20307,12 @@
     evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-nerd-commenter";
-        version = "20161031.409";
+        version = "20170203.505";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-nerd-commenter";
-          rev = "54c618aada776bfda0742819ff9e91845a91e095";
-          sha256 = "04iyr6ys453pyfvif91qnhn6xyhl4z4cz2apj6vga61pa8lc70da";
+          rev = "e1de1d759bcbd1026aeff8e402a2ef7edf546c0d";
+          sha256 = "1zm878w3lmsc76zf8ddvpm3lxsbqdvwcrxjyrhz8amfiw75klja4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
@@ -22400,12 +22421,12 @@
     floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "floobits";
-        version = "20160804.1135";
+        version = "20170204.226";
         src = fetchFromGitHub {
           owner = "Floobits";
           repo = "floobits-emacs";
-          rev = "da342a7389f2490cd51a057aff1b9272e023771f";
-          sha256 = "04nciqgyjkg8ky8y60mcbdxmad6ygqr7q992azc7jh6iq0wyidfm";
+          rev = "643dbefca9754765e6d0f88a8953dc3689f5f93f";
+          sha256 = "1wh4y53vqi2zb03gxa2g2s14i280yqv0i7432ifi10v2qdwkilna";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits";
@@ -24749,12 +24770,12 @@
     forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "forecast";
-        version = "20170109.859";
+        version = "20170202.1427";
         src = fetchFromGitHub {
           owner = "cadadr";
           repo = "forecast.el";
-          rev = "1bae400e5154d7494fd989b1be47450565810e23";
-          sha256 = "0kcyn2m122wbbsp7mwji5acsrdfdkfpf427zj6dn88rfx90q82w2";
+          rev = "975bf79f16f2c653466315669f4a26f85be0eaa3";
+          sha256 = "0vq0fafll0j2k0f9b0rbzbyg6jxp3sba0nq5bqx0l3mjfvlg0x4d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ff6a4ee29b96bccb2e4bc0644f2bd2e51971ee/recipes/forecast";
@@ -25235,8 +25256,8 @@
         version = "20170107.626";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "39811fc7e745a7081b6e03b3743d36148f849f76";
-          sha256 = "15ppa89x78wpbq5d8rnz0by74p82vfq2bwxxiwy3nxbmcdygzlf7";
+          rev = "f342fd04d9aad172dca83533ab8d3a525f47784f";
+          sha256 = "0b3vraxxgxp7x6mz6d25ha6dkgxzy847bdw2157h12f0p7pac0j4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -25252,12 +25273,12 @@
     fuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "fuff";
-        version = "20170201.1515";
+        version = "20170202.703";
         src = fetchFromGitHub {
           owner = "joelmo";
           repo = "fuff";
-          rev = "d25e084f1f870046dd98b38de00d6ad468a91ebc";
-          sha256 = "0xnjk59572m3hqbjfi8za59gw24hfhdss9pxapp764q81656dv36";
+          rev = "278e849913df87bd8756c59382282d87474802c3";
+          sha256 = "12s25c0abvghkhfbxcf77d2dc20y3xn9df7mfk8mkfwnlwdss2ga";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d0fc6d19559a9ea1bb7fce0c26a2dd65fc71603/recipes/fuff";
@@ -25685,12 +25706,12 @@
     general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "general";
-        version = "20170117.1707";
+        version = "20170202.1509";
         src = fetchFromGitHub {
           owner = "noctuid";
           repo = "general.el";
-          rev = "a685d573e5b03ef1199a6e9425b9e292ac38753c";
-          sha256 = "00pnz8hjw07p302fxh4x3xhz1wzkwcqcidnkq19429dv5hkp01pi";
+          rev = "66fa3050e59137763bc207c1cc7eb09922ce2e01";
+          sha256 = "1g50iyvcgkkniq9dj6q2b6yw04cja3z97hn85i7b2qrj161yinps";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general";
@@ -26151,8 +26172,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "e34f4e8eb00f292e8c475489fa7caa286857a421";
-          sha256 = "02kk093bg1vjnqfl3qy9h8zs50xzxbkay78qizav0h5myv4mjy10";
+          rev = "b43de68002e77c06e3bc288eca5e849d077864cb";
+          sha256 = "00f0g34hmfyjqyy0zmzssani9wppi1bqbbvnqqfxdlcbf7chxr74";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -27597,8 +27618,8 @@
         src = fetchFromGitHub {
           owner = "golang";
           repo = "lint";
-          rev = "206c0f020eba0f7fbcfbc467a5eb808037df2ed6";
-          sha256 = "11ygf8hswvc9rj6jp7zn8wyjlraw9qrl072grn2h4s1flblpxp53";
+          rev = "5295072ea38460cda1ff822cf6d30a7bf64329bd";
+          sha256 = "1q21ll8ip9zgdc9vqmad96dv39swch2zwkar840yk9ydbv46sbyp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint";
@@ -28538,6 +28559,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    guess-language = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, typo }:
+    melpaBuild {
+        pname = "guess-language";
+        version = "20170204.956";
+        src = fetchFromGitHub {
+          owner = "tmalsburg";
+          repo = "guess-language.el";
+          rev = "8450268f18610e552942641e67bc16f7347fffd5";
+          sha256 = "08qqljcvpm76hm57vd8r67w4zjbrdlbkq5mcyhk1qifa38cah52r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6e78cb707943fcaaba0414d7af2af717efce84d0/recipes/guess-language";
+          sha256 = "1p8j18hskvsv4pn3cal5s91l19hgshq8hpclmp84z9hlnj9g9fpm";
+          name = "guess-language";
+        };
+        packageRequires = [ cl-lib emacs typo ];
+        meta = {
+          homepage = "https://melpa.org/#/guess-language";
+          license = lib.licenses.free;
+        };
+      }) {};
     guide-key = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin, s }:
     melpaBuild {
         pname = "guide-key";
@@ -28688,12 +28730,12 @@
     habitica = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "habitica";
-        version = "20161001.1122";
+        version = "20170203.2122";
         src = fetchFromGitHub {
           owner = "abrochard";
           repo = "emacs-habitica";
-          rev = "e0fba32899da6bd0484b1b820578184d5764ec5b";
-          sha256 = "1vch1m605m5nxga08i49fga6ik2xxf3n6pibhr6q9wj59zv515hi";
+          rev = "9b42651888c4b75e1d6f9df41d138ce6e77acbcc";
+          sha256 = "1jrvjk8ccf47945liwz24xqvdaqm6zch1kb4cahgm4pp8m9hdcgn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9543db3564f4806440ed8c5c30fecbbc625fa1/recipes/habitica";
@@ -28706,22 +28748,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    hacker-typer = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    hacker-typer = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hacker-typer";
-        version = "20170131.822";
+        version = "20170204.838";
         src = fetchFromGitHub {
           owner = "therockmandolinist";
           repo = "emacs-hacker-typer";
-          rev = "809987b4da8b7350e42abf3783eaabd06c2ce559";
-          sha256 = "137hkjfyx0nw7lql3snm8vfx35464g9jn901wc75p61777a7x970";
+          rev = "baff7225a4ea340b35e341baea3cd2b25e7fc15e";
+          sha256 = "0yfngpkc8w5y8sagf4jh126m5dw37hgilyw6h24qw5cvan1ndbz7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/561661965a7a500f24671454b3b680816457e180/recipes/hacker-typer";
           sha256 = "0i9kkxcz0fz4yviksl3f0ggh9kpwr9sidg7945r46bmblni3f0j9";
           name = "hacker-typer";
         };
-        packageRequires = [ async ];
+        packageRequires = [ async emacs ];
         meta = {
           homepage = "https://melpa.org/#/hacker-typer";
           license = lib.licenses.free;
@@ -29066,12 +29108,12 @@
     haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "20170116.407";
+        version = "20170204.556";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "6f729159ea21997f629473652266dcd32dcba523";
-          sha256 = "0hmynqg4qv10w2s4wlh3k1ignzxspqfr67860xy9g7vyyifyrhqj";
+          rev = "f299294968faa2a5115467abc086d04fd4145964";
+          sha256 = "0vjhqv72ak6wdz33r7vkmjm4sb9wr0r4zmhpbs8g8g0yisdpgdjk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -29334,12 +29376,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170131.2356";
+        version = "20170203.715";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "74a0c4d17a970ebd2271453681d5633e55c3b00b";
-          sha256 = "0id3zn627j7lfv0fqynvdr72r59ngbwrhg2sw8pq0jza4yhg9n4n";
+          rev = "6105ddd0be224e5b60a1a8d8fcdd176a21c76848";
+          sha256 = "1i1xk75zs5q1f4z50ywi8l2qnc9vh2hyd01112vjp6qgqspn0kkk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -29733,12 +29775,12 @@
     helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "helm-cider";
-        version = "20170125.2048";
+        version = "20170203.1535";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "helm-cider";
-          rev = "9544babe63a14557594c5effc0b55db381776506";
-          sha256 = "0g6z3xy6hf2xy68qqa03ai4rl6aa6hd1wd62jrpx1iimyxbxjfdw";
+          rev = "24972f395de6ee261d01c06301e9b4480f865a9c";
+          sha256 = "15qn0xcci4mb8bh6mh4bf80ss8hqj0fzd1mqvhnmihlfww8a3jpd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31d3cd618f2ac88860d0b11335ff81b6e2973982/recipes/helm-cider";
@@ -29901,12 +29943,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170131.754";
+        version = "20170204.906";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "74a0c4d17a970ebd2271453681d5633e55c3b00b";
-          sha256 = "0id3zn627j7lfv0fqynvdr72r59ngbwrhg2sw8pq0jza4yhg9n4n";
+          rev = "6105ddd0be224e5b60a1a8d8fcdd176a21c76848";
+          sha256 = "1i1xk75zs5q1f4z50ywi8l2qnc9vh2hyd01112vjp6qgqspn0kkk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -30031,8 +30073,8 @@
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-describe-modes";
-          rev = "74e086a2462fc64234dd0222cde3c5c060a60068";
-          sha256 = "01kwh3f8hxacvjk5vva084jd4f55jlg8f8aa9hmcirif7r7pdidi";
+          rev = "11fb36af119b784539d31c6160002de1957408aa";
+          sha256 = "1d5b85m33hsdb4wswh9wpid0ghsr2zrj3f6ky587lc32s4bs0w0z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/23f0b2025073850c477ba4646c3821b3c7de6c42/recipes/helm-describe-modes";
@@ -31328,12 +31370,12 @@
     helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "helm-projectile";
-        version = "20170125.1815";
+        version = "20170202.1000";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "helm-projectile";
-          rev = "afb825b1eee559e11b0d950d4f3918d3a5663862";
-          sha256 = "0nlmhzgcyv3xqzfgbj1fzkg8by5lsy0rq3wdr5m5riqh4nza5ahr";
+          rev = "e16da3ec6d6c495ee8355e3c3729294bdee0a57b";
+          sha256 = "0wmzkqy7pr2nflfpbzq7gljk3jxxq3pbq76di1zl2rlj67whs1xk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile";
@@ -33086,12 +33128,12 @@
     hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "hledger-mode";
-        version = "20170201.858";
+        version = "20170203.1909";
         src = fetchFromGitHub {
           owner = "narendraj9";
           repo = "hledger-mode";
-          rev = "95e07b837706d86792649299fc13790248248139";
-          sha256 = "1gcq6cr3b502z1gjx57qkf65i74xklgbi7hxvgvywv2bzimwigxp";
+          rev = "0038c446bfc5cb1b65fc1b3e181f8d57e73887fe";
+          sha256 = "1z2251slpymbrqh09ismyq36kd34s81a677i26b9jzcd4x4ns4bb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode";
@@ -33589,8 +33631,8 @@
         src = fetchFromGitHub {
           owner = "nflath";
           repo = "hungry-delete";
-          rev = "78a787a87aceb821818bbe2a322fbf2e5cbf80c3";
-          sha256 = "171s7akqcpj0jcbm8w19b4n9kdzw0acf7cv0ymwdz5mmgmfiy292";
+          rev = "2cedcdd113032414ea6d3bfa2504c8820b1a841a";
+          sha256 = "1fg2his564qiqk7b47nswxcq4pd17ip164v4zva9715cjzgyzn66";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e33960d9b7e24f830ebe4e5a26a562422d52fe97/recipes/hungry-delete";
@@ -35350,12 +35392,12 @@
     inkpot-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inkpot-theme";
-        version = "20161220.2134";
+        version = "20170203.2120";
         src = fetchFromGitHub {
           owner = "ideasman42";
           repo = "emacs-inkpot-theme";
-          rev = "e175dbd7d0484ae905525ff157cda4e190977ba6";
-          sha256 = "0cpmc92234xhddb14np8v9fq3cq06ci3qcc25a72dnmjf19kkjcm";
+          rev = "a7bbc67de279cbd1646d5f6733900fb4f4402280";
+          sha256 = "1r0b7bnjg161km86pif4rsbwix81kr9n9w5bcp4p7ngrvxhfndgs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dd3e02aaf8865d8038b9c590c8545e7a1b21d620/recipes/inkpot-theme";
@@ -35559,12 +35601,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20170110.430";
+        version = "20170203.248";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "6e7c3df37be8275590e0e2442631d4fa25cae7c8";
-          sha256 = "061x79zr6wgd18a81bh7k554j7cds6z24w2l11i65gj5s3ir4a11";
+          rev = "bde85cc8af5d9b038bb58acc0763ef0be7278675";
+          sha256 = "0lhcq4cl8vx9bvcl2ab4iv4bqiw49jpc20kkj54ms40npfgfjksc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -36117,12 +36159,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20170109.626";
+        version = "20170202.223";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "dbcee946f462e0fe2aa26f2a9e7ff4784c9e0e70";
-          sha256 = "199wg32ai117zkww4nzanksvdvzhmnnrn4cmp7l74z8i18cn2j2p";
+          rev = "7c73f7166486eeca829446a62efdb9520802ebea";
+          sha256 = "0q8wjynrlq2n6wf0x2nnmvj9h1i2pl39xpz6b7f3jbm7720182ld";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -36159,12 +36201,12 @@
     ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-erlang-complete";
-        version = "20170122.2137";
+        version = "20170203.244";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "914dfbeb2d9ccaed2e830637ecc814ac1da2f82f";
-          sha256 = "0a5fmqkasy87vq9x95qavqszmb9jalsi8ihgxx120rbrzfib28ys";
+          rev = "f5bee7c5368d55be4ebca30610b73c33978830cf";
+          sha256 = "0lcydjg8kyxdv5bbly0jf4d5wl4z7s63i536gvnlz0wfgj5swp5v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -36205,8 +36247,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "dbcee946f462e0fe2aa26f2a9e7ff4784c9e0e70";
-          sha256 = "199wg32ai117zkww4nzanksvdvzhmnnrn4cmp7l74z8i18cn2j2p";
+          rev = "7c73f7166486eeca829446a62efdb9520802ebea";
+          sha256 = "0q8wjynrlq2n6wf0x2nnmvj9h1i2pl39xpz6b7f3jbm7720182ld";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -37309,12 +37351,12 @@
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20170116.733";
+        version = "20170202.1422";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "03c679eb9914d58d7d9b7afc2036c482a9a01236";
-          sha256 = "1kgmljgh71f2sljdsr134jrj1i6kgj9bwyh4pl1lrz0v4ahwgd6g";
+          rev = "faf73e8b6cfa9b896abde60cedd4cc69c9dfae19";
+          sha256 = "12las04bxp74w0pp1w8ri4mqv7kl48sz6dzqvq9xb50nz8y9bijy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -37831,11 +37873,11 @@
       }) {};
     kanban = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "kanban";
-        version = "20170117.316";
+        version = "20170203.1701";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/kanban.el";
-          rev = "713e6c7d8e07";
-          sha256 = "1m1rgkdwb9zm3k131l6xh2pz4750arvflly7fbmsik3y1pr5f60r";
+          rev = "4481f57aee47";
+          sha256 = "1crghlq0d87kc9mwy7prifxqla4q59c2447hhhl0pxbkf3ag9si1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/kanban";
@@ -38356,8 +38398,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "309ac127558f13f3c1c0d1aa8713392f56d2246c";
-          sha256 = "13gmmvx6mc2r96jgpshhb11vwndid2d95ijy2vlrhjfkznkiqimd";
+          rev = "57d41c920997ae2b373b0bfa57862845d99337fb";
+          sha256 = "1pb3kid4jb5fr37n2p19h7yvnip9gmp1gjjkbaz7k176r73bf16q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -39041,12 +39083,12 @@
     ledger-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ledger-mode";
-        version = "20170124.439";
+        version = "20170202.448";
         src = fetchFromGitHub {
           owner = "ledger";
           repo = "ledger-mode";
-          rev = "ce483998b9df81d72e2d28b241b4285f1042fd3d";
-          sha256 = "17cy23a8gbvipa62405izplj2w1f794dxmwspxpmn4g44xfazlhk";
+          rev = "63b47814b0f44fdd2c5e3a16144588a78923ec55";
+          sha256 = "0ng4giaz54iycp3lcvfzfvfpl0cr1w3m0qrz19kdgk7p3ag1c8in";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/851eca11911b337f809d030785dc2608c8a47424/recipes/ledger-mode";
@@ -39607,12 +39649,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20170201.1201";
+        version = "20170203.2342";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "68a11104caf14054d018043ca1545c189d9e65af";
-          sha256 = "12gsbg1v5jbd3bfig9h75sa55vvdg1hfagydrl5sp3n3xkh0jgh1";
+          rev = "5c160ffc38caa1e62614550e9e74981163f07c2c";
+          sha256 = "0p2z907wy090fq4ln0mysflwqialxs0hpvi85j4k8hwfrpir0yl6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -39920,12 +39962,12 @@
     live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "live-py-mode";
-        version = "20170125.2135";
+        version = "20170203.2106";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "8c9db327dcd89ff4abf0dd8f0396d7efd66c0aca";
-          sha256 = "15h37r3nhcjsx8z963s5ic5gcagnw9apy3hdnri57mvfg8h1k6s6";
+          rev = "2134cfef9c7194a2f7b093e037374673e03d2267";
+          sha256 = "1q4vskmkpwk10lwxvhsf4f5p43pjfkh2pvnjip95dp6vn5hgc1p2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -40007,8 +40049,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "a1d4ee75a4d2e148a47febd36c88f41d5ccb4ca8";
-          sha256 = "1i294wmg7p111agmirmgyvirm849qy9kdgsiw7h06vxyy4wdvs4q";
+          rev = "e6120c3c7f5ba8ac0ab6e087c794b1881aa2ef24";
+          sha256 = "1mhcm8id257jdwa4qvyh90a125nfkz33mjwysa21iqqp6fhy4qgy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -40584,12 +40626,12 @@
     madhat2r-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "madhat2r-theme";
-        version = "20170130.1431";
+        version = "20170202.1630";
         src = fetchFromGitHub {
           owner = "madhat2r";
           repo = "madhat2r-theme";
-          rev = "b7def53611d83cec80be22f8dbf76df49d2d17b1";
-          sha256 = "0vralm3a6qbf92zbvv9383rd79i5zwlz41c2p5qvb9qlr6x4bf7r";
+          rev = "6b387f09de055cfcc15d74981cd4f32f8f9a7323";
+          sha256 = "1nnjdqqbarzv62ic3ddc2z9wmh93zjia4nvfjmji8213dngrrf88";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44a382a388821908306c0b8350fba91218515e1b/recipes/madhat2r-theme";
@@ -40668,12 +40710,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170201.254";
+        version = "20170203.1633";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "e34f4e8eb00f292e8c475489fa7caa286857a421";
-          sha256 = "02kk093bg1vjnqfl3qy9h8zs50xzxbkay78qizav0h5myv4mjy10";
+          rev = "b43de68002e77c06e3bc288eca5e849d077864cb";
+          sha256 = "00f0g34hmfyjqyy0zmzssani9wppi1bqbbvnqqfxdlcbf7chxr74";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -40847,8 +40889,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "e34f4e8eb00f292e8c475489fa7caa286857a421";
-          sha256 = "02kk093bg1vjnqfl3qy9h8zs50xzxbkay78qizav0h5myv4mjy10";
+          rev = "b43de68002e77c06e3bc288eca5e849d077864cb";
+          sha256 = "00f0g34hmfyjqyy0zmzssani9wppi1bqbbvnqqfxdlcbf7chxr74";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -40948,12 +40990,12 @@
     magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }:
     melpaBuild {
         pname = "magithub";
-        version = "20170115.1723";
+        version = "20170203.437";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "magithub";
-          rev = "dc03f31edb5f45a1c9ada8ae00c1c9baf0126213";
-          sha256 = "1sv7h3gnqxm6vw4ygqm28grckxzvcfr39fgd4qhrzj0d6sss9gr5";
+          rev = "6880e5efb73e0cc8b8b71c639328cbec29d9cb9d";
+          sha256 = "1l82vibgmhpwpsarvh40js6q044b458h3i7r0wm7l897izsxkk84";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub";
@@ -41305,12 +41347,12 @@
     mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }:
     melpaBuild {
         pname = "mandoku";
-        version = "20170131.506";
+        version = "20170204.332";
         src = fetchFromGitHub {
           owner = "mandoku";
           repo = "mandoku";
-          rev = "bc7cb4b4dcc8b3f176f09345ccbaf843ae9dc41f";
-          sha256 = "0n10d6kdaw0cdjyafk5xzmjriig4nqc9gjcdmif38sqrcm5pwrkp";
+          rev = "5c4320254840dfeee410c46ab36ba94fa2efb6e1";
+          sha256 = "1wy2xs87ndvsg821chq9apnvh2l6ny2bdq815fqw1kyr3ml5x8mk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -45318,8 +45360,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "7a65b2470eb53a320749d76746fbf65790183d9d";
-          sha256 = "0h0x8qxyqg1n9z8p9l66bqlw2b0ihimkic645b1xndiqrv3lxnvm";
+          rev = "1351b0df87a0984914769c5dc76489618b3a3fec";
+          sha256 = "09zvphzik9pypi1bnjs0v83qwgl5cfb5w0c788jlr5wbd8x3crv1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -46675,8 +46717,8 @@
         src = fetchFromGitHub {
           owner = "OCamlPro";
           repo = "ocp-indent";
-          rev = "4849905f909aaec03508612a092cfdf520e24984";
-          sha256 = "0p05vx17xk9591afx80pms5v16vl7kyn28sxdgzsifcjv6k8pnv7";
+          rev = "5dc0ab3bee633aad64967e79539cdd007bbcacac";
+          sha256 = "1d7q3gd6clyhpzy4phi6g5435iz50kba2mbn0jd403x3270gdk9y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent";
@@ -47582,8 +47624,8 @@
         src = fetchFromGitHub {
           owner = "dfeich";
           repo = "org-clock-convenience";
-          rev = "dc8054d0d9ab5ef659c56c27bdd125c8b850b36f";
-          sha256 = "0wbij5inn5wy0jhghnba32h537ff3xy8wwy7jaf495hcws4gnag8";
+          rev = "2d3fab0991ef7fa8d94c46a63a66abd289c79d9e";
+          sha256 = "0dm8mzjy2hldn9lqblrfcq5w4d2byrgggg6wcs9rhdnpx96cvz74";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a80ed929181cdd28886ca598a0c387a31d239b2e/recipes/org-clock-convenience";
@@ -47767,12 +47809,12 @@
     org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-download";
-        version = "20170105.1740";
+        version = "20170202.927";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "org-download";
-          rev = "bbfca2fe4149f21105c70d3df76bb789b3868643";
-          sha256 = "19729mfbvsi2gpikv7c6c5a3ah7vrxkjc3s863783kginq28n8yl";
+          rev = "c63b057e84b8ba1e7c969391a0263f7d0ce936e4";
+          sha256 = "1qb0vqk1k7v0ydhfwsvhfqrjfm3c5baz8358ibivnm126d2hbsya";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download";
@@ -48106,8 +48148,8 @@
         src = fetchFromGitHub {
           owner = "bastibe";
           repo = "org-journal";
-          rev = "24313870fa682a53e7f3f916b0e853a731868886";
-          sha256 = "0nc3jl7sgqc8swi89rdk1yapmqxp8vaxm7390iqxy7a1sng4jydh";
+          rev = "3f29a64655cd03c662fa24ff687e5ed29d6bdd9e";
+          sha256 = "1a5z726hfaimjhidxskw7fr89hc3i0wl5hmpk8x64q87an0mkcmi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal";
@@ -48168,8 +48210,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "f157283c127729c681ac363daa3f411b68da7c3c";
-          sha256 = "0cqsahn5ghcivfx0qsa29ij5bviykmq4zx32ssckwp8za5pswfl6";
+          rev = "de58e0ae3351f4333752da07ad13db549b2a44bc";
+          sha256 = "176i7pwljwwq5dy7ch39ydk87njjmcqdxb55zpyhdg8bimvkg4xy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -48188,8 +48230,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "f157283c127729c681ac363daa3f411b68da7c3c";
-          sha256 = "0cqsahn5ghcivfx0qsa29ij5bviykmq4zx32ssckwp8za5pswfl6";
+          rev = "de58e0ae3351f4333752da07ad13db549b2a44bc";
+          sha256 = "176i7pwljwwq5dy7ch39ydk87njjmcqdxb55zpyhdg8bimvkg4xy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -48205,12 +48247,12 @@
     org-mime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-mime";
-        version = "20170110.2011";
+        version = "20170204.531";
         src = fetchFromGitHub {
           owner = "org-mime";
           repo = "org-mime";
-          rev = "e554d8821d8513d4e8c33ca6efb147e3dfce2a5b";
-          sha256 = "000zgp2palvn12rahbjg8vrl4r3x2gjzbxxw2fkaqc2bx4rkjiv7";
+          rev = "91d8f487755a3b7159891e4da77ccfa7ff2836f4";
+          sha256 = "164gqknhb1ddfafkafjdr2a2a34m71sm8pbglfh5q0qg52f832za";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime";
@@ -49688,8 +49730,8 @@
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "e633abf5fc953e88e3629e9a5d7ca9bdf47a29cd";
-          sha256 = "0fasg280qza87dsmpsgyclk50nrr5jmm2vf6jxpzkccm7m1ar8w6";
+          rev = "18d63e2823ad481414499d070623f898f9c0ba3a";
+          sha256 = "0k4ddlhpjinc5h0ajv58qjgj28b3zp6nhk6ivi8ygivxin228r00";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -50188,12 +50230,12 @@
     package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-lint";
-        version = "20170127.1538";
+        version = "20170203.429";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "package-lint";
-          rev = "f1b0f6237613a680dfdcddc1c096dc870a8efaa5";
-          sha256 = "0wrqsjcs3dvbay7z3zw73hys259yz9chblrvcnfqgmjl5n693gnf";
+          rev = "77bb3161c99949949426a544444b27eeb8b3ea2f";
+          sha256 = "0kvb46n9578xs1nx1y5p21akia9i1jycj58zyy0zq9iqj82lbb8d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -52007,12 +52049,12 @@
     php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "php-mode";
-        version = "20170131.1741";
+        version = "20170201.1842";
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "php-mode";
-          rev = "349b85c1a9c79505d218b43940470c862dcdff32";
-          sha256 = "15mlzk7mvv3wfz73k30a7syb274myls6d44nibwg00r794drr57g";
+          rev = "e41a44f39d5d78acc2bd59d2a614f5fc9ff80cd3";
+          sha256 = "0ykdi8k6qj97r6nx9icd5idakksw1p10digfgl8r8z4qgwb00gcr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -54043,12 +54085,12 @@
     promise = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "promise";
-        version = "20170118.431";
+        version = "20170203.2139";
         src = fetchFromGitHub {
           owner = "chuntaro";
           repo = "emacs-promise";
-          rev = "250cb722bbcc06358be57c4e26b08a2416e7612f";
-          sha256 = "0jv9761fw0p06sb853r19cp87s4cyyfbb3r5abhk8j466nvw49f4";
+          rev = "8b176ba4354e9b6e6c2fa87231b85424c25c511c";
+          sha256 = "11mx0gcyi4dmhh45n6r93xqvi9s94dhx7ii1iy4g35f4ki2cqfdx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3eaf5ac668008759677b9cc6f11406abd573012a/recipes/promise";
@@ -54853,8 +54895,8 @@
         src = fetchFromGitHub {
           owner = "JackCrawley";
           repo = "pygen";
-          rev = "3a5d1d1a0640865b15be05cd1eeb33bb4793b622";
-          sha256 = "0fzpvdwb7hhmfmjxzvap8413bc81lrx8r3ij3yasqaxyqw3a6vy1";
+          rev = "430e2a059b6e2b0d76700cf79a3de55d9deefd9b";
+          sha256 = "1blb9j3y1vfph0gxsslr4gw2diyqqb6xbkrkkcp8vzmx4jr06ki3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e761724e52de6fa4d92950751953645dd439d340/recipes/pygen";
@@ -54916,8 +54958,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "7daed7b8982480c868b0f642a5251f00ffb253c6";
-          sha256 = "1sa21sylx5hvp1m28vx823hmk1lnp1ygg9pl22jjv318iks6f2vj";
+          rev = "854bfe802145355a659e0b1ec068d31d8000988d";
+          sha256 = "1hc17wqg5sp51j0k8iv7m0xkc483ay514c2mfc5nkbrq6kxz05dq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -55059,12 +55101,12 @@
     python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-mode";
-        version = "20170117.455";
+        version = "20170203.606";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "49353d3d4b53470fa0493c13e5e33c77edb0f66d";
-          sha256 = "1w0b35789jhasqyz5g0fsp61mjikhbbjdripiwaam377b7k0w1bq";
+          rev = "7df57bba67d5c8aab9382d41a28018d1e0fda891";
+          sha256 = "1jyk8y7yijxwn0196fz75yxxmd8s53r240wi3555g3fr2898x16x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -55273,8 +55315,8 @@
         src = fetchFromGitHub {
           owner = "quelpa";
           repo = "quelpa";
-          rev = "e49a855cf699931cad7ef339a32812498f94e048";
-          sha256 = "1iwrcm1pw8pjif1jbh522zivlpw7cpdrd91n99pcj4a8sv7wsc6j";
+          rev = "d68a45fe0c4a1d4125b98adbeab65e3c8a30e908";
+          sha256 = "16sva8zl0hv6a6cr63d1g9038c304x6qxqgip117zxy1w36cfzdl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa";
@@ -55458,12 +55500,12 @@
     racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "racket-mode";
-        version = "20170129.1015";
+        version = "20170203.1014";
         src = fetchFromGitHub {
           owner = "greghendershott";
           repo = "racket-mode";
-          rev = "bb61c8d3026c598fc6c52f742ca7898a9f7c22c7";
-          sha256 = "0gxdclp8mg90v30wb30ksx6xr1r1kjyrqnr9r16cplqvkac1lz0x";
+          rev = "d010a865355e9014f1a897de587cacbb6cf23aa4";
+          sha256 = "1n15vnq21kym4ani61pf35a80kmp3i17hfn1dj7ayx5q2ifi0qi7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode";
@@ -55815,12 +55857,12 @@
     rbt = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, melpaBuild, popup }:
     melpaBuild {
         pname = "rbt";
-        version = "20161220.1352";
+        version = "20170202.1502";
         src = fetchFromGitHub {
           owner = "joeheyming";
           repo = "rbt.el";
-          rev = "25ed055ffa444cb077042f95622ef253759f3ee2";
-          sha256 = "1gv0bm25c5v6sygpcxg1h7cnn8md8q7njh8jz1was5cmgkq3i3kg";
+          rev = "32bfba9062a014e375451cf4203c29535b5efc1e";
+          sha256 = "0jzhyf42m9gqcnsz9gxc9wk8bbb9a7fj78swwyj0wqn9jm8jxbra";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7241985be1e8a26a454b8136a537040b7ae801/recipes/rbt";
@@ -57719,8 +57761,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "a979685278d465b5426ae952e3b502b987ac1ae4";
-          sha256 = "11db2kiwg8y3x6wjyziqy74mzq60jw2r11v20zwxkj2za0q3q60k";
+          rev = "9f9e3d1e915927a2e4202b411933261cc1599b4d";
+          sha256 = "1fzaaj5y9p13x3laycacxidf4lmhb9pz210w1iqlavyjsf6vdw6g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
@@ -57781,7 +57823,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57494";
+          rev = "57535";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -57861,7 +57903,7 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57494";
+          rev = "57535";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -58491,8 +58533,8 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "ea53e85c7983592c600ecd4a9cb08ae2760cf41e";
-          sha256 = "135is6zqca3ca1vkzpicqnf4jbxal2z5a93bflgbiha16i6485nn";
+          rev = "757c43bdd3ff9f3d35f5714e7ee695dc964bf8dc";
+          sha256 = "0di1lzfx17002rssl7ys57kg56pmadwcsm7km3301qd8b95ihzvv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -60561,12 +60603,12 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20170124.1831";
+        version = "20170202.700";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "dde1abb46558fc47a642853ac352985e9f7f7026";
-          sha256 = "1znscxiff64r9091vy8z18q53b4m73ghbf23hwhqv66wrp7g4bd5";
+          rev = "4f5912550a876bcc08e8c4342c2faccd1e6ab5c6";
+          sha256 = "0mb7pszpgjpzkwsmsqpccssv5zzca0j92pgxpd453kjknp5l24ag";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -60624,12 +60666,12 @@
     slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
     melpaBuild {
         pname = "slime";
-        version = "20170122.245";
+        version = "20170203.1728";
         src = fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "38416762c68dfa793f8e4f7c686137ab99b0a18f";
-          sha256 = "0gjlhbvw2kfhqn01v60apjmp948pmzfmaancdb93ibs6z4dxfpz1";
+          rev = "7a2b4694ab8f70cbaabfda83fc17cb23d7c0b987";
+          sha256 = "1izfrm0j98wdmd3lnxf62b6g4sqv4686m8lrx42m5s8y1knr5igk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
@@ -64087,8 +64129,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "dbcee946f462e0fe2aa26f2a9e7ff4784c9e0e70";
-          sha256 = "199wg32ai117zkww4nzanksvdvzhmnnrn4cmp7l74z8i18cn2j2p";
+          rev = "7c73f7166486eeca829446a62efdb9520802ebea";
+          sha256 = "0q8wjynrlq2n6wf0x2nnmvj9h1i2pl39xpz6b7f3jbm7720182ld";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -64520,12 +64562,12 @@
     systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "systemd";
-        version = "20170122.1745";
+        version = "20170202.1844";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "systemd-mode";
-          rev = "bd94a2cb97ba66f06f564679eecdacb9c3c7456f";
-          sha256 = "1l83j79phd2q8m3bmyl7fglijymppjmffpmmqvmvv72cn103rlgf";
+          rev = "4c1b2befd0c853dcc7bca52d9b084933c3a08254";
+          sha256 = "1sdrga3mmajai2jcf4zpcii0l2b9wch8rhdsbjlzx76ia5snp23l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd";
@@ -65751,8 +65793,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "de9c330b24c9190078eefb68c864d2a41a4dee07";
-          sha256 = "0y16xm0pkyyancg646ni1zz190rzdlsypdbkk0jslnz1l9zq445j";
+          rev = "a3d6be906b339ce4e55e8fb8d98ff11480792949";
+          sha256 = "1wf143c5d5kwg6a7rs3x56jf5pvcpba121pr8178rn45lqdnimr0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -66641,12 +66683,12 @@
     transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "transmission";
-        version = "20161231.2101";
+        version = "20170201.426";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "39b1fdb924727698e5b85c588bc6fd83200e4b90";
-          sha256 = "08wgqx48b3kbggxmkjjxwyinfl1j6b8wi4xvg0hwbkyw0zka0cii";
+          rev = "462584da4677af833054e023bd630a2d9f10c692";
+          sha256 = "1i8k6jiwzrsamc887mdmzipbr7vshv4mfa9sgzzsmq521diaigk7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -66927,12 +66969,12 @@
     tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tuareg";
-        version = "20170130.1530";
+        version = "20170202.1751";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "tuareg";
-          rev = "4bdc7e15262a533aa7ea8aca48d615a49ad9e2c9";
-          sha256 = "1b1i0s8z6grvfa7lkbv4fgjg0dzi61gidz2ygwjwsqhqgw269ym1";
+          rev = "8614825a9dcc08f0c77264ae8892f2417468cefb";
+          sha256 = "0jfvva5j33hs99grz4jzpr1qkmhx5vwrixl2pf20ggb4jd7c482j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -67383,12 +67425,12 @@
     ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ujelly-theme";
-        version = "20170201.217";
+        version = "20170202.2206";
         src = fetchFromGitHub {
           owner = "marktran";
           repo = "color-theme-ujelly";
-          rev = "2d886a64f84b3a27a53d2f29cd22528a8e3c7be2";
-          sha256 = "1w8v3a9hm15q0yih9vcby2y4g01kf64axfd368w1jchx01ql6n2p";
+          rev = "0a339a439390f9bec41f66b1f058e8e8ca90ba31";
+          sha256 = "13qsbncz6plld5y5n1klrliag6v8lzng7z4m5906vfw6sbpfyqx5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme";
@@ -68353,12 +68395,12 @@
     vdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
     melpaBuild {
         pname = "vdiff";
-        version = "20170201.1043";
+        version = "20170204.1156";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-vdiff";
-          rev = "bc5a9a8c5e78835a7311d0fcfcc4619a92ffaa3a";
-          sha256 = "112xrpznada8br8xcc7ln69k4w9da6h4c658gcjpj5a7mgqlbc4d";
+          rev = "ff1fbc409f816574a230bfdaa17ea73f65196654";
+          sha256 = "1h2arynqw3ps960cb18nyhkj00rjn7xdrrn7vlbrvzxqawpjhn82";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff";
@@ -69921,8 +69963,8 @@
         src = fetchFromGitHub {
           owner = "foretagsplatsen";
           repo = "emacs-js";
-          rev = "7bf3be6afab3c902c17b923cd4cdd12f4a2559c9";
-          sha256 = "1whq3cbk0z70pn8alrcp5m53ap278rkm7hzcbkg5yrjvjfxw38dz";
+          rev = "b5bcc7d5dd37a658a1fa77ec2272c9b2a8ca30b8";
+          sha256 = "0jgrx90n17h9ib9vjymxxra2abjk7pbdk1h9whqby2jg2xvzp0hm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
@@ -71794,12 +71836,12 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "20170127.2128";
+        version = "20170203.626";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "e74f00e70324101130c00b10af15f1f23e150654";
-          sha256 = "0b33mb10k5mvkg9v79kq1yx45swckz9pc1kn52h76rifcl83pif2";
+          rev = "9abf842e356e7b42fa105fe6284fb5ebe58a7ed1";
+          sha256 = "1gnaa8nwxa969pxgspk1v1vmfcxb32mbswy7yr60gnmb6mlfmjkk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";

From 5f67b7b30a5a8ea044a7f1db9c8e355c758c60cb Mon Sep 17 00:00:00 2001
From: Ian Lancaster <ilancaster@gmail.com>
Date: Sat, 4 Feb 2017 19:05:48 -0500
Subject: [PATCH 447/899] emboss: 6.0.1 -> 6.6.0

---
 pkgs/applications/science/biology/emboss/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/biology/emboss/default.nix b/pkgs/applications/science/biology/emboss/default.nix
index c9974660da3..33182027655 100644
--- a/pkgs/applications/science/biology/emboss/default.nix
+++ b/pkgs/applications/science/biology/emboss/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, readline, perl, libX11, libpng, libXt, zlib}:
 
 stdenv.mkDerivation {
-  name = "emboss-6.0.1";
+  name = "emboss-6.6.0";
   src = fetchurl {
-    url = ftp://emboss.open-bio.org/pub/EMBOSS/EMBOSS-6.0.1.tar.gz;
-    sha256 = "0g939k9wmpvmy55hqmbbzj6kj6agg4izymv492zqiawxm812jd9y";
+    url = "ftp://emboss.open-bio.org/pub/EMBOSS/EMBOSS-6.6.0.tar.gz";
+    sha256 = "7184a763d39ad96bb598bfd531628a34aa53e474db9e7cac4416c2a40ab10c6e";
   };
   # patch = fetchurl {
   #   url = ftp://emboss.open-bio.org/pub/EMBOSS/fixes/patches/patch-1-9.gz;

From 5b043ea3614cacff75984f96b9bdd7df770450f3 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 5 Feb 2017 02:10:57 +0300
Subject: [PATCH 448/899] nfs service: create state directories

---
 nixos/modules/services/network-filesystems/nfsd.nix | 7 +++++++
 nixos/modules/tasks/filesystems/nfs.nix             | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/nixos/modules/services/network-filesystems/nfsd.nix b/nixos/modules/services/network-filesystems/nfsd.nix
index 4fafb7a1fdb..a0368f1280a 100644
--- a/nixos/modules/services/network-filesystems/nfsd.nix
+++ b/nixos/modules/services/network-filesystems/nfsd.nix
@@ -130,6 +130,11 @@ in
     systemd.services.nfs-server =
       { enable = true;
         wantedBy = [ "multi-user.target" ];
+
+        preStart =
+          ''
+            mkdir -p /var/lib/nfs/v4recovery
+          '';
       };
 
     systemd.services.nfs-mountd =
@@ -139,6 +144,8 @@ in
 
         preStart =
           ''
+            mkdir -p /var/lib/nfs
+
             ${optionalString cfg.createMountPoints
               ''
                 # create export directories:
diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix
index 692034c0e37..73cf18384bd 100644
--- a/nixos/modules/tasks/filesystems/nfs.nix
+++ b/nixos/modules/tasks/filesystems/nfs.nix
@@ -91,6 +91,11 @@ in
 
     systemd.services.rpc-statd =
       { restartTriggers = [ nfsConfFile ];
+
+        preStart =
+          ''
+            mkdir -p /var/lib/nfs/{sm,sm.bak}
+          '';
       };
 
   };

From 9a11dda5fdd55061382c8214a954ef70a0805ddb Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 5 Feb 2017 03:06:56 +0300
Subject: [PATCH 449/899] nfsd service: don't run exportfs

It's run by service already.
---
 nixos/modules/services/network-filesystems/nfsd.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/nfsd.nix b/nixos/modules/services/network-filesystems/nfsd.nix
index a0368f1280a..7d127145101 100644
--- a/nixos/modules/services/network-filesystems/nfsd.nix
+++ b/nixos/modules/services/network-filesystems/nfsd.nix
@@ -139,7 +139,6 @@ in
 
     systemd.services.nfs-mountd =
       { enable = true;
-        path = [ pkgs.nfs-utils ];
         restartTriggers = [ exports ];
 
         preStart =
@@ -155,8 +154,6 @@ in
                 | xargs -d '\n' mkdir -p
               ''
             }
-
-            exportfs -rav
           '';
       };
 

From 68a609b0599ef4e27bf0519719a6a8261e3af185 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Wed, 1 Feb 2017 11:02:10 +0100
Subject: [PATCH 450/899] redsocks: init at 0.5

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

diff --git a/pkgs/tools/networking/redsocks/default.nix b/pkgs/tools/networking/redsocks/default.nix
new file mode 100644
index 00000000000..e9aced06728
--- /dev/null
+++ b/pkgs/tools/networking/redsocks/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, libevent }:
+
+let
+  pkg = "redsocks";
+  version = "0.5";
+in
+stdenv.mkDerivation rec {
+  name = "${pkg}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "darkk";
+    repo = pkg;
+    rev = "release-${version}";
+    sha256 = "170cpvvivb6y2kwsqj9ppx5brgds9gkn8mixrnvj8z9c15xhvplm";
+  };
+
+  installPhase =
+    ''
+      mkdir -p $out/{bin,share}
+      mv redsocks $out/bin
+      mv doc $out/share
+    '';
+
+  buildInputs = [ libevent ];
+
+  meta = {
+    description = "Transparent redirector of any TCP connection to proxy";
+    homepage = http://darkk.net.ru/redsocks/;
+    license = stdenv.lib.licenses.asl20;
+    maintainers = [ ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28668e0fc1c..89dc6346ca9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3560,6 +3560,8 @@ with pkgs;
 
   redmine = callPackage ../applications/version-management/redmine { };
 
+  redsocks = callPackage ../tools/networking/redsocks { };
+
   rt = callPackage ../servers/rt { };
 
   rtmpdump = callPackage ../tools/video/rtmpdump { };

From ade80db751498b6f8079aee53c4821a99fc80b03 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sun, 5 Feb 2017 03:19:54 +0300
Subject: [PATCH 451/899] libnfc: Add missing dependency on readline

readline is used by the pn53x-tamashell example.
---
 pkgs/development/libraries/libnfc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix
index 89cf3e544e5..150ece2a627 100644
--- a/pkgs/development/libraries/libnfc/default.nix
+++ b/pkgs/development/libraries/libnfc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libusb }:
+{ stdenv, fetchurl, libusb, readline }:
 
 stdenv.mkDerivation rec {
   name = "libnfc-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0wj0iwwcpmpalyk61aa7yc6i4p9hgdajkrgnlswgk0vnwbc78pll";
   };
 
-  buildInputs = [ libusb ];
+  buildInputs = [ libusb readline ];
 
   meta = with stdenv.lib; {
     description = "Open source library libnfc for Near Field Communication";

From 24716fe9541be7f8cd5336aafd2231e8eed7817b Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 4 Feb 2017 21:29:59 -0500
Subject: [PATCH 452/899] vim: Create xdg apps/icons dirs so .desktop items get
 installed

In theory this ought to make gvim show up in the kde/gnome/xfce
application menus.
---
 pkgs/applications/editors/vim/configurable.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index ee33c3e3070..9c0becc4729 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -161,6 +161,10 @@ composableDerivation {
       // edf "gtktest" "gtktest" { } #Do not try to compile and run a test GTK program
     */
 
+  preInstall = ''
+    mkdir -p $out/share/applications $out/share/icons/{hicolor,locolor}/{16x16,32x32,48x48}/apps
+  '';
+
   postInstall = stdenv.lib.optionalString stdenv.isLinux ''
     patchelf --set-rpath \
       "$(patchelf --print-rpath $out/bin/vim):${lib.makeLibraryPath buildInputs}" \

From a0338afe5faa9f9e403e2caa52e4a8b60c272be9 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 5 Feb 2017 04:42:16 +0100
Subject: [PATCH 453/899] cjdns service: allow writing keys to /etc

20e81f7c0d56e0b179115ca72a85b81ff637d909 prevented key generation in
`preStart`, leaving the service broken for the case where the user has
no pre-existing key.

Eventually, we ought to store the state elsewhere so that `/etc` can be
read-only but for now we fix this the easy way.
---
 nixos/modules/services/networking/cjdns.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index a10851c1652..d478e45f946 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -260,7 +260,7 @@ in
         RestartSec = 1;
         CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW";
         AmbientCapabilities = "CAP_NET_ADMIN CAP_NET_RAW";
-        ProtectSystem = "full";
+        ProtectSystem = true;
         MemoryDenyWriteExecute = true;
         ProtectHome = true;
         PrivateTmp = true;

From 2628597e7692ff465d7c575a1c1bfdce35833cad Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 5 Feb 2017 04:46:58 +0100
Subject: [PATCH 454/899] cjdns service: allow daemon to drop privileges

The service can run certain components with reduced privileges, but for
that it needs the setuid capability.
---
 nixos/modules/services/networking/cjdns.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index d478e45f946..12c2677c336 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -258,8 +258,7 @@ in
         Restart = "always";
         StartLimitInterval = 0;
         RestartSec = 1;
-        CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW";
-        AmbientCapabilities = "CAP_NET_ADMIN CAP_NET_RAW";
+        CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW CAP_SETUID";
         ProtectSystem = true;
         MemoryDenyWriteExecute = true;
         ProtectHome = true;

From 991c9da1d70d43242beee0251a6fa2752d3836c2 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sun, 5 Feb 2017 12:48:24 +0800
Subject: [PATCH 455/899] ingen: 2016-10-29 -> 2017-01-18

This is needed to compile against suil 0.8.4
---
 pkgs/applications/audio/ingen/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix
index 7f4bc0b3e9e..0b0df0b55e4 100644
--- a/pkgs/applications/audio/ingen/default.nix
+++ b/pkgs/applications/audio/ingen/default.nix
@@ -5,12 +5,12 @@
 
 stdenv.mkDerivation  rec {
   name = "ingen-unstable-${rev}";
-  rev = "2016-10-29";
+  rev = "2017-01-18";
 
   src = fetchgit {
     url = "http://git.drobilla.net/cgit.cgi/ingen.git";
-    rev = "fd147d0b888090bfb897505852c1f25dbdf77e18";
-    sha256 = "1qmg79962my82c43vyrv5sxbqci9c7gc2s9bwaaqd0fcf08xcz1z";
+    rev = "02ae3e9d8bf3f6a5e844706721aad8c0ac9f4340";
+    sha256 = "15s8nrzn68hc2s6iw0zshbz3lfnsq0mr6gflq05xm911b7xbp74k";
   };
 
   buildInputs = [

From 05684f313e58363568697dd0677ae2e927277b0c Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sun, 5 Feb 2017 14:03:59 +0800
Subject: [PATCH 456/899] freerdp: 20160909 -> 20170201 and rename old freerdp
 to freerdp_legacy

The former "stable" version of FreeRDP was actually not stable - it just
happened to have a released version while being both buggy and insecure.

The "unstable" branch hasn't seen a release in years, but everybody
should be using this instead and I have been using it as a daily driver
for ages.

This new version works beautifully here.

If/when at some point upstream does a normal release, we can bring back
stable/unstable if needed.

As I am quite dependent on FreeRDP working properly, I will be commit to
keeping this updated.

The commit used for this release follows the Arch Linux release.
---
 .../networking/remote/freerdp/default.nix     | 111 ++++++++++--------
 .../networking/remote/freerdp/legacy.nix      |  73 ++++++++++++
 .../networking/remote/freerdp/unstable.nix    |  56 ---------
 pkgs/top-level/all-packages.nix               |  16 ++-
 4 files changed, 143 insertions(+), 113 deletions(-)
 create mode 100644 pkgs/applications/networking/remote/freerdp/legacy.nix
 delete mode 100644 pkgs/applications/networking/remote/freerdp/unstable.nix

diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
index 05ec51d6681..d35f22c1839 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@@ -1,67 +1,76 @@
-{ stdenv
-, fetchurl
-, cmake
-, openssl
-, printerSupport ? true, cups
-, pkgconfig
-, zlib
-, libX11
-, libXcursor
-, libXdamage
-, libXext
-, alsaLib
-, ffmpeg
-, libxkbfile
-#, xmlto, docbook_xml_dtd_412, docbook_xml_xslt
-, libXinerama
-, libXv
-, pulseaudioSupport ? true, libpulseaudio
+{ stdenv, lib, fetchFromGitHub, substituteAll, cmake, pkgconfig
+, alsaLib, ffmpeg_2, glib, openssl, pcre, zlib
+, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama, libXrandr, libXrender, libXv
+, libxkbcommon, libxkbfile
+, wayland
+, gstreamer, gst-plugins-base, gst-plugins-good
+, libpulseaudio ? null
+, cups ? null
+, pcsclite ? null
+, systemd ? null
+, buildServer ? true
+, optimize ? true
 }:
 
-assert printerSupport -> cups != null;
 stdenv.mkDerivation rec {
-  name = "freerdp-${version}";
-  version = "1.0.2";
+  name = "freerdp-git-${version}";
+  version = "20170201";
 
-  src = fetchurl {
-    url = "https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz";
-    sha256 = "1w9dk7dsbppspnnms2xwwmbg7jm61i7aw5nkwzbpdyxngbgkgwf0";
+  src = fetchFromGitHub {
+    owner  = "FreeRDP";
+    repo   = "FreeRDP";
+    rev    = "6001cb710dc67eb8811362b7bf383754257a902b";
+    sha256 = "0l2lwqk2r8rq8a0f91wbb30kqg21fv0k0508djpwj0pa9n73fgmg";
   };
 
-  buildInputs = [
-    cmake
-    openssl
-    pkgconfig
-    zlib
-    libX11
-    libXcursor
-    libXdamage
-    libXext
-    alsaLib
-    ffmpeg
-    libxkbfile
-#    xmlto docbook_xml_dtd_412 docbook_xml_xslt
-    libXinerama
-    libXv
-  ] ++ stdenv.lib.optional printerSupport cups;
+  # outputs = [ "bin" "out" "dev" ];
 
-  configureFlags = [
-    "--with-x" "-DWITH_MANPAGES=OFF"
-  ] ++ stdenv.lib.optional printerSupport "--with-printer=cups"
-    ++ stdenv.lib.optional pulseaudioSupport "-DWITH_PULSEAUDIO=ON";
+  prePatch = ''
+    export HOME=$TMP
+    substituteInPlace "libfreerdp/freerdp.pc.in" \
+      --replace "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@"
+  '';
 
-  meta = {
+  patches = with lib; [
+  ] ++ optional (pcsclite != null)
+      (substituteAll {
+        src = ./dlopen-absolute-paths.diff;
+        inherit pcsclite;
+      });
+
+  buildInputs = with lib; [
+    alsaLib cups ffmpeg_2 glib openssl pcre pcsclite libpulseaudio zlib
+    gstreamer gst-plugins-base gst-plugins-good
+    libX11 libXcursor libXdamage libXext libXi libXinerama libXrandr libXrender libXv
+    libxkbcommon libxkbfile
+    wayland
+  ] ++ optional stdenv.isLinux systemd;
+
+  nativeBuildInputs = [
+    cmake pkgconfig
+  ];
+
+  doCheck = false;
+
+  cmakeFlags = with lib; [
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DWITH_CUNIT=OFF"
+    "-DWITH_OSS=OFF"
+  ] ++ optional (libpulseaudio != null) "-DWITH_PULSE=ON"
+    ++ optional (cups != null)          "-DWITH_CUPS=ON"
+    ++ optional (pcsclite != null)      "-DWITH_PCSC=ON"
+    ++ optional buildServer             "-DWITH_SERVER=ON"
+    ++ optional optimize                "-DWITH_SSE2=ON";
+
+  meta = with lib; {
     description = "A Remote Desktop Protocol Client";
-
     longDescription = ''
       FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP)
       following the Microsoft Open Specifications.
     '';
-
     homepage = http://www.freerdp.com/;
-
-    license = stdenv.lib.licenses.free;
-    platforms = stdenv.lib.platforms.linux;
-    broken = true;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ wkennington peterhoeg ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/networking/remote/freerdp/legacy.nix b/pkgs/applications/networking/remote/freerdp/legacy.nix
new file mode 100644
index 00000000000..d3746fa6c7a
--- /dev/null
+++ b/pkgs/applications/networking/remote/freerdp/legacy.nix
@@ -0,0 +1,73 @@
+{ stdenv
+, fetchurl
+, cmake
+, openssl
+, glib, pcre
+, printerSupport ? true, cups
+, pkgconfig
+, zlib
+, libX11
+, libXcursor
+, libXdamage
+, libXext
+, alsaLib
+, ffmpeg
+, libxkbfile
+#, xmlto, docbook_xml_dtd_412, docbook_xml_xslt
+, libXfixes
+, libXinerama
+, libXv
+, pulseaudioSupport ? true, libpulseaudio
+}:
+
+assert printerSupport -> cups != null;
+
+stdenv.mkDerivation rec {
+  name = "freerdp-${version}";
+  version = "1.2.0-beta1+android9";
+
+  src = fetchurl {
+    url = "https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz";
+    sha256 = "181w4lkrk5h5kh2zjlx6h2cl1mfw2aaami3laq3q32pfj06q3rxl";
+  };
+
+  buildInputs = [
+    cmake
+    openssl
+    glib pcre
+    pkgconfig
+    zlib
+    libX11
+    libXcursor
+    libXdamage
+    libXext
+    alsaLib
+    ffmpeg
+    libxkbfile
+#    xmlto docbook_xml_dtd_412 docbook_xml_xslt
+    libXinerama
+    libXv
+  ] ++ stdenv.lib.optional printerSupport cups;
+
+  preConfigure = ''
+    export HOME=$TMP
+  '';
+
+  configureFlags = [
+    "--with-x" "-DWITH_MANPAGES=OFF"
+  ] ++ stdenv.lib.optional printerSupport "--with-printer=cups"
+    ++ stdenv.lib.optional pulseaudioSupport "-DWITH_PULSEAUDIO=ON";
+
+  meta = with stdenv.lib; {
+    description = "A Remote Desktop Protocol Client";
+
+    longDescription = ''
+      FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP)
+      following the Microsoft Open Specifications.
+    '';
+
+    homepage = http://www.freerdp.com/;
+    license = licenses.free;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix
deleted file mode 100644
index 5483e942076..00000000000
--- a/pkgs/applications/networking/remote/freerdp/unstable.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, zlib, libX11, libXcursor
-, libXdamage, libXext, libXrender, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv
-, substituteAll
-, libpulseaudio ? null, cups ? null, pcsclite ? null
-, buildServer ? true, optimize ? true
-}:
-
-stdenv.mkDerivation rec {
-  name = "freerdp-2.0-dev";
-
-  src = fetchFromGitHub {
-    owner = "FreeRDP";
-    repo = "FreeRDP";
-    rev = "1855e36179fb197e713d41c4ef93e19cf1f0be2f";
-    sha256 = "1lydkh6by0sjy6dl57bzg7c11ccyp24s80pwxw9h5kmxkbw6mx5q";
-  };
-
-  prePatch = ''
-    substituteInPlace "libfreerdp/freerdp.pc.in" --replace "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@"
-  '';
-
-  patches = [
-  ] ++ stdenv.lib.optional (pcsclite != null)
-      (substituteAll {
-        src = ./dlopen-absolute-paths.diff;
-        inherit pcsclite;
-      });
-
-  buildInputs = [
-    cmake pkgconfig openssl zlib libX11 libXcursor libXdamage libXext libXrender glib
-    alsaLib ffmpeg libxkbfile libXinerama libXv cups libpulseaudio pcsclite
-  ];
-
-  doCheck = false;
-
-  cmakeFlags = [
-    "-DCMAKE_INSTALL_LIBDIR=lib"
-    "-DWITH_CUNIT=OFF"
-  ] ++ stdenv.lib.optional (libpulseaudio != null) "-DWITH_PULSE=ON"
-    ++ stdenv.lib.optional (cups != null) "-DWITH_CUPS=ON"
-    ++ stdenv.lib.optional (pcsclite != null) "-DWITH_PCSC=ON"
-    ++ stdenv.lib.optional buildServer "-DWITH_SERVER=ON"
-    ++ stdenv.lib.optional optimize "-DWITH_SSE2=ON";
-
-  meta = with stdenv.lib; {
-    description = "A Remote Desktop Protocol Client";
-    longDescription = ''
-      FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP)
-      following the Microsoft Open Specifications.
-    '';
-    homepage = http://www.freerdp.com/;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ wkennington ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28668e0fc1c..30b58edc45a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13360,14 +13360,18 @@ with pkgs;
   xfontsel = callPackage ../applications/misc/xfontsel { };
   inherit (xorg) xlsfonts;
 
-  freerdpStable = callPackage ../applications/networking/remote/freerdp {
+  freerdp = callPackage ../applications/networking/remote/freerdp {
+    inherit libpulseaudio;
+    inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good;
+  };
+
+  freerdpUnstable = freerdp;
+
+  # This must go when weston v2 is released
+  freerdp_legacy = callPackage ../applications/networking/remote/freerdp/legacy.nix {
+    cmake = cmake_2_8;
     ffmpeg = ffmpeg_1;
   };
-  freerdpUnstable = callPackage ../applications/networking/remote/freerdp/unstable.nix {
-    ffmpeg = ffmpeg_2;
-    cmake = cmake_2_8;
-  };
-  freerdp = freerdpUnstable; # freerdpStable is marked broken, please switch back to it once fixed
 
   freicoin = callPackage ../applications/misc/freicoin {
     boost = boost155;

From e881a21ada36d8bf74bfb70f9334f0ae315e94d1 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sun, 5 Feb 2017 14:04:51 +0800
Subject: [PATCH 457/899] weston: depend on freerdp_legacy

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30b58edc45a..4dd3a01ac3e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15497,7 +15497,7 @@ with pkgs;
   };
 
   weston = callPackage ../applications/window-managers/weston {
-    freerdp = freerdpUnstable;
+    freerdp = freerdp_legacy;
   };
 
   windowlab = callPackage ../applications/window-managers/windowlab { };

From 5dbbdce047a8f8cd7eae5b772f03b010385ad073 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sun, 5 Feb 2017 14:05:10 +0800
Subject: [PATCH 458/899] kde4.krdc: depend on freerdp_legacy

---
 pkgs/desktops/kde-4.14/kdenetwork/krdc.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.14/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.14/kdenetwork/krdc.nix
index 80557e827fe..12cdd4a569c 100644
--- a/pkgs/desktops/kde-4.14/kdenetwork/krdc.nix
+++ b/pkgs/desktops/kde-4.14/kdenetwork/krdc.nix
@@ -1,7 +1,7 @@
-{ kde, kdelibs, libvncserver, freerdp, telepathy_qt }:
+{ kde, kdelibs, libvncserver, freerdp_legacy, telepathy_qt }:
 
 kde {
-  buildInputs = [ kdelibs libvncserver freerdp telepathy_qt ];
+  buildInputs = [ kdelibs libvncserver freerdp_legacy telepathy_qt ];
 
   meta = {
     description = "KDE remote desktop client";

From 94b0128cc627090a9fa8f412668c2386973255ee Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sun, 5 Feb 2017 14:05:31 +0800
Subject: [PATCH 459/899] remmina: 1.2.0-rcgit.15 -> 1.2.0-rcgit.17

We also drop the embedded freerdp in favour of freerdp from upstream.
---
 .../networking/remote/remmina/default.nix     | 34 +++++++------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index ec31beb0080..c3eca16af01 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -10,7 +10,7 @@
 }:
 
 let
-  version = "1.2.0-rcgit.15";
+  version = "1.2.0-rcgit.17";
 
   desktopItem = makeDesktopItem {
     name = "remmina";
@@ -22,41 +22,33 @@ let
     categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;";
   };
 
-  # Latest release of remmina refers to thing that aren't yet in
-  # a FreeRDP release so we need to build one from git source
-  # See also https://github.com/FreeRDP/Remmina/pull/731
-  # Remove when FreeRDP release catches up with this commit
-  freerdp_git = stdenv.lib.overrideDerivation freerdp (args: {
-    name = "freerdp-git-2016-09-30";
-    src = fetchFromGitHub {
-      owner  = "FreeRDP";
-      repo   = "FreeRDP";
-      rev    = "dbb353db92e7a5cb0be3c73aa950fb1113e627ec";
-      sha256 = "1nhm4v6z9var9hasp4bkmhvlrksbdizx95swx19shizfc82s9g4y";
-    };
-  });
-
-in
-
-stdenv.mkDerivation {
+in stdenv.mkDerivation {
   name = "remmina-${version}";
 
   src = fetchFromGitHub {
     owner  = "FreeRDP";
     repo   = "Remmina";
     rev    = "v${version}";
-    sha256 = "07lj6a7x9cqcff18pwfkx8c8iml015zp6sq29dfcxpfg4ai578h0";
+    sha256 = "1vfg8sfpj83ircp7ny6xsbn2ba5xbp3xrdl5wwyfcg1zrpdmi7f1";
   };
 
   buildInputs = [ cmake pkgconfig wrapGAppsHook gsettings_desktop_schemas
                   glib gtk3 gettext libxkbfile libgnome_keyring libX11
-                  freerdp_git libssh libgcrypt gnutls
+                  freerdp libssh libgcrypt gnutls
                   pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3
                   libvncserver libpthreadstubs libXdmcp libxkbcommon
                   libsecret spice_protocol spice_gtk epoxy at_spi2_core
                   openssl hicolor_icon_theme adwaita-icon-theme ];
 
-  cmakeFlags = "-DWITH_VTE=OFF -DWITH_TELEPATHY=OFF -DWITH_AVAHI=OFF -DWINPR_INCLUDE_DIR=${freerdp_git}/include/winpr2";
+  cmakeFlags = [
+    "-DWITH_VTE=OFF"
+    "-DWITH_TELEPATHY=OFF"
+    "-DWITH_AVAHI=OFF"
+    "-DFREERDP_LIBRARY=${freerdp}/lib/libfreerdp2.so"
+    "-DFREERDP_CLIENT_LIBRARY=${freerdp}/lib/libfreerdp-client2.so"
+    "-DFREERDP_WINPR_LIBRARY=${freerdp}/lib/libwinpr2.so"
+    "-DWINPR_INCLUDE_DIR=${freerdp}/include/winpr2"
+  ];
 
   preFixup = ''
     gappsWrapperArgs+=(

From f5bbecc5c555ee915990ca0725bac51407d10624 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Sun, 5 Feb 2017 06:23:17 +0000
Subject: [PATCH 460/899] scala 2.12 requires jre8

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 41e2312f447..cb563c749b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5423,7 +5423,7 @@ with pkgs;
   scala_2_9 = callPackage ../development/compilers/scala/2.9.nix { };
   scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { };
   scala_2_11 = callPackage ../development/compilers/scala/2.11.nix { };
-  scala_2_12 = callPackage ../development/compilers/scala { };
+  scala_2_12 = callPackage ../development/compilers/scala { jre = jre8; };
   scala = scala_2_12;
 
   scalafmt = callPackage ../development/tools/scalafmt { };

From 4b6114e0b9e60b866a072be20dd22fb1d61243ac Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sun, 5 Feb 2017 14:31:58 +0800
Subject: [PATCH 461/899] gwenview: add support for TIFF images

---
 pkgs/desktops/kde-5/applications/gwenview.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-5/applications/gwenview.nix b/pkgs/desktops/kde-5/applications/gwenview.nix
index b97e4ce3bd6..37a1605fe70 100644
--- a/pkgs/desktops/kde-5/applications/gwenview.nix
+++ b/pkgs/desktops/kde-5/applications/gwenview.nix
@@ -2,7 +2,7 @@
   kdeApp, lib, kdeWrapper,
   ecm, kdoctools,
   baloo, exiv2, kactivities, kdelibs4support, kio, kipi-plugins, lcms2,
-  libkdcraw, libkipi, phonon, qtsvg, qtx11extras
+  libkdcraw, libkipi, phonon, qtimageformats, qtsvg, qtx11extras
 }:
 
 let
@@ -15,8 +15,8 @@ let
       };
       nativeBuildInputs = [ ecm kdoctools ];
       propagatedBuildInputs = [
-        baloo kactivities kdelibs4support kio qtx11extras exiv2 lcms2 libkdcraw
-        libkipi phonon qtsvg
+        baloo kactivities kdelibs4support kio exiv2 lcms2 libkdcraw
+        libkipi phonon qtimageformats qtsvg qtx11extras
       ];
     };
 in

From 321b639d766e3b221f1cbd4f13d44a6a11026178 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 5 Feb 2017 09:34:31 +0200
Subject: [PATCH 462/899] gnu-efi: Remove unneeded aarch64 patch

Not needed after the upgrade to 3.0.5. Yay!
---
 .../gnu-efi/aarch64-fix-discarded-qualifier.patch   | 13 -------------
 pkgs/development/libraries/gnu-efi/default.nix      |  2 --
 2 files changed, 15 deletions(-)
 delete mode 100644 pkgs/development/libraries/gnu-efi/aarch64-fix-discarded-qualifier.patch

diff --git a/pkgs/development/libraries/gnu-efi/aarch64-fix-discarded-qualifier.patch b/pkgs/development/libraries/gnu-efi/aarch64-fix-discarded-qualifier.patch
deleted file mode 100644
index 2295a4bb8a3..00000000000
--- a/pkgs/development/libraries/gnu-efi/aarch64-fix-discarded-qualifier.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru gnu-efi-3.0.4-orig/lib/aarch64/initplat.c gnu-efi-3.0.4/lib/aarch64/initplat.c
---- gnu-efi-3.0.4-orig/lib/aarch64/initplat.c	2016-03-17 09:53:14.000000000 -0400
-+++ gnu-efi-3.0.4/lib/aarch64/initplat.c	2016-12-03 17:53:57.166575974 -0500
-@@ -41,7 +41,8 @@
- 
- void *memcpy(void *dest, const void *src, __SIZE_TYPE__ n)
- {
--    unsigned char *p = dest, *q = src;
-+    unsigned char *p = dest;
-+    const unsigned char *q = src;
- 
-     while (n--)
-         *p++ = *q++;
diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix
index 6425749d041..c6240c40578 100644
--- a/pkgs/development/libraries/gnu-efi/default.nix
+++ b/pkgs/development/libraries/gnu-efi/default.nix
@@ -9,8 +9,6 @@ stdenv.mkDerivation rec {
     sha256 = "08hb2gpzcj5p743wcagm0j2m4gh100xv12llpbjc13zi2icwv3xx";
   };
 
-  patches = optional stdenv.isAarch64 ./aarch64-fix-discarded-qualifier.patch;
-
   buildInputs = [ pciutils ];
 
   hardeningDisable = [ "stackprotector" ];

From 8dfa60ce73f6bb9128fb577a8d0df3f8b86f3ddf Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sun, 5 Feb 2017 11:46:27 +0900
Subject: [PATCH 463/899] nixos-generate-config.pl, all-hardware.nix: Add
 support for Hyper-V

---
 nixos/modules/installer/tools/nixos-generate-config.pl | 10 +++++++---
 nixos/modules/profiles/all-hardware.nix                |  3 +++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 0a5624ff6a3..c920a2b52d8 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -208,9 +208,6 @@ foreach my $path (glob "/sys/bus/pci/devices/*") {
     pciCheck $path;
 }
 
-push @attrs, "services.xserver.videoDrivers = [ \"$videoDriver\" ];" if $videoDriver;
-
-
 # Idem for USB devices.
 
 sub usbCheck {
@@ -277,6 +274,12 @@ if ($virt eq "qemu" || $virt eq "kvm" || $virt eq "bochs") {
     push @imports, "<nixpkgs/nixos/modules/profiles/qemu-guest.nix>";
 }
 
+# Also for Hyper-V.
+if ($virt eq "microsoft") {
+    push @initrdAvailableKernelModules, "hv_storvsc";
+    $videoDriver = "fbdev";
+}
+
 
 # Pull in NixOS configuration for containers.
 if ($virt eq "systemd-nspawn") {
@@ -307,6 +310,7 @@ sub findStableDevPath {
     return $dev;
 }
 
+push @attrs, "services.xserver.videoDrivers = [ \"$videoDriver\" ];" if $videoDriver;
 
 # Generate the swapDevices option from the currently activated swap
 # devices.
diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix
index 99b45228ce4..6b4d8c737eb 100644
--- a/nixos/modules/profiles/all-hardware.nix
+++ b/nixos/modules/profiles/all-hardware.nix
@@ -42,6 +42,9 @@
       # Virtio (QEMU, KVM etc.) support.
       "virtio_net" "virtio_pci" "virtio_blk" "virtio_scsi" "virtio_balloon" "virtio_console"
 
+      # Hyper-V support.
+      "hv_storvsc"
+
       # Keyboards
       "usbhid" "hid_apple" "hid_logitech_dj" "hid_lenovo_tpkbd" "hid_roccat"
     ];

From 6812c7001ccedc142b9d93f72e2c2f2d611e6158 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 5 Feb 2017 12:40:41 +0300
Subject: [PATCH 464/899] nfs tests: fix nfs server unit name

---
 nixos/tests/nfs.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/nfs.nix b/nixos/tests/nfs.nix
index 36cd6a39577..6ed1995f262 100644
--- a/nixos/tests/nfs.nix
+++ b/nixos/tests/nfs.nix
@@ -40,7 +40,7 @@ in
 
   testScript =
     ''
-      $server->waitForUnit("nfsd");
+      $server->waitForUnit("nfs-server");
       $server->succeed("systemctl start network-online.target");
       $server->waitForUnit("network-online.target");
 
@@ -54,8 +54,8 @@ in
       $client2->succeed("echo bla > /data/bar");
       $server->succeed("test -e /data/bar");
 
-      # Test whether restarting ‘nfsd’ works correctly.
-      $server->succeed("systemctl restart nfsd");
+      # Test whether restarting ‘nfs-server’ works correctly.
+      $server->succeed("systemctl restart nfs-server");
       $client2->succeed("echo bla >> /data/bar"); # will take 90 seconds due to the NFS grace period
 
       # Test whether we can get a lock.

From 42574f52b9b4ed2ed13b745518fce0a642c27714 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Sun, 5 Feb 2017 11:08:32 +0100
Subject: [PATCH 465/899] Remove references to $NIX_STRIP_DEBUG

This was removed in 3ea1c308466d2daad18ceac4ef8176bb1c3c85de.
---
 pkgs/development/compilers/gcc/4.8/default.nix | 2 +-
 pkgs/development/compilers/gcc/4.9/default.nix | 2 +-
 pkgs/development/compilers/gcc/5/default.nix   | 2 +-
 pkgs/development/compilers/gcc/6/default.nix   | 2 +-
 pkgs/misc/my-env/loadenv.sh                    | 1 -
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index a0def65d531..e6f990113cc 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -544,7 +544,7 @@ stdenv.mkDerivation ({
 }
 
 # Strip kills static libs of other archs (hence cross != null)
-// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; }
+// optionalAttrs (!stripped || cross != null) { dontStrip = true; }
 
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
 )
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 4b53bc35599..eb03148a4b8 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -551,7 +551,7 @@ stdenv.mkDerivation ({
 }
 
 # Strip kills static libs of other archs (hence cross != null)
-// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; }
+// optionalAttrs (!stripped || cross != null) { dontStrip = true; }
 
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
 
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 3d75c0e76da..1721eba325b 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -547,7 +547,7 @@ stdenv.mkDerivation ({
 }
 
 # Strip kills static libs of other archs (hence cross != null)
-// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; }
+// optionalAttrs (!stripped || cross != null) { dontStrip = true; }
 
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
 )
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 3edfb177b11..c6fac16a76c 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -545,7 +545,7 @@ stdenv.mkDerivation ({
 }
 
 # Strip kills static libs of other archs (hence cross != null)
-// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; }
+// optionalAttrs (!stripped || cross != null) { dontStrip = true; }
 
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
 )
diff --git a/pkgs/misc/my-env/loadenv.sh b/pkgs/misc/my-env/loadenv.sh
index 816c1b8a711..1688d2f158f 100644
--- a/pkgs/misc/my-env/loadenv.sh
+++ b/pkgs/misc/my-env/loadenv.sh
@@ -10,7 +10,6 @@ PATH="$PATH:$OLDPATH"
 export PS1="\n@name@:[\u@\h:\w]\$ "
 export NIX_MYENV_NAME="@name@"
 export buildInputs
-export NIX_STRIP_DEBUG=0
 export TZ="$OLDTZ"
 export http_proxy="$OLD_http_proxy"
 export ftp_proxy="$OLD_ftp_proxy"

From 67ef18d01a944122c03312efbafaa5911427b0a1 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 5 Feb 2017 06:50:20 -0500
Subject: [PATCH 466/899] supplicant nixos module: Allow not specifying the
 configFile path

---
 nixos/modules/services/networking/supplicant.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/supplicant.nix b/nixos/modules/services/networking/supplicant.nix
index 0c459fb1dd0..31d11548f19 100644
--- a/nixos/modules/services/networking/supplicant.nix
+++ b/nixos/modules/services/networking/supplicant.nix
@@ -82,7 +82,8 @@ in
           configFile = {
   
             path = mkOption {
-              type = types.path;
+              type = types.nullOr types.path;
+              default = null;
               example = literalExample "/etc/wpa_supplicant.conf";
               description = ''
                 External <literal>wpa_supplicant.conf</literal> configuration file.

From 64666a402f289a87fdd5cfe3af7668ffaa9e45cd Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 5 Feb 2017 12:57:19 +0100
Subject: [PATCH 467/899] lispPackages.clx: git-20150117 -> git-20170201

---
 pkgs/development/lisp-modules/lisp-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index 6887c8ff60d..537e754d57a 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -19,14 +19,14 @@ let lispPackages = rec {
 
   clx = buildLispPackage rec {
     baseName = "clx";
-    version = "git-20150117";
+    version = "git-20170201";
     description = "An implementation of the X Window System protocol in Lisp";
     deps = [];
     # Source type: git
     src = pkgs.fetchgit {
       url = ''https://github.com/sharplispers/clx'';
-      sha256 = "ada6cf450c22d1ed297e5575f832bee8e4b61d602ffa9a145ae2fab7cd80f3b6";
-      rev = ''0a3bea0fab66058e9394973e23954c43083d96e2'';
+      sha256 = "08jw4d2sx49kq1xw44s3fvyq94wm1if4v1jbf1137fvlkzw1pf5m";
+      rev = ''c6d2446a10abd9eade2c52342b9662c9dd8579dc'';
       name = "clx-git-checkout-${version}";
     };
   };

From 5d6f798efcca57d51bc76e8cbab712f4acac8fbf Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 5 Feb 2017 12:58:53 +0100
Subject: [PATCH 468/899] stumpwm: use fresh SBCL

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a28aa5ea90..c96aca140a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15090,8 +15090,6 @@ with pkgs;
 
   stumpwm = callPackage ../applications/window-managers/stumpwm {
     version = "latest";
-    sbcl = sbcl_1_2_5;
-    lispPackages = lispPackagesFor (wrapLisp sbcl_1_2_5);
   };
 
   stumpwm-git = stumpwm.override {

From 6d9a37bfc8146091318f3f2bfe7e586a27986661 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 5 Feb 2017 13:01:03 +0100
Subject: [PATCH 469/899] CLX and StumpWM no longer need a pinned SBCL

---
 pkgs/top-level/all-packages.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c96aca140a3..2f264952a1f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5411,10 +5411,6 @@ with pkgs;
   sbcl = callPackage ../development/compilers/sbcl {};
   # For Maxima
   sbcl_1_3_12 = callPackage ../development/compilers/sbcl/1.3.12.nix { };
-  # For StumpWM
-  sbcl_1_2_5 = callPackage ../development/compilers/sbcl/1.2.5.nix {
-    clisp = clisp;
-  };
   # For ACL2
   sbcl_1_2_0 = callPackage ../development/compilers/sbcl/1.2.0.nix {
     clisp = clisp;

From 41c1534aed823e6141ed5ee3bada9e48d4a673e8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 5 Feb 2017 15:04:57 +0300
Subject: [PATCH 470/899] qt5.qtwebengine: fix ca bundle path

---
 pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix | 3 +++
 pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix
index 96b6cca75aa..13b8296dc0e 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix
@@ -37,6 +37,9 @@ qtSubmodule {
     sed -i -e 's,\(static QString processPath\),\1 = QLatin1String("'$out'/libexec/QtWebEngineProcess"),' src/core/web_engine_library_info.cpp
     sed -i -e 's,\(static QString potentialLocalesPath =\).*,\1 QLatin1String("'$out'/translations/qtwebengine_locales");,' src/core/web_engine_library_info.cpp
 
+    # fix default SSL bundle location
+    sed -i -e 's,/cert.pem,/certs/ca-bundle.crt,' src/3rdparty/chromium/third_party/boringssl/src/crypto/x509/x509_def.c
+
     configureFlags+="\
         -plugindir $out/lib/qt5/plugins \
         -importdir $out/lib/qt5/imports \
diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
index e7cb8c0ec62..ec3f9061f79 100644
--- a/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
@@ -31,7 +31,10 @@ qtSubmodule {
       --replace /bin/echo ${coreutils}/bin/echo
     substituteInPlace ./src/3rdparty/chromium/v8/build/standalone.gypi \
       --replace /bin/echo ${coreutils}/bin/echo
-      
+
+    # fix default SSL bundle location
+    sed -i -e 's,/cert.pem,/certs/ca-bundle.crt,' src/3rdparty/chromium/third_party/boringssl/src/crypto/x509/x509_def.c
+
     configureFlags+="\
         -plugindir $out/lib/qt5/plugins \
         -importdir $out/lib/qt5/imports \

From c226a93a9effa2ee1d5eb0fb1aa22befa78192fc Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 5 Feb 2017 15:05:29 +0300
Subject: [PATCH 471/899] pythonPackages.pyqt5: enable qtwebengine support

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

diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index 3edf7e6e170..84da1cf9ebf 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, pythonPackages, pkgconfig, qtbase, qtsvg, qtwebkit, dbus_libs
+{ lib, fetchurl, pythonPackages, pkgconfig, qtbase, qtsvg, qtwebkit, qtwebengine, dbus_libs
 , lndir, makeWrapper, qmakeHook }:
 
 let
@@ -22,7 +22,7 @@ in mkPythonDerivation {
 
   buildInputs = [
     pkgconfig makeWrapper lndir
-    qtbase qtsvg qtwebkit dbus_libs qmakeHook
+    qtbase qtsvg qtwebkit qtwebengine dbus_libs qmakeHook
   ];
 
   propagatedBuildInputs = [ sip ];

From 150cddca6f3ee29b46d999e74a2be11b630b3975 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Feb 2017 13:30:44 +0100
Subject: [PATCH 472/899] zlib: 1.2.10 -> 1.2.11

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

diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index dca6483dc84..5d96299380e 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, static ? false }:
 
-let version = "1.2.10"; in
+let version = "1.2.11"; in
 
 stdenv.mkDerivation rec {
   name = "zlib-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
       [ "http://www.zlib.net/fossils/${name}.tar.gz"  # stable archive path
         "mirror://sourceforge/libpng/zlib/${version}/${name}.tar.gz"
       ];
-    sha256 = "05w0jwsqib44jz5jazh7cqz311z4g7znnzn6w6v8g1z4iilryzld";
+    sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1";
   };
 
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''

From 372cb3760e7e3f7dc544e83b252628f5fe1cef03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lengyel=20Bal=C3=A1zs?= <ikervagyok@gmail.com>
Date: Sun, 5 Feb 2017 13:37:16 +0100
Subject: [PATCH 473/899] Merge #17694: curl: add gnutlsSupport ? false

(incl. a nitpick change from vcunat)
---
 pkgs/development/libraries/gnutls/generic.nix |  4 +++-
 pkgs/tools/networking/curl/default.nix        | 10 ++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 67a969b1178..74737eb2389 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen ]
+  buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen ]
     ++ lib.optional doCheck nettools
     ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv
     ++ lib.optional (tpmSupport && stdenv.isLinux) trousers
@@ -47,6 +47,8 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs;
 
+  propagatedBuildInputs = [ nettle ];
+
   inherit doCheck;
 
   # Fixup broken libtool and pkgconfig files
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index a8006997422..de841be3f05 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -4,6 +4,7 @@
 , ldapSupport ? false, openldap ? null
 , zlibSupport ? false, zlib ? null
 , sslSupport ? false, openssl ? null
+, gnutlsSupport ? false, gnutls ? null
 , scpSupport ? false, libssh2 ? null
 , gssSupport ? false, gss ? null
 , c-aresSupport ? false, c-ares ? null
@@ -14,6 +15,8 @@ assert idnSupport -> libidn != null;
 assert ldapSupport -> openldap != null;
 assert zlibSupport -> zlib != null;
 assert sslSupport -> openssl != null;
+assert !(gnutlsSupport && sslSupport);
+assert gnutlsSupport -> gnutls != null;
 assert scpSupport -> libssh2 != null;
 assert c-aresSupport -> c-ares != null;
 
@@ -44,6 +47,7 @@ stdenv.mkDerivation rec {
     optional gssSupport gss ++
     optional c-aresSupport c-ares ++
     optional sslSupport openssl ++
+    optional gnutlsSupport gnutls ++
     optional scpSupport libssh2;
 
   # for the second line see http://curl.haxx.se/mail/tracker-2014-03/0087.html
@@ -56,6 +60,7 @@ stdenv.mkDerivation rec {
       "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
       "--disable-manual"
       ( if sslSupport then "--with-ssl=${openssl.dev}" else "--without-ssl" )
+      ( if gnutlsSupport then "--with-gnutls=${gnutls.dev}" else "--without-gnutls" )
       ( if scpSupport then "--with-libssh2=${libssh2.dev}" else "--without-libssh2" )
       ( if ldapSupport then "--enable-ldap" else "--disable-ldap" )
       ( if ldapSupport then "--enable-ldaps" else "--disable-ldaps" )
@@ -70,6 +75,10 @@ stdenv.mkDerivation rec {
   postInstall = ''
     moveToOutput bin/curl-config "$dev"
     sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la
+  '' + stdenv.lib.optionalString gnutlsSupport ''
+    ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so
+    ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4
+    ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4.4.0
   '';
 
   crossAttrs = {
@@ -77,6 +86,7 @@ stdenv.mkDerivation rec {
     # For the 'urandom', maybe it should be a cross-system option
     configureFlags = [
         ( if sslSupport then "--with-ssl=${openssl.crossDrv}" else "--without-ssl" )
+        ( if gnutlsSupport then "--with-gnutls=${gnutls.crossDrv}" else "--without-gnutls" )
         "--with-random /dev/urandom"
       ];
   };

From 6d2c381e3ee7efbda639979b8b644db6f564635c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Feb 2017 14:22:20 +0100
Subject: [PATCH 474/899] libssh: bugfix 0.7.3 -> 0.7.4

---
 pkgs/development/libraries/libssh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index 0c1c92a0f6f..025a2ee37ff 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }:
 
 stdenv.mkDerivation rec {
-  name = "libssh-0.7.3";
+  name = "libssh-0.7.4";
 
   src = fetchurl {
-    url = "https://red.libssh.org/attachments/download/195/${name}.tar.xz";
-    sha256 = "165g49i4kmm3bfsjm0n8hm21kadv79g9yjqyq09138jxanz4dvr6";
+    url = "https://red.libssh.org/attachments/download/210/${name}.tar.xz";
+    sha256 = "03bcp9ksqp0s1pmwfmzhcknvkxay5k0mjzzxp3rjlifbng1vxq9r";
   };
 
   postPatch = ''

From 35dffbdf54d3f83fa6bcd0d2a0eb0886ad882d46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Feb 2017 14:29:46 +0100
Subject: [PATCH 475/899] mesa: maintenance 13.0.3 -> 13.0.4

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

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index e5cbe8977f0..e9e3c04a7a6 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -26,7 +26,7 @@ if ! lists.elem stdenv.system platforms.mesaPlatforms then
 else
 
 let
-  version = "13.0.3";
+  version = "13.0.4";
   branch  = head (splitString "." version);
   driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
 in
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
       "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
     ];
-    sha256 = "d9aa8be5c176d00d0cd503cb2f64a5a403ea471ec819c022581414860d7ba40e";
+    sha256 = "a95d7ce8f7bd5f88585e4be3144a341236d8c0fc91f6feaec59bb8ba3120e726";
   };
 
   prePatch = "patchShebangs .";

From 5ced6c7e1bdad6e6d5fa97be8d9907c4149a1fd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Feb 2017 14:58:41 +0100
Subject: [PATCH 476/899] libdrm: 2.4.74 -> 2.4.75

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

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 3dddd138438..3dfbdd7040f 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind }:
 
 stdenv.mkDerivation rec {
-  name = "libdrm-2.4.74";
+  name = "libdrm-2.4.75";
 
   src = fetchurl {
     url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "d80dd5a76c401f4c8756dcccd999c63d7e0a3bad258d96a829055cfd86ef840b";
+    sha256 = "2d5a500eef412cc287d12268eed79d571e262d4957a2ec9258073f305985054f";
   };
 
   outputs = [ "out" "dev" ];

From 768d445cb570cfe73e5275b72d08e2bd3a2445c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Feb 2017 14:59:04 +0100
Subject: [PATCH 477/899] gdk-pixbuf: maintenance 2.36.3 -> 2.36.4

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

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 1245381efcd..6ac8a134b1f 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -3,14 +3,14 @@
 
 let
   ver_maj = "2.36";
-  ver_min = "3";
+  ver_min = "4";
 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 = "5223138f7d31afc6b356a049930304ec0abd6ac1113a5d3d1dba5cd4a4d639ec";
+    sha256 = "0b19901c3eb0596141d2d48ddb9dac79ad1524bdf59366af58ab38fcb9ee7463";
   };
 
   outputs = [ "out" "dev" "devdoc" ];

From 5887affc26dbd65592266e46759842d70f24fcca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Feb 2017 15:02:11 +0100
Subject: [PATCH 478/899] gtk3: maintenance 3.22.6 -> 3.22.7

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

diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 45c21df4696..bf63c9425ae 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -13,7 +13,7 @@ with stdenv.lib;
 
 let
   ver_maj = "3.22";
-  ver_min = "6";
+  ver_min = "7";
   version = "${ver_maj}.${ver_min}";
 in
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
-    sha256 = "eba75a216a117f4391beb2971ba20ff8a1823f109893f0ab6c2eac2210ea172f";
+    sha256 = "a3a27564bfb1679ebbc75c37cd2bcd6e727c8bdfbcd3984d29305bf9ee60d432";
   };
 
   outputs = [ "out" "dev" ];

From 102e4eed6f827347ff8e7c870e5adfef7c958aa7 Mon Sep 17 00:00:00 2001
From: asildnes <andsild@gmail.com>
Date: Sun, 5 Feb 2017 11:44:10 +0100
Subject: [PATCH 479/899] ansicolor: init at 0.2.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ffcab34122e..1a7a5e6ae5a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -152,6 +152,23 @@ in {
     };
   };
 
+  ansicolor = buildPythonPackage rec {
+    name = "ansicolor-${version}";
+    version = "0.2.4";
+
+    src = pkgs.fetchurl{
+      url = "mirror://pypi/a/ansicolor/${name}.tar.gz";
+      sha256 = "0zlkk9706xn5yshwzdn8xsfkim8iv44zsl6qjwg2f4gn62rqky1h";
+    };
+
+    meta = {
+      homepage = "https://github.com/numerodix/ansicolor/";
+      description = "A library to produce ansi color output and colored highlighting and diffing";
+      license = licenses.asl20;
+      maintainers = with maintainers; [ andsild ];
+    };
+  };
+
   # packages defined elsewhere
 
   blivet = callPackage ../development/python-modules/blivet { };

From f65a3515f475e9d04d6b171928aeed52418f482d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 5 Feb 2017 11:51:05 -0500
Subject: [PATCH 480/899] rkt: 1.23.0 -> 1.24.0

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

diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index 2f610208c72..7059b860680 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -12,7 +12,7 @@ let
   stage1Dir = "lib/rkt/stage1-images";
 
 in stdenv.mkDerivation rec {
-  version = "1.23.0";
+  version = "1.24.0";
   name = "rkt-${version}";
   BUILDDIR="build-${name}";
 
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
       owner = "coreos";
       repo = "rkt";
       rev = "v${version}";
-      sha256 = "0fgvc3s8rb6da3jgrd8jmqv9xky7mq1y184jbm4lgy0rds4zhkf4";
+      sha256 = "11vp3pm00xsksdgdv67sgvrrpj3ayp7sx1wprn4aa579vbbr83bd";
   };
 
   stage1BaseImage = fetchurl {

From 5eaea6cee01e9172ae65ccb6356861786a0f85cc Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 26 Dec 2016 14:32:14 -0800
Subject: [PATCH 481/899] cross stdenv: let build package's build deps resolve
 to native packages

This fixes the "sliding window" principle:
  0. Run packages:       build = native;  host = foreign; target = foreign;
  1. Build packages:     build = native;  host = native;  target = foreign;
  2. Vanilla packages:   build = native;  host = native;  target = native;
  3. Vanilla packages:   build = native;  host = native;  target = native;
  n+3. ...

Each stage's build dependencies are resolved against the previous stage,
and the "foreigns" are shifted accordingly. Vanilla packages alone are
built against themsevles, since there are no more "foreign"s to shift away.

Before, build packages' build dependencies were resolved against
themselves:
  0. Run packages:       build = native;  host = foreign; target = foreign;
  1. Build packages:     build = native;  host = native;  target = foreign;
  2. Build packages:     build = native;  host = native;  target = foreign;
  n+2. ...

This is wrong because that principle is violated by the target
platform staying foreign.

This will change the hashes of many build packages and run packages, but
that is OK. This is an unavoidable cost of fixing cross compiling.

The cross compilation docs have been updated to reflect this fix.
---
 doc/cross-compilation.xml     | 11 ++++++-----
 pkgs/stdenv/cross/default.nix |  3 +--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index e93d1a98f7f..32cf198449b 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -105,14 +105,15 @@
       This is the most important guiding principle behind cross-compilation with Nixpkgs, and will be called the <wordasword>sliding window principle</wordasword>.
       In this manner, given the 3 platforms for one package, we can determine the three platforms for all its transitive dependencies.
     </para>
+    <para>
+      Some examples will probably make this clearer.
+      If a package is being built with a <literal>(build, host, target)</literal> platform triple of <literal>(foo, bar, bar)</literal>, then its build-time dependencies would have a triple of <literal>(foo, foo, bar)</literal>, and <emphasis>those packages'</emphasis> build-time dependencies would have triple of <literal>(foo, foo, foo)</literal>.
+      In other words, it should take two "rounds" of following build-time dependency edges before one reaches a fixed point where, by the sliding window principle, the platform triple no longer changes.
+      Indeed, this happens with cross compilation, where only rounds of native dependencies starting with the second necessarily coincide with native packages.
+    </para>
     <note><para>
       The depending package's target platform is unconstrained by the sliding window principle, which makes sense in that one can in principle build cross compilers targeting arbitrary platforms.
     </para></note>
-    <warning><para>
-      From the above, one would surmise that if a package is being built with a <literal>(build, host, target)</literal> platform triple of <literal>(foo, bar, bar)</literal>, then its build-time dependencies would have a triple of <literal>(foo, foo, bar)</literal>, and <emphasis>those packages'</emphasis> build-time dependencies would have triple of <literal>(foo, foo, foo)</literal>.
-      In other words, it should take two "rounds" of following build-time dependency edges before one reaches a fixed point where, by the sliding window principle, the platform triple no longer changes.
-      Unfortunately, at the moment, we do <emphasis>not</emphasis> implement this correctly, and after only one round of following build-time dependencies is the fixed point reached, with target incorrectly kept different than the others.
-    </para></warning>
     <para>
       How does this work in practice? Nixpkgs is now structured so that build-time dependencies are taken from from <varname>buildPackages</varname>, whereas run-time dependencies are taken from the top level attribute set.
       For example, <varname>buildPackages.gcc</varname> should be used at build time, while <varname>gcc</varname> should be used at run time.
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index 37f403acee9..e322d465520 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -18,8 +18,7 @@ in bootStages ++ [
     hostPlatform = localSystem;
     targetPlatform = crossSystem;
     inherit config overlays;
-    # Should be false, but we're trying to preserve hashes for now
-    selfBuild = true;
+    selfBuild = false;
     # It's OK to change the built-time dependencies
     allowCustomOverrides = true;
     stdenv = vanillaPackages.stdenv // {

From ffb91cc6975127e9ddd073778b105189e52de28a Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Sun, 5 Feb 2017 18:39:30 +0100
Subject: [PATCH 482/899] docker_compose: Remove upper bound version
 limitations

---
 pkgs/development/python-modules/docker_compose.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/docker_compose.nix b/pkgs/development/python-modules/docker_compose.nix
index e6f309155c2..c21b69e1643 100644
--- a/pkgs/development/python-modules/docker_compose.nix
+++ b/pkgs/development/python-modules/docker_compose.nix
@@ -26,7 +26,9 @@ buildPythonApplication rec {
     stdenv.lib.optional (pythonOlder "3.2") functools32;
 
   patchPhase = ''
-    sed -i "s/'requests >= 2.6.1, < 2.8'/'requests'/" setup.py
+    # Remove upper bound on requires, see also
+    # https://github.com/docker/compose/issues/4431
+    sed -i "s/, < .*',$/',/" setup.py
   '';
 
   postInstall = ''

From 5cded7db860ab231947726f8ec91c8bae8efb85d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 5 Feb 2017 19:05:49 +0100
Subject: [PATCH 483/899] rrdtool: 1.5.6 -> 1.6.0

---
 pkgs/tools/misc/rrdtool/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix
index 98bf6a9cfc2..de4c97731ef 100644
--- a/pkgs/tools/misc/rrdtool/default.nix
+++ b/pkgs/tools/misc/rrdtool/default.nix
@@ -2,14 +2,16 @@
 , tcl-8_5 }:
 
 stdenv.mkDerivation rec {
-  name = "rrdtool-1.5.6";
+  name = "rrdtool-1.6.0";
 
   src = fetchurl {
     url = "http://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz";
-    sha256 = "1s2cci80g6kbp5p77mkxpfxwvjm1802fw0bjfsa8yjv8g5a7fclq";
+    sha256 = "1msj1qsy3sdmx2g2rngp9a9qv50hz0ih7yx6nkx2b21drn4qx56d";
   };
 
-  buildInputs = [ gettext perl pkgconfig libxml2 pango cairo groff ]
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ gettext perl libxml2 pango cairo groff ]
     ++ stdenv.lib.optional stdenv.isDarwin tcl-8_5;
 
   postInstall = ''

From 1f18f65650817268d6dc59d9327395326c2c2f02 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 5 Feb 2017 21:18:27 +0100
Subject: [PATCH 484/899] callCabal2nix: take "name" parameter as a function
 argument

The callCabal2nix function cannot reliably determine the appropriate "name" for
the package it's processing. Attempts to derive this information have led to
plenty of evaluation errors, and so I'd like to go for the obvious and reliable
solution now and let the caller specify that bit of information.

Here is an example that demonstrates how to use callCabal2nix.

    let
      pkgs = import <nixpkgs> {};
      src = pkgs.fetchFromGitHub {
        owner = "gtk2hs";
        repo = "gtk2hs";
        rev = "eee61d84edf1dd44f8d380d7d7cae2405de50124";
        sha256 = "12i53grimni0dyjqjydl120z5amcn668w4pfhl8dxscjh4a0l5nb";
      };
    in
      pkgs.haskellPackages.callCabal2nix "gtkhs-tools" "${src}/tools" {}
---
 pkgs/development/haskell-modules/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 31b20ab19f3..b42f94a3635 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -85,10 +85,7 @@ let
         callHackage = name: version: self.callPackage (hackage2nix name version);
 
         # Creates a Haskell package from a source package by calling cabal2nix on the source.
-        callCabal2nix = src: self.callPackage (haskellSrc2nix {
-          inherit src;
-          name = src.name or baseNameOf src;
-        });
+        callCabal2nix = name: src: self.callPackage (haskellSrc2nix { inherit src name; });
 
         ghcWithPackages = selectFrom: withPackages (selectFrom self);
 

From 00517f1779f8a8514aec6c0f539f895a1b730e54 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sun, 5 Feb 2017 22:00:42 +0100
Subject: [PATCH 485/899] rr: 4.4.0 -> 4.5.0

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

diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix
index 11ba86724e6..27d7cb30658 100644
--- a/pkgs/development/tools/analysis/rr/default.nix
+++ b/pkgs/development/tools/analysis/rr/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkgconfig, python2Packages, which, procps, gdb }:
 
 stdenv.mkDerivation rec {
-  version = "4.4.0";
+  version = "4.5.0";
   name = "rr-${version}";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "rr";
     rev = version;
-    sha256 = "1ijzs5lwscg0k5ch1bljiqqh35rzai75xcgghgkjbz86ynmf62rd";
+    sha256 = "114g1yhpjfyxcn0fkvnfi03lhrs11pj0a1945j2j8z90hx4dwba8";
   };
 
   postPatch = ''

From ef875a60c11c73863feb973a675b4ec6cb4cc984 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sun, 5 Feb 2017 16:40:28 -0500
Subject: [PATCH 486/899] 389-ds-base: 1.3.5.4 -> 1.3.5.15

---
 pkgs/servers/ldap/389/default.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix
index 6ba60ff1772..3b104232673 100644
--- a/pkgs/servers/ldap/389/default.nix
+++ b/pkgs/servers/ldap/389/default.nix
@@ -2,14 +2,14 @@
 , db, cyrus_sasl, svrcore, icu, net_snmp, kerberos, pcre, perlPackages
 }:
 let
-  version = "1.3.5.4";
+  version = "1.3.5.15";
 in
 stdenv.mkDerivation rec {
   name = "389-ds-base-${version}";
 
   src = fetchurl {
     url = "http://directory.fedoraproject.org/binaries/${name}.tar.bz2";
-    sha256 = "1f1r4wky8x39jdabnd277f6m0snnzh9f0wvsr8x4rnvkckjphbx8";
+    sha256 = "1z17nnr4axndjyp413kyxb6iwdfky7nlsjhlc0klvdi2ai983p91";
   };
 
   buildInputs = [
@@ -20,13 +20,6 @@ stdenv.mkDerivation rec {
   # TODO: Fix bin/ds-logpipe.py, bin/logconv, bin/cl-dump
 
   patches = [ ./perl-path.patch
-    # https://fedorahosted.org/389/ticket/48354
-    (fetchpatch {
-      name = "389-ds-base-CVE-2016-5416.patch";
-      url = "https://fedorahosted.org/389/changeset/3c2cd48b7d2cb0579f7de6d460bcd0c9bb1157bd/?format=diff&new=3c2cd48b7d2cb0579f7de6d460bcd0c9bb1157bd";
-      addPrefixes = true;
-      sha256 = "1kv3a3di1cihkaf8xdbb5mzvhm4c3frx8rc5mji8xgjyj9ni6xja";
-    })
   ];
 
   preConfigure = ''
@@ -46,7 +39,7 @@ stdenv.mkDerivation rec {
     "--with-sasl=${cyrus_sasl.dev}"
     "--with-netsnmp=${net_snmp}"
   ];
-  
+
   preInstall = ''
     # The makefile doesn't create this directory for whatever reason
     mkdir -p $out/lib/dirsrv

From 2c21f742b26e21c2a2bf8d960a364b8e29ad5ad9 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 5 Feb 2017 22:50:38 +0100
Subject: [PATCH 487/899] minisign: 0.6 -> 0.7

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

diff --git a/pkgs/tools/security/minisign/default.nix b/pkgs/tools/security/minisign/default.nix
index 1a573048aa4..6a8f6d79fe1 100644
--- a/pkgs/tools/security/minisign/default.nix
+++ b/pkgs/tools/security/minisign/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "minisign-${version}";
-  version = "0.6";
+  version = "0.7";
 
   src = fetchFromGitHub {
     repo = "minisign";
     owner = "jedisct1";
     rev = version;
-    sha256 = "1m71ngxaij3q1dw602kjgj22y5xfjlxrrkjdmx1v4p36y0n6wl92";
+    sha256 = "15w8fgplkxiw9757qahwmgnl4bwx9mm0rnwp1izs2jcy1wy35vp8";
   };
 
   nativeBuildInputs = [ cmake ];

From 52c7e647ab81383c72117800b8cd5cd49bec9030 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 4 Feb 2017 14:48:11 +0300
Subject: [PATCH 488/899] postfix service: don't empty local_recipient_maps

From Postfix documentation:

With this setting, the Postfix SMTP server will not reject mail with "User
unknown in local recipient table". Don't do this on systems that receive mail
directly from the Internet. With today's worms and viruses, Postfix will become
a backscatter source: it accepts mail for non-existent recipients and then
tries to return that mail as "undeliverable" to the often forged sender
address.
---
 nixos/doc/manual/release-notes/rl-1703.xml | 12 +++++++++++-
 nixos/modules/services/mail/postfix.nix    |  2 --
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 09358f3af23..be6ad59ac5d 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -46,6 +46,7 @@ following incompatible changes:</para>
       for what those parameters represent.
     </para>
   </listitem>
+
   <listitem>
     <para>
       <literal>ansible</literal> now defaults to ansible version 2 as version 1
@@ -54,6 +55,7 @@ following incompatible changes:</para>
       vulnerability</link> unpatched by upstream.
     </para>
   </listitem>
+
   <listitem>
     <para>
       <literal>gnome</literal> alias has been removed along with
@@ -116,7 +118,6 @@ following incompatible changes:</para>
   </listitem>
 
   <listitem>
-
     <para><literal>overridePackages</literal> function no longer exists.
     It is replaced by <link
     xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">
@@ -153,6 +154,15 @@ following incompatible changes:</para>
     </para>
   </listitem>
 
+  <listitem>
+    <para>
+      <literal>local_recipient_maps</literal> is not set to empty value by
+      Postfix service. It's an insecure default as stated by Postfix
+      documentation. Those who want to retain this setting need to set it via
+      <literal>services.postfix.extraConfig</literal>.
+    </para>
+  </listitem>
+
 </itemizedlist>
 
 
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index cdde4144622..caaa87b94d6 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -79,8 +79,6 @@ let
       relay_domains = ${concatStringsSep ", " cfg.relayDomains}
     ''
     + ''
-      local_recipient_maps =
-
       relayhost = ${if cfg.lookupMX || cfg.relayHost == "" then
           cfg.relayHost
         else

From 962c4430baad2ea72dfae26b862247bacb3caa28 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sun, 5 Feb 2017 18:13:06 -0500
Subject: [PATCH 489/899] redshift-plasma-applet: init at 1.0.17

---
 .../misc/redshift-plasma-applet/default.nix   | 40 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/applications/misc/redshift-plasma-applet/default.nix

diff --git a/pkgs/applications/misc/redshift-plasma-applet/default.nix b/pkgs/applications/misc/redshift-plasma-applet/default.nix
new file mode 100644
index 00000000000..3cf6f7d754b
--- /dev/null
+++ b/pkgs/applications/misc/redshift-plasma-applet/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, cmake, kde5, redshift, fetchFromGitHub, ... }:
+
+let version = "1.0.17"; in
+
+stdenv.mkDerivation {
+  name = "redshift-plasma-applet-${version}";
+
+  src = fetchFromGitHub {
+    owner = "kotelnik";
+    repo = "plasma-applet-redshift-control";
+    rev = "v${version}";
+    sha256 = "1lp1rb7i6c18lrgqxsglbvyvzh71qbm591abrbhw675ii0ca9hgj";
+  };
+
+  patchPhase = ''
+    substituteInPlace package/contents/ui/main.qml \
+      --replace "redshiftCommand: 'redshift'" \
+                "redshiftCommand: '${redshift}/bin/redshift'" \
+      --replace "redshiftOneTimeCommand: 'redshift -O " \
+                "redshiftOneTimeCommand: '${redshift}/bin/redshift -O "
+
+    substituteInPlace package/contents/ui/config/ConfigAdvanced.qml \
+      --replace "'redshift -V'" \
+                "'${redshift}/bin/redshift -V'"
+  '';
+
+  buildInputs = [
+    cmake
+    kde5.plasma-framework
+  ];
+
+
+  meta = with stdenv.lib; {
+    description = "KDE Plasma 5 widget for controlling Redshift";
+    homepage = https://github.com/kotelnik/plasma-applet-redshift-control;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ benley ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f638c0801f7..60c0b749ccd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16766,6 +16766,8 @@ with pkgs;
     inherit (python3Packages) python pygobject3 pyxdg;
   };
 
+  redshift-plasma-applet = callPackage ../applications/misc/redshift-plasma-applet { };
+
   orion = callPackage ../misc/themes/orion {};
 
   albatross = callPackage ../misc/themes/albatross { };

From d4917286530b95720eac05e68c7fbcc1dd651774 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Mon, 6 Feb 2017 01:08:58 +0100
Subject: [PATCH 490/899] httpd: added serviceExpression which extends the
 serviceType concept -> allows that httpd services can live outside of nixpkgs
 (#22269)

---
 nixos/modules/services/web-servers/apache-httpd/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index dc0ca501a48..ed77e084476 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -63,6 +63,8 @@ let
       let
         svcFunction =
           if svc ? function then svc.function
+          # instead of using serviceType="mediawiki"; you can copy mediawiki.nix to any location outside nixpkgs, modify it at will, and use serviceExpression=./mediawiki.nix;
+          else if svc ? serviceExpression then import (toString svc.serviceExpression)
           else import (toString "${toString ./.}/${if svc ? serviceType then svc.serviceType else svc.serviceName}.nix");
         config = (evalModules
           { modules = [ { options = res.options; config = svc.config or svc; } ];

From 33c09a0e4054745b46dd2d875be5806e99ef6943 Mon Sep 17 00:00:00 2001
From: Szczyp <qb@szczyp.com>
Date: Fri, 3 Feb 2017 07:47:35 +0100
Subject: [PATCH 491/899] rhc: 1.36.4 -> 1.38.7

Fix: CVE-2016-10173
---
 pkgs/development/tools/rhc/Gemfile      |   2 +
 pkgs/development/tools/rhc/Gemfile.lock |  21 ++--
 pkgs/development/tools/rhc/default.nix  |  24 ++++-
 pkgs/development/tools/rhc/gemset.nix   | 131 +++++++++++-------------
 4 files changed, 94 insertions(+), 84 deletions(-)

diff --git a/pkgs/development/tools/rhc/Gemfile b/pkgs/development/tools/rhc/Gemfile
index ad167c7422f..a780461e254 100644
--- a/pkgs/development/tools/rhc/Gemfile
+++ b/pkgs/development/tools/rhc/Gemfile
@@ -1,2 +1,4 @@
 source 'https://rubygems.org'
+
+gem 'archive-tar-minitar', '>= 0.5.2.1', github: 'peterhoeg/archive-tar-minitar'
 gem 'rhc'
diff --git a/pkgs/development/tools/rhc/Gemfile.lock b/pkgs/development/tools/rhc/Gemfile.lock
index 83fa877550d..004c293b965 100644
--- a/pkgs/development/tools/rhc/Gemfile.lock
+++ b/pkgs/development/tools/rhc/Gemfile.lock
@@ -1,27 +1,31 @@
+GIT
+  remote: git://github.com/peterhoeg/archive-tar-minitar.git
+  revision: dae32ca550a87dba32597115ae18805db4782ebe
+  specs:
+    archive-tar-minitar (0.5.2.1)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    archive-tar-minitar (0.5.2)
     commander (4.2.1)
       highline (~> 1.6.11)
     highline (1.6.21)
     httpclient (2.6.0.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.2)
-    net-ssh-gateway (1.2.0)
-      net-ssh (>= 2.6.5)
+    net-ssh (4.0.1)
+    net-ssh-gateway (2.0.0)
+      net-ssh (>= 4.0.0)
     net-ssh-multi (1.2.1)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
     open4 (1.3.4)
-    rhc (1.36.4)
+    rhc (1.38.7)
       archive-tar-minitar
       commander (>= 4.0, < 4.3.0)
       highline (~> 1.6.11)
-      httpclient (>= 2.4.0)
+      httpclient (>= 2.4.0, < 2.7.0)
       net-scp (>= 1.1.2)
-      net-ssh (>= 2.0.11, < 2.9.3)
       net-ssh-multi (>= 1.2.0)
       open4
 
@@ -29,7 +33,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  archive-tar-minitar (>= 0.5.2.1)!
   rhc
 
 BUNDLED WITH
-   1.10.5
+   1.13.6
diff --git a/pkgs/development/tools/rhc/default.nix b/pkgs/development/tools/rhc/default.nix
index e6b342dd7b6..da8a8e2e77d 100644
--- a/pkgs/development/tools/rhc/default.nix
+++ b/pkgs/development/tools/rhc/default.nix
@@ -1,10 +1,24 @@
-{ lib, bundlerEnv, ruby }:
+{ lib, bundlerEnv, ruby_2_2, stdenv, makeWrapper }:
 
-bundlerEnv {
-  name = "rhc-1.36.4";
+stdenv.mkDerivation rec {
+  name = "rhc-1.38.7";
 
-  inherit ruby;
-  gemdir = ./.;
+  env = bundlerEnv {
+    name = "rhc-1.38.7-gems";
+
+    ruby = ruby_2_2;
+
+    gemdir = ./.;
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    makeWrapper ${env}/bin/rhc $out/bin/rhc
+  '';
 
   meta = with lib; {
     homepage = https://github.com/openshift/rhc;
diff --git a/pkgs/development/tools/rhc/gemset.nix b/pkgs/development/tools/rhc/gemset.nix
index 6b273396890..933a7dc95af 100644
--- a/pkgs/development/tools/rhc/gemset.nix
+++ b/pkgs/development/tools/rhc/gemset.nix
@@ -1,95 +1,84 @@
 {
-  "archive-tar-minitar" = {
-    version = "0.5.2";
+  archive-tar-minitar = {
     source = {
-      type = "gem";
-      sha256 = "1j666713r3cc3wb0042x0wcmq2v11vwwy5pcaayy5f0lnd26iqig";
+      fetchSubmodules = false;
+      rev = "dae32ca550a87dba32597115ae18805db4782ebe";
+      sha256 = "0fvxacbcb52fm5dis451kdd7dv74z8p6nm4vnfqf7jg2aghcxdkd";
+      type = "git";
+      url = "git://github.com/peterhoeg/archive-tar-minitar.git";
     };
+    version = "0.5.2.1";
   };
-  "commander" = {
-    version = "4.2.1";
+  commander = {
     source = {
-      type = "gem";
+      remotes = ["https://rubygems.org"];
       sha256 = "1zwfhswnbhwv0zzj2b3s0qvpqijbbnmh7zvq6v0274rqbxyf1jwc";
-    };
-    dependencies = [
-      "highline"
-    ];
-  };
-  "highline" = {
-    version = "1.6.21";
-    source = {
       type = "gem";
+    };
+    version = "4.2.1";
+  };
+  highline = {
+    source = {
+      remotes = ["https://rubygems.org"];
       sha256 = "06bml1fjsnrhd956wqq5k3w8cyd09rv1vixdpa3zzkl6xs72jdn1";
-    };
-  };
-  "httpclient" = {
-    version = "2.6.0.1";
-    source = {
       type = "gem";
+    };
+    version = "1.6.21";
+  };
+  httpclient = {
+    source = {
+      remotes = ["https://rubygems.org"];
       sha256 = "0haz4s9xnzr73mkfpgabspj43bhfm9znmpmgdk74n6gih1xlrx1l";
-    };
-  };
-  "net-scp" = {
-    version = "1.2.1";
-    source = {
       type = "gem";
+    };
+    version = "2.6.0.1";
+  };
+  net-scp = {
+    source = {
+      remotes = ["https://rubygems.org"];
       sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j";
-    };
-    dependencies = [
-      "net-ssh"
-    ];
-  };
-  "net-ssh" = {
-    version = "2.9.2";
-    source = {
       type = "gem";
-      sha256 = "1p0bj41zrmw5lhnxlm1pqb55zfz9y4p9fkrr9a79nrdmzrk1ph8r";
     };
-  };
-  "net-ssh-gateway" = {
-    version = "1.2.0";
-    source = {
-      type = "gem";
-      sha256 = "1nqkj4wnj26r81rp3g4jqk7bkd2nqzjil3c9xqwchi0fsbwv2niy";
-    };
-    dependencies = [
-      "net-ssh"
-    ];
-  };
-  "net-ssh-multi" = {
     version = "1.2.1";
+  };
+  net-ssh = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02xj3pcpqr32nlak0vsx71gd5z65jl3q1hwi2x157vabw1kgjanq";
       type = "gem";
+    };
+    version = "4.0.1";
+  };
+  net-ssh-gateway = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1l3v761y32aw0n8lm0c0m42lr4ay8cq6q4sc5yc68b9fwlfvb70x";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  net-ssh-multi = {
+    source = {
+      remotes = ["https://rubygems.org"];
       sha256 = "13kxz9b6kgr9mcds44zpavbndxyi6pvyzyda6bhk1kfmb5c10m71";
-    };
-    dependencies = [
-      "net-ssh"
-      "net-ssh-gateway"
-    ];
-  };
-  "open4" = {
-    version = "1.3.4";
-    source = {
       type = "gem";
+    };
+    version = "1.2.1";
+  };
+  open4 = {
+    source = {
+      remotes = ["https://rubygems.org"];
       sha256 = "1cgls3f9dlrpil846q0w7h66vsc33jqn84nql4gcqkk221rh7px1";
-    };
-  };
-  "rhc" = {
-    version = "1.36.4";
-    source = {
       type = "gem";
-      sha256 = "1dkg39x3y3sxq71md5c8akq4y7ynjwcdy8ysm6d1k9b2rj0s5wdb";
     };
-    dependencies = [
-      "archive-tar-minitar"
-      "commander"
-      "highline"
-      "httpclient"
-      "net-scp"
-      "net-ssh"
-      "net-ssh-multi"
-      "open4"
-    ];
+    version = "1.3.4";
+  };
+  rhc = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1yaq42szq81ph44q7ckzml9yrhz1pkjfik77rxvfzlf90l1g2ibk";
+      type = "gem";
+    };
+    version = "1.38.7";
   };
 }
\ No newline at end of file

From 9d6f2fd297e90ecacf3292453e43e7114ae3c1a4 Mon Sep 17 00:00:00 2001
From: TANIGUCHI Kohei <a.d.xvii.kal.mai@gmail.com>
Date: Mon, 6 Feb 2017 07:08:05 +0900
Subject: [PATCH 492/899] nkf: 2.1.3 -> 2.1.4

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

diff --git a/pkgs/tools/text/nkf/default.nix b/pkgs/tools/text/nkf/default.nix
index 31d58fbccc3..eadb107d827 100644
--- a/pkgs/tools/text/nkf/default.nix
+++ b/pkgs/tools/text/nkf/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "nkf-${version}";
-  version = "2.1.3";
+  version = "2.1.4";
 
   src = fetchurl {
-    url = "mirror://sourceforgejp/nkf/59912/${name}.tar.gz";
-    sha256 = "8cb430ae69a1ad58b522eb4927b337b5b420bbaeb69df255919019dc64b72fc2";
+    url = "mirror://sourceforgejp/nkf/64158/${name}.tar.gz";
+    sha256 = "b4175070825deb3e98577186502a8408c05921b0c8ff52e772219f9d2ece89cb";
   };
 
   makeFlags = "prefix=\${out}";

From c771d499f9c44f9b20312d136617d127e090133d Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Sun, 5 Feb 2017 05:43:35 +0000
Subject: [PATCH 493/899] systemtap: 2016-09-16 -> 2017-02-04

---
 .../tools/profiling/systemtap/default.nix      | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix
index b7872780245..a16bdbc539a 100644
--- a/pkgs/development/tools/profiling/systemtap/default.nix
+++ b/pkgs/development/tools/profiling/systemtap/default.nix
@@ -1,11 +1,11 @@
 { fetchgit, pkgconfig, gettext, runCommand, makeWrapper
-, elfutils, kernel, gnumake }:
+, elfutils, kernel, gnumake, python2, pythonPackages, binutils }:
 let
   ## fetchgit info
   url = git://sourceware.org/git/systemtap.git;
-  rev = "a10bdceb7c9a7dc52c759288dd2e555afcc5184a";
-  sha256 = "1kllzfnh4ksis0673rma5psglahl6rvy0xs5v05qkqn6kl7irmg1";
-  version = "2016-09-16";
+  rev = "276ed27a3cc64531542ab73bb36bb04784e79bbc";
+  sha256 = "11967dx3cjs96v3ncfljw0h7blsgg9wm8g9z2270q9a90988g2c2";
+  version = "2017-02-04";
 
   inherit (kernel) stdenv;
   inherit (stdenv) lib;
@@ -14,7 +14,13 @@ let
   stapBuild = stdenv.mkDerivation {
     name = "systemtap-${version}";
     src = fetchgit { inherit url rev sha256; };
-    buildInputs = [ elfutils pkgconfig gettext ];
+    buildInputs = [ elfutils pkgconfig gettext python2 pythonPackages.setuptools ];
+    # FIXME: Workaround for bug in kbuild, where quoted -I"/foo" flags would get mangled in out-of-tree kbuild dirs
+    postPatch = ''
+      substituteInPlace buildrun.cxx --replace \
+        'o << "EXTRA_CFLAGS += -I\"" << s.runtime_path << "\"" << endl;' \
+        'o << "EXTRA_CFLAGS += -I" << s.runtime_path << endl;'
+    '';
     enableParallelBuilding = true;
   };
 
@@ -48,5 +54,5 @@ in runCommand "systemtap-${kernel.version}-${version}" {
   rm $out/bin/stap
   makeWrapper $stapBuild/bin/stap $out/bin/stap \
     --add-flags "-r $kernelBuildDir" \
-    --prefix PATH : ${lib.makeBinPath [ stdenv.cc.cc elfutils gnumake ]}
+    --prefix PATH : ${lib.makeBinPath [ stdenv.cc.cc binutils elfutils gnumake ]}
 ''

From 59ad58cd9bf9d0e4f765beb8f6606e4375a0f7a6 Mon Sep 17 00:00:00 2001
From: Michael Raitza <spacefrogg-github@meterriblecrew.net>
Date: Sun, 5 Feb 2017 19:25:26 +0100
Subject: [PATCH 494/899] audio-recorder: 1.7-5 -> 1.9.4

---
 .../audio/audio-recorder/default.nix          | 25 +++++----
 .../audio/audio-recorder/icon-names.diff      | 51 +++++++++++++++++++
 2 files changed, 65 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/applications/audio/audio-recorder/icon-names.diff

diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/applications/audio/audio-recorder/default.nix
index 2a611da45f8..e6addd6c4fd 100644
--- a/pkgs/applications/audio/audio-recorder/default.nix
+++ b/pkgs/applications/audio/audio-recorder/default.nix
@@ -1,24 +1,27 @@
 { stdenv, fetchurl, lib
-, pkgconfig, intltool, autoconf, makeWrapper
+, pkgconfig, intltool, autoconf, gnome3
 , glib, dbus, gtk3, libdbusmenu-gtk3, libappindicator-gtk3, gst_all_1
+, librsvg, wrapGAppsHook
 , pulseaudioSupport ? true, libpulseaudio ? null }:
 
 with lib;
 
 stdenv.mkDerivation rec {
   name = "audio-recorder-${version}";
-  version = "1.7-5";
+  version = "1.9.4";
 
   src = fetchurl {
-    name = "${name}-wily.tar.gz";
-    url = "${meta.homepage}/+archive/ubuntu/ppa/+files/audio-recorder_${version}%7Ewily.tar.gz";
-    sha256 = "1cdlqhfqw2mg51f068j2lhn8mzxggzsbl560l4pl4fxgmpjywpkj";
+    name = "${name}-zesty.tar.gz";
+    url = "${meta.homepage}/+archive/ubuntu/ppa/+files/audio-recorder_${version}%7Ezesty.tar.gz";
+    sha256 = "062bad38cz4fqzv418wza0x8sa4m5mqr3xsisrr1qgkqj9hg1f6x";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool autoconf makeWrapper ];
+  nativeBuildInputs = [ pkgconfig intltool autoconf wrapGAppsHook ];
+
+  patches = [ ./icon-names.diff ];
 
   buildInputs = with gst_all_1; [
-    glib dbus gtk3 libdbusmenu-gtk3 libappindicator-gtk3
+    glib dbus gtk3 librsvg libdbusmenu-gtk3 libappindicator-gtk3 gnome3.dconf
     gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav
   ] ++ optional pulseaudioSupport libpulseaudio;
 
@@ -30,10 +33,10 @@ stdenv.mkDerivation rec {
     intltoolize
   '';
 
-  postFixup = ''
-    wrapProgram $out/bin/audio-recorder \
-      --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
-      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0"
+  preFixup = ''
+    gappsWrapperArgs+=('--prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"'
+      '--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"'
+      '--prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"')
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/audio-recorder/icon-names.diff b/pkgs/applications/audio/audio-recorder/icon-names.diff
new file mode 100644
index 00000000000..28f21799166
--- /dev/null
+++ b/pkgs/applications/audio/audio-recorder/icon-names.diff
@@ -0,0 +1,51 @@
+diff -ru audio-recorder/src/main.c audio-recorder.new/src/main.c
+--- audio-recorder/src/main.c	2017-01-03 20:27:36.000000000 +0100
++++ audio-recorder.new/src/main.c	2017-01-30 20:19:44.019255096 +0100
+@@ -1099,7 +1099,7 @@
+     gtk_container_add(GTK_CONTAINER(frame2), g_win.timer_text);
+ 
+     // Timer [Save] button
+-    g_win.timer_save_button = gtk_button_new_from_icon_name("gtk-save", GTK_ICON_SIZE_BUTTON);
++    g_win.timer_save_button = gtk_button_new_from_icon_name("document-save", GTK_ICON_SIZE_BUTTON);
+     // Hide it
+     gtk_widget_hide(g_win.timer_save_button);
+     g_signal_connect(g_win.timer_save_button, "clicked", G_CALLBACK(win_timer_save_text_cb), NULL);
+@@ -1129,7 +1129,7 @@
+     // The [Info] button
+     GtkWidget *button0 = gtk_button_new();
+     gtk_widget_show(button0);
+-    GtkWidget *image = gtk_image_new_from_icon_name("gtk-info", GTK_ICON_SIZE_BUTTON);
++    GtkWidget *image = gtk_image_new_from_icon_name("dialog-information", GTK_ICON_SIZE_BUTTON);
+     gtk_widget_show(image);
+     gtk_button_set_always_show_image(GTK_BUTTON(button0), TRUE);
+     gtk_button_set_image(GTK_BUTTON(button0), image);
+@@ -1220,7 +1220,7 @@
+     // Add [Reload] button
+     button0 = gtk_button_new();
+     gtk_widget_show(button0);
+-    image = gtk_image_new_from_icon_name("gtk-refresh", GTK_ICON_SIZE_BUTTON);
++    image = gtk_image_new_from_icon_name("view-refresh", GTK_ICON_SIZE_BUTTON);
+     gtk_widget_show(image);
+     gtk_button_set_always_show_image(GTK_BUTTON(button0), TRUE);
+ 
+@@ -1297,7 +1297,7 @@
+     gtk_widget_show(hbox4);
+     gtk_box_pack_start(GTK_BOX(vbox0), hbox4, FALSE, TRUE, 0);
+ 
+-    button0 = gtk_button_new_from_icon_name("gtk-close", GTK_ICON_SIZE_BUTTON);
++    button0 = gtk_button_new_from_icon_name("window-close", GTK_ICON_SIZE_BUTTON);
+     gtk_button_set_always_show_image(GTK_BUTTON(button0), TRUE);
+     gtk_widget_show(button0);
+     gtk_box_pack_end(GTK_BOX(hbox4), button0, FALSE, FALSE, 0);
+diff -ru audio-recorder/src/settings.c audio-recorder.new/src/settings.c
+--- audio-recorder/src/settings.c	2017-01-02 10:47:27.000000000 +0100
++++ audio-recorder.new/src/settings.c	2017-01-30 20:23:04.621314105 +0100
+@@ -659,7 +659,7 @@
+     gtk_entry_set_invisible_char(GTK_ENTRY(file_name_pattern), 9679);
+ 
+     button0 = gtk_button_new();
+-    GtkWidget *image = gtk_image_new_from_icon_name("gtk-info", GTK_ICON_SIZE_BUTTON);
++    GtkWidget *image = gtk_image_new_from_icon_name("dialog-information", GTK_ICON_SIZE_BUTTON);
+     gtk_button_set_always_show_image(GTK_BUTTON(button0), TRUE);
+     gtk_button_set_image(GTK_BUTTON(button0), image);
+     g_signal_connect(button0, "clicked", G_CALLBACK(win_settings_show_filename_help), NULL);

From 2d1d8394e05584dd534e6e3f84aa0f607e921645 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Mon, 6 Feb 2017 05:18:09 +0300
Subject: [PATCH 495/899] tarsnap: macOS

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

diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix
index 95823bedad6..0f95a26c940 100644
--- a/pkgs/tools/backup/tarsnap/default.nix
+++ b/pkgs/tools/backup/tarsnap/default.nix
@@ -29,13 +29,13 @@ stdenv.mkDerivation rec {
     install -m 444 -D ${zshCompletion} $out/share/zsh/site-functions/_tarsnap
   '';
 
-  buildInputs = [ openssl zlib e2fsprogs ];
+  buildInputs = [ openssl zlib ] ++ stdenv.lib.optional stdenv.isLinux e2fsprogs ;
 
   meta = {
     description = "Online backups for the truly paranoid";
     homepage    = "http://www.tarsnap.com/";
     license     = "tarsnap";
-    platforms   = stdenv.lib.platforms.linux;
+    platforms   = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ thoughtpolice roconnor ];
   };
 }

From 4a9efe9acf257c0dc577724c30281a2106eb88d5 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Fri, 3 Feb 2017 04:28:45 +0100
Subject: [PATCH 496/899] chromium: 56.0.2924.76 -> 56.0.2924.87

---
 .../networking/browsers/chromium/upstream-info.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index a7e9c0312da..899f66cb2b0 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -11,8 +11,8 @@
     version = "57.0.2987.19";
   };
   stable = {
-    sha256 = "0f1w9cba99s9hy6fdqkr39yhkay4kid72vdrgs4as5lwdci8xc6g";
-    sha256bin64 = "1zy11y649nxs03xldcq8jcpwj0nb3sklmyh3cxw7fajzi739p2y3";
-    version = "56.0.2924.76";
+    sha256 = "1q2kg85pd6lv036w7lsss5mhiiva9rx4f0410sbn9bnazhghib4s";
+    sha256bin64 = "1s64smkpjmnlw7ym14v3g3lcpagsgavmnlq6wkgci80kyvwasd3w";
+    version = "56.0.2924.87";
   };
 }

From 023c3c77ee0d043a1324039d23e42db66b4845a8 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sat, 4 Feb 2017 21:27:33 +0100
Subject: [PATCH 497/899] cdemu: bugfix updates

image-analyzer: 3.0.0 -> 3.0.1
cdemu-client: 3.0.1 -> 3.0.3
cdemu-daemon: 3.0.3 -> 3.0.5
gcdemu: 3.0.1 -> 3.0.2
libmirage: 3.0.4 -> 3.0.5
vhba: 20140928 -> 20161009
---
 pkgs/misc/emulators/cdemu/analyzer.nix  | 8 ++++----
 pkgs/misc/emulators/cdemu/client.nix    | 4 ++--
 pkgs/misc/emulators/cdemu/daemon.nix    | 4 ++--
 pkgs/misc/emulators/cdemu/gui.nix       | 4 ++--
 pkgs/misc/emulators/cdemu/libmirage.nix | 4 ++--
 pkgs/misc/emulators/cdemu/vhba.nix      | 4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix
index c9651fd0614..e39e5285039 100644
--- a/pkgs/misc/emulators/cdemu/analyzer.nix
+++ b/pkgs/misc/emulators/cdemu/analyzer.nix
@@ -1,12 +1,12 @@
-{ callPackage, gtk3, glib, libxml2, gnuplot, makeWrapper, stdenv, gnome3, gdk_pixbuf, librsvg }:
+{ callPackage, gtk3, glib, libxml2, gnuplot, makeWrapper, stdenv, gnome3, gdk_pixbuf, librsvg, intltool }:
 let pkg = import ./base.nix {
-  version = "3.0.0";
+  version = "3.0.1";
   pkgName = "image-analyzer";
-  pkgSha256 = "1rb3f7c08dxc02zrwrkfvq7qlzlmm0kd2ah1fhxj6ajiyshi8q4v";
+  pkgSha256 = "19x5hx991pl55ddm2wjd2ylm2hiz9yvzgrwmpnsqr9zqc4lja682";
 };
 in callPackage pkg {
   buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper
-                  gnome3.defaultIconTheme gdk_pixbuf librsvg ];
+                  gnome3.defaultIconTheme gdk_pixbuf librsvg intltool ];
   drvParams = {
     postFixup = ''
       wrapProgram $out/bin/image-analyzer \
diff --git a/pkgs/misc/emulators/cdemu/client.nix b/pkgs/misc/emulators/cdemu/client.nix
index 1cea479fb7b..3a5850e10e9 100644
--- a/pkgs/misc/emulators/cdemu/client.nix
+++ b/pkgs/misc/emulators/cdemu/client.nix
@@ -1,8 +1,8 @@
 { callPackage, pythonPackages, intltool, makeWrapper }:
 let pkg = import ./base.nix {
-  version = "3.0.1";
+  version = "3.0.3";
   pkgName = "cdemu-client";
-  pkgSha256 = "1kg5m7npdxli93vihhp033hgkvikw5b6fm0qwgvlvdjby7njyyyg";
+  pkgSha256 = "1bfj7bc10z20isdg0h8sfdvnwbn6c49494mrmq6jwrfbqvby25x9";
 };
 in callPackage pkg {
   buildInputs = [ pythonPackages.python pythonPackages.dbus-python intltool makeWrapper ];
diff --git a/pkgs/misc/emulators/cdemu/daemon.nix b/pkgs/misc/emulators/cdemu/daemon.nix
index 47a967fb52e..ef58ff7f58f 100644
--- a/pkgs/misc/emulators/cdemu/daemon.nix
+++ b/pkgs/misc/emulators/cdemu/daemon.nix
@@ -1,8 +1,8 @@
 { callPackage, glib, libao }:
 let pkg = import ./base.nix {
-  version = "3.0.3";
+  version = "3.0.5";
   pkgName = "cdemu-daemon";
-  pkgSha256 = "00gi3x03l019nyqfxkph1rsldd7fwg0r0x95spwv5py5wyiqvp3m";
+  pkgSha256 = "1cc0yxf1y5dxinv7md1cqhdjsbqb69v9jygrdq5c20mrkqaajz1i";
 };
 in callPackage pkg {
   buildInputs = [ glib libao (callPackage ./libmirage.nix {}) ];
diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix
index 04930a5e573..835a690eb69 100644
--- a/pkgs/misc/emulators/cdemu/gui.nix
+++ b/pkgs/misc/emulators/cdemu/gui.nix
@@ -1,9 +1,9 @@
 { callPackage, pythonPackages, gtk3, glib, libnotify, intltool, makeWrapper, gobjectIntrospection, gnome3, gdk_pixbuf, librsvg }:
 let
   pkg = import ./base.nix {
-    version = "3.0.1";
+    version = "3.0.2";
     pkgName = "gcdemu";
-    pkgSha256 = "1dlng1bvhns7f0ff5p89npsm2nznfqnaspr0alfh4fl0f11cvnfr";
+    pkgSha256 = "1kmcr2a0inaddx8wrjh3l1v5ymgwv3r6nv2w05lia51r1yzvb44p";
   };
   inherit (pythonPackages) python pygobject3;
 in callPackage pkg {
diff --git a/pkgs/misc/emulators/cdemu/libmirage.nix b/pkgs/misc/emulators/cdemu/libmirage.nix
index 5e83ef7bbbf..c9ba589cf2a 100644
--- a/pkgs/misc/emulators/cdemu/libmirage.nix
+++ b/pkgs/misc/emulators/cdemu/libmirage.nix
@@ -1,8 +1,8 @@
 { callPackage, glib, libsndfile, zlib, bzip2, lzma, libsamplerate }:
 let pkg = import ./base.nix {
-  version = "3.0.4";
+  version = "3.0.5";
   pkgName = "libmirage";
-  pkgSha256 = "0grzdacl8hlj20amq88r98h8pd039ww0g4hl1a8lhly11h7kf1fc";
+  pkgSha256 = "01wfxlyviank7k3p27grl1r40rzm744rr80zr9lcjk3y8i5g8ni2";
 };
 in callPackage pkg {
   buildInputs = [ glib libsndfile zlib bzip2 lzma libsamplerate ];
diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix
index 3435efbae8b..c1692e1b9a8 100644
--- a/pkgs/misc/emulators/cdemu/vhba.nix
+++ b/pkgs/misc/emulators/cdemu/vhba.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "vhba-${version}";
-  version = "20140928";
+  version = "20161009";
 
   src  = fetchurl {
     url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.bz2";
-    sha256 = "18jmpg2kpx87f32b8aprr1pxla9dlhf901rkj1sp3ammf94nxxa5";
+    sha256 = "1n9k3z8hppnl5b5vrn41b69wqwdpml6pm0rgc8vq3jqwss5js1nd";
   };
 
   makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ];

From 8fe97df3d2446d24115c527ff058cab9a2369526 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Fri, 3 Feb 2017 10:55:24 +0800
Subject: [PATCH 498/899] terragrunt: 0.9.6 -> 0.9.9

---
 .../networking/cluster/terragrunt/default.nix |  6 +-
 .../networking/cluster/terragrunt/deps.nix    | 60 +++++++++++++++----
 2 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index 98e8beefd06..9325d074fea 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "terragrunt-${version}";
-  version = "0.9.6";
+  version = "0.9.9";
 
   goPackagePath = "github.com/gruntwork-io/terragrunt";
 
@@ -10,12 +10,12 @@ buildGoPackage rec {
     rev    = "v${version}";
     owner  = "gruntwork-io";
     repo   = "terragrunt";
-    sha256 = "0x4qpf4jqrm55rg5xifk6gz4gy42506k5g1l5461xln0rsmifpkf";
+    sha256 = "08rygmcjlcdj4g575cpx2lfdq69r450ri5q2dngvnhbvzk8nvnr0";
   };
 
   goDeps = ./deps.nix;
 
-  buildInputs = [ makeWrapper terraform ];
+  buildInputs = [ makeWrapper ];
 
   postInstall = ''
     wrapProgram $bin/bin/terragrunt \
diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix
index d903863118c..573f5acbd6e 100644
--- a/pkgs/applications/networking/cluster/terragrunt/deps.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix
@@ -5,8 +5,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/aws/aws-sdk-go";
-      rev = "5e1afe1c0a077fb2da9b5f74232b790d99397ce8";
-      sha256 = "073yx5acqybw0h2zshg209wmldm0g5h5x9bhbn6h08ak0r4i80al";
+      rev = "4590e9b51cd6698144a025a75608fa7a90752d5d";
+      sha256 = "13hczsimaanfmbhj8aki8zib7fi161f7p7cjm7z9x8hwwa9q4nld";
+    };
+  }
+  {
+    goPackagePath = "github.com/bgentry/go-netrc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bgentry/go-netrc";
+      rev = "9fd32a8b3d3d3f9d43c341bfe098430e07609480";
+      sha256 = "0dn2h8avgavqdzdqnph8bkhj35bx0wssczry1zdczr22xv650g1l";
     };
   }
   {
@@ -18,13 +27,31 @@
       sha256 = "02mvb2clbmfcqb4yclv5zhs4clkk9jxi2hiawsynl5fwmgn0d3xa";
     };
   }
+  {
+    goPackagePath = "github.com/hashicorp/go-getter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-getter";
+      rev = "cc80f38c726badeae53775d179755e1c4953d6cf";
+      sha256 = "1xbflbgg3gfh3zy5ibfzxv4gbzg62rkzr4l2i9igvz8m7sxgyy1f";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/go-version";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-version";
+      rev = "03c5bf6be031b6dd45afec16b1cf94fc8938bc77";
+      sha256 = "0sjq57gpfznaqdrbyb2p0bn90g9h661cvr0jrk6ngags4pbw14ik";
+    };
+  }
   {
     goPackagePath = "github.com/hashicorp/hcl";
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/hcl";
-      rev = "eb6f65b2d77ed5078887f960ff570fbddbbeb49d";
-      sha256 = "1wx6hpxmq5sby54025j9hliz10gv5v0bq6q1z2cd0asznj154ij1";
+      rev = "372e8ddaa16fd67e371e9323807d056b799360af";
+      sha256 = "1hv8p1858k1b99p3yc2jj6h77bl0iv9ziyzyp4w3xlcci2s13hnr";
     };
   }
   {
@@ -32,8 +59,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/mattn/go-zglob";
-      rev = "1783ae1a9f7ff3a79240e8c249d8b575d70a6528";
-      sha256 = "0g4ih6swqpq0bqwsv5mv8ymicgr92xh9i6sm1793lqwb63x8ga1x";
+      rev = "95345c4e1c0ebc9d16a3284177f09360f4d20fab";
+      sha256 = "012hrd67v4gp3b621rykg2kp6a7iq4dr585qavragbif0z1whckx";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/go-homedir";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/go-homedir";
+      rev = "b8bc1bf767474819792c23f32d8286a45736f1c6";
+      sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
     };
   }
   {
@@ -41,8 +77,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mitchellh/mapstructure";
-      rev = "bfdb1a85537d60bc7e954e600c250219ea497417";
-      sha256 = "141kkh801jyp1r6hba14krydqg1iivp13j12is70j0g05z9fbji8";
+      rev = "db1efb556f84b25a0a13a04aad883943538ad2e0";
+      sha256 = "1pl1rwc9q3kz0banwi493cyhmn5mlc4mb97sx68jkdz6pck7fy0h";
     };
   }
   {
@@ -50,8 +86,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/stretchr/testify";
-      rev = "2402e8e7a02fc811447d11f881aa9746cdc57983";
-      sha256 = "01qaz781cvrv3h1428xqq8knf5ahdcj93m5k9dnivg2hcrlnqibj";
+      rev = "4d4bfba8f1d1027c4fdbe371823030df51419987";
+      sha256 = "1d3yz1d2s88byjzmn60jbi1m9s552f7ghzbzik97fbph37i8yjhp";
     };
   }
   {
@@ -59,8 +95,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/urfave/cli";
-      rev = "8ef3805c9de2519805c3f060524b695bba2cd715";
-      sha256 = "0680rd87skmz8p8s3cwy55siz4bgjls314agfi03d7640gz7mp24";
+      rev = "347a9884a87374d000eec7e6445a34487c1f4a2b";
+      sha256 = "0wii48b2g5dyp6bknnlgs3ln93qxz5jvi96420wnpkkz51nrcmbp";
     };
   }
 ]

From bc6b91710033bfcda7f98d9baf4118db938fd2d7 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Mon, 6 Feb 2017 14:32:36 +0800
Subject: [PATCH 499/899] emacs: make gtk3 default

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

diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index aacc3f9e792..d5ca5e39442 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -3,8 +3,8 @@
 , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
 , alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO
 , withX ? !stdenv.isDarwin
-, withGTK2 ? true, gtk2 ? null
-, withGTK3 ? false, gtk3 ? null
+, withGTK2 ? false, gtk2 ? null
+, withGTK3 ? true, gtk3 ? null
 , withXwidgets ? false, webkitgtk24x ? null, wrapGAppsHook ? null, glib_networking ? null
 , withCsrc ? true
 , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null

From d77d31b3126b87360b9214fbcf2de4f94f971368 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Mon, 6 Feb 2017 08:29:49 +0100
Subject: [PATCH 500/899] vscode: fix download url

Fixes #22465.
---
 pkgs/applications/editors/vscode/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index f0f44bfe62f..d1794363975 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -3,9 +3,12 @@
 
 let
   version = "1.9.0";
-  rev = "38746938a4ab94f2f57d9e1309c51fd6fb37553d";
+  rev = "27240e71ef390bf2d66307e677c2a333cebf75af";
   channel = "stable";
 
+  # The revision can be obtained with the following command (see https://github.com/NixOS/nixpkgs/issues/22465):
+  # curl -w "%{url_effective}\n" -I -L -s -S https://vscode-update.azurewebsites.net/latest/linux-x64/stable -o /dev/null
+
   sha256 = if stdenv.system == "i686-linux"    then "05f1sk2lq2skp8fxq6q229kf89vi2sq3zz6lywq7nk81pwvp8jap"
       else if stdenv.system == "x86_64-linux"  then "0wj17lwq8f88xvfa6wfbqm580kp0470ib2yxn15j9mv0iw7nzqry"
       else if stdenv.system == "x86_64-darwin" then "1k067h099j6fv820nn6h4i8ax35yvd1h8f4h5216dm66cpikv7nd"

From 67ccc41a67e0668aceb926d68e8df7dde2b66a90 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <hhochleitner@gmail.com>
Date: Mon, 6 Feb 2017 08:44:20 +0100
Subject: [PATCH 501/899] leiningen: 2.6.1 -> 2.7.1 (#22485)

---
 pkgs/development/tools/build-managers/leiningen/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
index 39a39f949a5..1e5fb8458e5 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -3,18 +3,18 @@
 
 stdenv.mkDerivation rec {
   pname = "leiningen";
-  version = "2.6.1";
+  version = "2.7.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
-    sha256 = "1ndirl36gbba12cs5vw22k2zrbpqdmnpi1gciwqb1zbib2s1akg8";
+    sha256 = "0rmshl4xchf3blwvar4q9dpxm9xznn3yzas4vwxqiq3yhapgqkn0";
   };
 
   jarsrc = fetchurl {
     # NOTE: This is actually a .jar, Github has issues
     url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.zip";
-    sha256 = "1533msarx6gb3xc2sp2nmspllnqy7anpnv9a0ifl0psxm3xph06p";
+    sha256 = "0ivwb1qlxs1hyical0fjgavm9wfkw3f10sk67p5g2p5lpf4pxp1d";
   };
 
   JARNAME = "${name}-standalone.jar";

From 4b5a230d1db8cd2f0f7bc75de5f0478874ccc5a6 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Mon, 6 Feb 2017 09:10:05 +0100
Subject: [PATCH 502/899] Add documentation for XFCE

---
 nixos/doc/manual/configuration/xfce.xml | 49 +++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 nixos/doc/manual/configuration/xfce.xml

diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml
new file mode 100644
index 00000000000..12eb30db21e
--- /dev/null
+++ b/nixos/doc/manual/configuration/xfce.xml
@@ -0,0 +1,49 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-x11">
+
+    <title>XFCE Desktop Environment</title>
+
+    <para>
+        To enable the XFCE Desktop Environment, set
+        <programlisting>
+            services.xserver.desktopManager = {
+                xfce.enable = true;
+                default = "xfce";
+            };
+        </programlisting>
+    </para>
+
+    <para>
+        Optionally, <emphasis>compton</emphasis>
+        can be enabled for nice graphical effects, some example settings:
+        <programlisting>
+            services.compton = {
+              enable          = true;
+              fade            = true;
+              inactiveOpacity = "0.9";
+              shadow          = true;
+              fadeDelta       = 4;
+            };
+        </programlisting>
+    </para>
+
+    <para>
+        XFCE programs are not installed automatically.
+        To install them manually (system wide), put them into your
+        <literal>environment.systemPackages</literal>-
+    <para>
+
+    <para>
+        NixOS’s default <emphasis>display manager</emphasis> (the
+        program that provides a graphical login prompt and manages the X
+        server) is SLiM. You can, for example, select KDE’s
+        <command>kdm</command> instead:
+        <programlisting>
+            services.xserver.displayManager.kdm.enable = true;
+        </programlisting>
+    </para>
+
+</chapter>

From bf56d17b2c4beee6e1756d2c8113fd7907b6a23d Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Mon, 6 Feb 2017 09:17:52 +0100
Subject: [PATCH 503/899] fixup! Add documentation for XFCE

---
 nixos/doc/manual/configuration/xfce.xml | 57 ++++++++++++++++++++++++-
 1 file changed, 56 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml
index 12eb30db21e..d406616bae0 100644
--- a/nixos/doc/manual/configuration/xfce.xml
+++ b/nixos/doc/manual/configuration/xfce.xml
@@ -2,7 +2,7 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
-         xml:id="sec-x11">
+         xml:id="sec-xfce">
 
     <title>XFCE Desktop Environment</title>
 
@@ -46,4 +46,59 @@
         </programlisting>
     </para>
 
+    <simplesect>
+        <title>Thunar Volume Support</title>
+
+        <para>
+            To enable
+            <emphasis>Thunar</emphasis>
+            volume support, put
+            <programlisting>
+                services.xserver.desktopManager.xfce.enable = true;
+            </programlisting>
+            into your <emphasis>configuration.nix</emphasis>.
+        </para>
+
+    </simplesect>
+
+    <simplesect>
+        <title>Polkit Authentication Agent</title>
+
+        <para>
+            There is no authentication agent automatically installed alongside
+            XFCE. To allow mounting of local (non-removable) filesystems, you
+            will need to install one.
+
+            Installing <emphasis>polkit_gnome</emphasis>, a rebuild, logout and
+            login did the trick.
+        </para>
+
+    </simplesect>
+
+    <simplesect>
+        <title>Troubleshooting</title>
+
+        <para>
+            Even after enabling udisks2, volume management might not work.
+            Thunar and/or the desktop takes time to show up.
+
+            Thunar will spit out this kind of message on start
+            (look at journalctl --user -b).
+
+            <programlisting>
+                Thunar:2410): GVFS-RemoteVolumeMonitor-WARNING **: remote volume monitor with dbus name org.gtk.Private.UDisks2VolumeMonitor is not supported
+            </programlisting>
+
+            This is caused by some needed GNOME services not running.
+            This is all fixed by enabling "Launch GNOME services on startup" in
+            the Advanced tab of the Session and Startup settings panel.
+            Alternatively, you can run this command to do the same thing.
+            <programlisting>
+                $ xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true
+            </programlisting>
+            A log-out and re-log will be needed for this to take effect.
+        </para>
+
+    </simplesect>
+
 </chapter>

From b27edc45374309fb30b6b7454b4115e4923b17bf Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Mon, 6 Feb 2017 02:43:58 -0500
Subject: [PATCH 504/899] ycmd: 2016-01-12 -> 2017-02-03

Also, remove wrapper bash script and symlink completion backends to
ycmd can find them.
---
 pkgs/development/tools/misc/ycmd/default.nix | 63 +++++++++++++++++---
 1 file changed, 55 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index 57b4fe99b2f..2153305953e 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -1,21 +1,26 @@
-{ stdenv, fetchgit, cmake, llvmPackages, boost, python2Packages
+{ stdenv, lib, fetchgit, cmake, llvmPackages, boost, python2Packages
+, gocode ? null
+, godef ? null
+, rustracerd ? null
 }:
 
 let
-  inherit (python2Packages) python mkPythonDerivation waitress frozendict bottle;
+  inherit (python2Packages) python mkPythonDerivation waitress frozendict bottle future argparse requests;
+  pathFixup =  "import os; os.environ['PATH'] = ('{0}:{1}' if os.getenv('PATH', '') != '' else '{1}').format('$program_PATH', os.getenv('PATH', ''))";
 in mkPythonDerivation rec {
-  name = "ycmd-2016-01-12";
+  name = "ycmd-${version}";
+  version = "2017-02-03";
   namePrefix = "";
 
   src = fetchgit {
     url = "git://github.com/Valloric/ycmd.git";
-    rev = "f982f6251c5ff85e3abe6e862aad8bcd19e85ece";
-    sha256 = "1g0hivv3wla7z5dgnkcn3ny38p089pjfj36nx6k29zmprgmjinyr";
+    rev = "ec7a154f8fe50c071ecd0ac6841de8a50ce92f5d";
+    sha256 = "0rzxgqqqmmrv9r4k2ji074iprhw6sb0jkvh84wvi45yfyphsh0xi";
   };
 
   buildInputs = [ cmake boost ];
 
-  propagatedBuildInputs = [ waitress frozendict bottle ];
+  propagatedBuildInputs = [ waitress frozendict bottle future argparse requests ];
 
   buildPhase = ''
     export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped}
@@ -24,10 +29,52 @@ in mkPythonDerivation rec {
 
   configurePhase = ":";
 
+  # remove the tests
+  #
+  # make __main__.py executable so mkPythonDerivation's postFixup modifies the
+  # executable (e.g. fixup PYTHONPATH)
+  #
+  # add a shebang (will be rewritten by postFixup)
+  #
+  # symlink completion backends where ycmd expects them
   installPhase = ''
-    mkdir -p $out/lib/ycmd/third_party $out/bin
-    cp -r ycmd/ CORE_VERSION libclang.so.* ycm_client_support.so ycm_core.so $out/lib/ycmd/
+    rm -rf ycmd/tests
+
+    chmod +x ycmd/__main__.py
+    sed -i "1i #!/usr/bin/env python\
+    " ycmd/__main__.py
+
+    mkdir -p $out/lib/ycmd
+    cp -r ycmd/ CORE_VERSION libclang.so.* ycm_core.so $out/lib/ycmd/
+
+    mkdir -p $out/bin
     ln -s $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd
+
+    mkdir -p $out/lib/ycmd/third_party/{gocode,godef,racerd/target/release}
+    cp -r third_party/JediHTTP/ $out/lib/ycmd/third_party
+  '' + lib.optionalString (gocode != null) ''
+    ln -s ${gocode}/bin/gocode $out/lib/ycmd/third_party/gocode
+  '' + lib.optionalString (godef != null) ''
+    ln -s ${godef}/bin/godef $out/lib/ycmd/third_party/godef
+  '' + lib.optionalString (rustracerd != null) ''
+    ln -s ${rustracerd}/bin/racerd $out/lib/ycmd/third_party/racerd/target/release
+  '';
+
+  # mkPythonDerivation will attempt to create a wrapper script (written in bash)
+  # but we don't want the indirection as several editor plugins want to invoke
+  # ycmd as `python path/to/ycmd`, which will obviously fail in that case -
+  # so we move the original file back over
+  #
+  # also fixup the argv[0] and replace __file__ with the corresponding path so
+  # python won't be thrown off by argv[0]
+  postFixup = ''
+    mv $out/lib/ycmd/ycmd/{.__main__.py-wrapped,__main__.py}
+
+    substituteInPlace $out/lib/ycmd/ycmd/__main__.py \
+      --replace $out/lib/ycmd/ycmd/__main__.py \
+                $out/bin/ycmd \
+      --replace __file__ \
+                "'$out/lib/ycmd/ycmd/__main__.py'"
   '';
 
   meta = with stdenv.lib; {

From 1ea0514a2dce5f9cb34e5390205968103a83fa02 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Sat, 21 Jan 2017 16:01:08 +0100
Subject: [PATCH 505/899] shaarli-material: 0.8.2 -> 0.8.3

---
 pkgs/servers/web-apps/shaarli/material-theme.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/web-apps/shaarli/material-theme.nix b/pkgs/servers/web-apps/shaarli/material-theme.nix
index 59d16ac0e0f..369fecda47a 100644
--- a/pkgs/servers/web-apps/shaarli/material-theme.nix
+++ b/pkgs/servers/web-apps/shaarli/material-theme.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "shaarli-material-${version}";
-  version = "0.8.2";
+  version = "0.8.3";
 
   src = fetchFromGitHub {
     owner = "kalvn";
     repo = "Shaarli-Material";
     rev = "v${version}";
-    sha256 = "1gam080iwr8vd6k6liv0zmpb3zyw37a53nj1s4ywb4d2i68hjncd";
+    sha256 = "0ivq35183r5vyzvf47sgxwdxllmvhd5w9w75xgyp3kbw2na4yrmr";
   };
 
   patchPhase = ''
@@ -19,9 +19,6 @@ stdenv.mkDerivation rec {
         --replace '.min.js"'  '.min.js#"' \
         --replace '.png"'     '.png#"'
     done
-
-    substituteInPlace material/loginform.html \
-        --replace '"ban_canLogin()"' '"ban_canLogin($conf)"' # PHP 7.1 fix (https://github.com/shaarli/Shaarli/issues/711)
   '';
 
   installPhase = ''

From f629f4e234a07d86ba8ca01fc7c9fc1e75b179b4 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 6 Feb 2017 12:59:28 +0100
Subject: [PATCH 506/899] libpsl: 0.15.0 -> 0.17.0

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

diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index be77b383cd9..a2a19d6217e 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -3,22 +3,22 @@
 
 let
 
-  listVersion = "2016-06-30";
+  listVersion = "2017-02-03";
   listSources = fetchFromGitHub {
-    sha256 = "1fx7g36dcckckz860f0ady8lsg3m6a5c9pgb39a3dn28xfvd21jw";
-    rev = "aa87d27940595ed4a61e726c7dd06860d87fabb6";
+    sha256 = "0fhc86pjv50hxj3xf9r4mh0zzvdzqp5lac20caaxq1hlvdzavaa3";
+    rev = "37e30d13801eaad3383b122c11d8091c7ac21040";
     repo = "list";
     owner = "publicsuffix";
   };
 
-  libVersion = "0.15.0";
+  libVersion = "0.17.0";
 
 in stdenv.mkDerivation rec {
   name = "libpsl-${version}";
   version = "${libVersion}-list-${listVersion}";
 
   src = fetchFromGitHub {
-    sha256 = "1n8vg8pslpgin84ygb0s0nqfljml32l5bv5fyc8ysnpbdsj6gxkb";
+    sha256 = "08dbl6ihnlf0kj4c9pdpjv9mmw7p676pzh1q184wl32csra5pzdd";
     rev = "libpsl-${libVersion}";
     repo = "libpsl";
     owner = "rockdaboot";

From 8b9e2010b416083ad61e33117582f1733fafd883 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 6 Feb 2017 13:01:55 +0100
Subject: [PATCH 507/899] libidn2: init at 0.16

wget now needs libidn2 instead of libidn.

cc #22416
---
 .../development/libraries/libidn2/default.nix | 34 +++++++++++++++++++
 pkgs/tools/networking/wget/default.nix        |  4 +--
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/libidn2/default.nix

diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix
new file mode 100644
index 00000000000..083b04d4b09
--- /dev/null
+++ b/pkgs/development/libraries/libidn2/default.nix
@@ -0,0 +1,34 @@
+{ fetchurl, stdenv, libiconv, libunistring }:
+
+stdenv.mkDerivation rec {
+  name = "libidn2-0.16";
+
+  src = fetchurl {
+    url = "https://alpha.gnu.org/gnu/libidn/${name}.tar.gz";
+    sha256 = "13v8kh4d5nfkymai88zlw3h7k4x9khrpdpv97waf4ah8ykzrxb9g";
+  };
+
+  outputs = [ "bin" "dev" "out" "info" "devdoc" ];
+
+  buildInputs = [ libunistring ]
+    ++ stdenv.lib.optional stdenv.isDarwin libiconv;
+
+  meta = {
+    homepage = "https://www.gnu.org/software/libidn/#libidn2";
+    description = "Free software implementation of IDNA2008 and TR46";
+
+    longDescription = ''
+      Libidn2 is believed to be a complete IDNA2008 and TR46 implementation,
+      but has yet to be as extensively used as the IDNA2003 Libidn library.
+
+      The installed C library libidn2 is dual-licensed under LGPLv3+|GPLv2+,
+      while the rest of the package is GPLv3+.  See the file COPYING for
+      detailed information.
+    '';
+
+    repositories.git = https://gitlab.com/jas/libidn2;
+    license = with stdenv.lib.licenses; [ lgpl3Plus gpl2Plus gpl3Plus ];
+    platforms = stdenv.lib.platforms.all;
+    maintainers = with stdenv.lib.maintainers; [ fpletz ];
+  };
+}
diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index 7362403d060..105f0692a4d 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gettext, libidn, pkgconfig
+{ stdenv, fetchurl, gettext, libidn2, pkgconfig
 , perl, perlPackages, LWP, python3
 , libiconv, libpsl ? null, openssl ? null }:
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ gettext pkgconfig perl ];
-  buildInputs = [ libidn libiconv libpsl ]
+  buildInputs = [ libidn2 libiconv libpsl ]
     ++ stdenv.lib.optionals doCheck [ perlPackages.IOSocketSSL LWP python3 ]
     ++ stdenv.lib.optional (openssl != null) openssl
     ++ stdenv.lib.optional stdenv.isDarwin perl;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f638c0801f7..d07ca51bb9e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8295,6 +8295,8 @@ with pkgs;
 
   libidn = callPackage ../development/libraries/libidn { };
 
+  libidn2 = callPackage ../development/libraries/libidn2 { };
+
   idnkit = callPackage ../development/libraries/idnkit { };
 
   libiec61883 = callPackage ../development/libraries/libiec61883 { };

From 900326fdc0d3a6e5ed9feb8a07b508423f2a9905 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 6 Feb 2017 13:16:44 +0100
Subject: [PATCH 508/899] wget: add some more dependencies & small cleanups

cc #22416
---
 pkgs/tools/networking/wget/default.nix | 13 ++++++++-----
 pkgs/top-level/all-packages.nix        |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index 105f0692a4d..60edc1ad16f 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -1,6 +1,8 @@
-{ stdenv, fetchurl, gettext, libidn2, pkgconfig
-, perl, perlPackages, LWP, python3
-, libiconv, libpsl ? null, openssl ? null }:
+{ stdenv, fetchurl, gettext, pkgconfig, perl
+, libidn2, zlib, pcre, libuuid, libiconv
+, IOSocketSSL, LWP, python3
+, libpsl ? null
+, openssl ? null }:
 
 stdenv.mkDerivation rec {
   name = "wget-1.19";
@@ -26,9 +28,10 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ gettext pkgconfig perl ];
-  buildInputs = [ libidn2 libiconv libpsl ]
-    ++ stdenv.lib.optionals doCheck [ perlPackages.IOSocketSSL LWP python3 ]
+  buildInputs = [ libidn2 libiconv zlib pcre libuuid ]
+    ++ stdenv.lib.optionals doCheck [ IOSocketSSL LWP python3 ]
     ++ stdenv.lib.optional (openssl != null) openssl
+    ++ stdenv.lib.optional (libpsl != null) libpsl
     ++ stdenv.lib.optional stdenv.isDarwin perl;
 
   configureFlags =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d07ca51bb9e..ce48c8985a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4428,7 +4428,7 @@ with pkgs;
   weighttp = callPackage ../tools/networking/weighttp { };
 
   wget = callPackage ../tools/networking/wget {
-    inherit (perlPackages) LWP;
+    inherit (perlPackages) IOSocketSSL LWP;
     libpsl = null;
   };
 

From 2c963952728e123d8f9d8fb62fad16ed748e1c0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Mon, 6 Feb 2017 13:18:26 +0100
Subject: [PATCH 509/899] android-udev-rules: 20170125 -> 20170202

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

diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix
index dd2ee89829c..51c5e3b7565 100644
--- a/pkgs/os-specific/linux/android-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/android-udev-rules/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "android-udev-rules-${version}";
-  version = "20170125";
+  version = "20170202";
 
   src = fetchFromGitHub {
     owner = "M0Rf30";
     repo = "android-udev-rules";
     rev = version;
-    sha256 = "16m7w6f9rlsb2l8hwh8rf9i6x7zm2awdagg9fqlla7arhx8rnh0q";
+    sha256 = "0apl22i27kgwld670wrlf5lv6iknx57grjbw0x0h4q0il2k4nmn7";
   };
 
   installPhase = ''

From 1afab98842dffa30436bbf04c1c6abcee31e38e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Mon, 6 Feb 2017 14:07:22 +0100
Subject: [PATCH 510/899] telegraf: 1.2.0 -> 1.2.1

---
 pkgs/servers/monitoring/telegraf/default.nix                  | 4 ++--
 .../monitoring/telegraf/{deps-1.2.0.nix => deps-1.2.1.nix}    | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/servers/monitoring/telegraf/{deps-1.2.0.nix => deps-1.2.1.nix} (100%)

diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix
index a3c0e3c9226..1412f76c25a 100644
--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/pkgs/servers/monitoring/telegraf/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "telegraf-${version}";
-  version = "1.2.0";
+  version = "1.2.1";
 
   goPackagePath = "github.com/influxdata/telegraf";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "influxdata";
     repo = "telegraf";
     rev = "${version}";
-    sha256 = "0kijg3j2jnz7jfybycv2scvpsfmxg83jh8wl95p2bw322ypqlks1";
+    sha256 = "0vfx87a9shhwyqrbdf1jc32jkg0ych8bd0p222v2rcd83l75r0kh";
   };
 
   goDeps = ./. + builtins.toPath "/deps-${version}.nix";
diff --git a/pkgs/servers/monitoring/telegraf/deps-1.2.0.nix b/pkgs/servers/monitoring/telegraf/deps-1.2.1.nix
similarity index 100%
rename from pkgs/servers/monitoring/telegraf/deps-1.2.0.nix
rename to pkgs/servers/monitoring/telegraf/deps-1.2.1.nix

From f22a7f0558434421448ea8e4a389a1a86c97538f Mon Sep 17 00:00:00 2001
From: Pradeep Chhetri <pradeep.chhetri89@gmail.com>
Date: Mon, 6 Feb 2017 19:28:40 +0530
Subject: [PATCH 511/899] wuzz: init at 2017-02-05

---
 pkgs/tools/networking/wuzz/default.nix | 24 +++++++++++++++++++++
 pkgs/tools/networking/wuzz/deps.nix    | 29 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 3 files changed, 55 insertions(+)
 create mode 100644 pkgs/tools/networking/wuzz/default.nix
 create mode 100644 pkgs/tools/networking/wuzz/deps.nix

diff --git a/pkgs/tools/networking/wuzz/default.nix b/pkgs/tools/networking/wuzz/default.nix
new file mode 100644
index 00000000000..7a6e72e0f12
--- /dev/null
+++ b/pkgs/tools/networking/wuzz/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "wuzz-${version}";
+  version = "2017-02-05";
+
+  goPackagePath = "https://github.com/asciimoo/wuzz";
+
+  src = fetchFromGitHub {
+    owner = "asciimoo";
+    repo = "wuzz";
+    rev = "45b6a64e667b3647216af68e06e253958b81b3c4";
+    sha256 = "0jjdyqh1jvfg1dg5fwwavcvkn8fkm1a44gyv35c1g5cd9gxwj8nw";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/asciimoo/wuzz;
+    description = "Interactive cli tool for HTTP inspection";
+    license = licenses.agpl3;
+    maintainers = with maintainers; [ pradeepchhetri ];
+  };
+}
diff --git a/pkgs/tools/networking/wuzz/deps.nix b/pkgs/tools/networking/wuzz/deps.nix
new file mode 100644
index 00000000000..1025793cc98
--- /dev/null
+++ b/pkgs/tools/networking/wuzz/deps.nix
@@ -0,0 +1,29 @@
+[
+  {
+    goPackagePath = "github.com/jroimartin/gocui";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jroimartin/gocui";
+      rev = "7ac95c981b8a07b624ab197b3ad5813fdfbe4864";
+      sha256 = "1xr752gpjv32mnzzy5v367maczl7sn8frn258wqrs6gqf07sdmjp";
+    };
+  }
+  {
+    goPackagePath = "github.com/nsf/termbox-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nsf/termbox-go";
+      rev = "abe82ce5fb7a42fbd6784a5ceb71aff977e09ed8";
+      sha256 = "156i8apkga8b3272kjhapyqwspgcfkrr9kpqwc5lii43k4swghpv";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-runewidth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-runewidth";
+      rev = "14207d285c6c197daabb5c9793d63e7af9ab2d50";
+      sha256 = "0y6yq9zd4kh7fimnc00r3h9pr2pwa5j85b3jcn5dyfamsnm2xdsv";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a28aa5ea90..960a7e2b449 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4448,6 +4448,8 @@ with pkgs;
 
   wrk = callPackage ../tools/networking/wrk { };
 
+  wuzz = callPackage ../tools/networking/wuzz { };
+
   wv = callPackage ../tools/misc/wv { };
 
   wv2 = callPackage ../tools/misc/wv2 { };

From 01cf43a3899443736b9f35ed7d45f781d2b58e4f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 6 Feb 2017 14:57:04 +0100
Subject: [PATCH 512/899] firmwareLinuxNonfree: 2016-07-12 -> 2017-02-06

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

diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index 8e0f807e08e..dcc52de7fe7 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "firmware-linux-nonfree-${version}";
-  version = "2016-07-12";
+  version = "2017-02-06";
 
   # This repo is built by merging the latest versions of
   # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
@@ -12,10 +12,10 @@ stdenv.mkDerivation rec {
   # the usual set of firmware. firmware/linux-firmware usually lags kernel releases
   # so iwlwifi cards will fail to load on newly released kernels.
   src = fetchFromGitHub {
-    owner = "wkennington";
+    owner = "fpletz";
     repo = "linux-firmware";
-    rev = "cccb6a0da98372bd66787710249727ad6b0aaf72";
-    sha256 = "1c7h8i37nbyy37zqhybxd3y6aqabfv4nrdkjg789w67mdnn6hka0";
+    rev = version;
+    sha256 = "1r5ph97rqp8asw8kx65izb3p934669n2na20yfwplbsk76c9i82v";
   };
 
   preInstall = ''

From a6b080e3f8b7522e3f1a345e8c3ee087692a53ff Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 6 Feb 2017 15:13:19 +0100
Subject: [PATCH 513/899] youtubeDL: 2017.02.01 -> 2017.02.04.1

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index c6da169a583..efc73e5aa4f 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -15,11 +15,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2017.02.01";
+  version = "2017.02.04.1";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "1jkra0kgqg9ks76hwfcfsdaiknr9w8vavja0rc81ia644085axzz";
+    sha256 = "1aqca4mxgdjiv1qfnzqxx6lpwggfxsaahvvs235pyz0j3kywa4nj";
   };
 
   buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;

From 0d422c5db5aba204b6886fe199eda1834bbc97a1 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 6 Feb 2017 15:47:20 +0100
Subject: [PATCH 514/899] grsecurity: 4.8.17-201701151620 -> 4.9.8-201702060653

The first release in the 4.9 branch.

I've also migrated my update scripts to SHA-512 so that'll
be the hash of choice for grsec packages going forward.
---
 pkgs/os-specific/linux/kernel/linux-grsecurity.nix |  6 +++---
 pkgs/os-specific/linux/kernel/patches.nix          | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
index ebeb47397bc..5640aa80576 100644
--- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
+++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.8.17";
-  extraMeta.branch = "4.8";
+  version = "4.9.8";
+  extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1zk0q6bvqgz2pk1axd5z0cx71vqk96314f1zn8apwa4raylf9fpa";
+    sha512 = "39r4hq5f70nc1v8qq4qvnd0fq98h4akm6y6zp7ml6mi5knz7v6zm86ykq87a0ph3zh23msimi4155354qcsmsxp4cbd22cq8s1w86ds";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 4848057547e..d4c0b20e9b8 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -18,7 +18,7 @@ let
       };
     };
 
-  grsecPatch = { grbranch ? "test", grver ? "3.1", kver, grrev, sha256 }: rec {
+  grsecPatch = { grbranch ? "test", grver ? "3.1", kver, grrev, sha512 }: rec {
     name = "grsecurity-${grver}-${kver}-${grrev}";
 
     # Pass these along to allow the caller to determine compatibility
@@ -32,7 +32,7 @@ let
         # source files immediately upon releasing a new version ...
         "https://raw.githubusercontent.com/slashbeast/grsecurity-scrape/master/${grbranch}/${kver}/${name}.patch"
       ];
-      inherit sha256;
+      inherit sha512;
     };
 
     features.grsecurity = true;
@@ -95,9 +95,9 @@ rec {
   };
 
   grsecurity_testing = grsecPatch
-    { kver   = "4.8.17";
-      grrev  = "201701151620";
-      sha256 = "10gavcdby8aiylbx8afc1x4j0vzbb16bhlw39a7ibnav45scsr0p";
+    { kver   = "4.9.8";
+      grrev  = "201702060653";
+      sha512 = "1kammx0q0v37xw9z9zk7ppkixrwlr866dpfykjs4wy3ypcivnvkbk7dimyihna3vrylwgp5gq90ly7dj7d9gdblh83ccnq6n2m7ba43";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,

From 78c052e91a3dceb9e13b1593031b2a12746eafff Mon Sep 17 00:00:00 2001
From: Celine Mercier <celine.mercier@metabarcoding.org>
Date: Fri, 3 Feb 2017 16:10:28 +0100
Subject: [PATCH 515/899] ecopcr: init at 0.8.0

---
 lib/maintainers.nix                           |  1 +
 .../science/biology/ecopcr/default.nix        | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 40 insertions(+)
 create mode 100644 pkgs/applications/science/biology/ecopcr/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index c956d0a4a37..bf8eb6c4974 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -297,6 +297,7 @@
   mdaiter = "Matthew S. Daiter <mdaiter8121@gmail.com>";
   meditans = "Carlo Nucera <meditans@gmail.com>";
   meisternu = "Matt Miemiec <meister@krutt.org>";
+  metabar = "Celine Mercier <softs@metabarcoding.org>";
   mguentner = "Maximilian Güntner <code@klandest.in>";
   mic92 = "Jörg Thalheim <joerg@higgsboson.tk>";
   michaelpj = "Michael Peyton Jones <michaelpj@gmail.com>";
diff --git a/pkgs/applications/science/biology/ecopcr/default.nix b/pkgs/applications/science/biology/ecopcr/default.nix
new file mode 100644
index 00000000000..9e1b16ff944
--- /dev/null
+++ b/pkgs/applications/science/biology/ecopcr/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, gcc, zlib, python27 }:
+
+stdenv.mkDerivation rec {
+  name = "ecopcr-0.8.0";
+
+  src = fetchurl {
+    url = "https://git.metabarcoding.org/obitools/ecopcr/uploads/6f37991b325c8c171df7e79e6ae8d080/${name}.tar.gz";
+    sha256 = "10c58hj25z78jh0g3zcbx4890yd2qrvaaanyx8mn9p49mmyf5pk6";
+  };
+
+  sourceRoot = "ecoPCR/src";
+
+  buildInputs = [ gcc python27 zlib ];
+
+  installPhase = ''
+	mkdir -p $out/bin
+	cp -v ecoPCR $out/bin
+	cp -v ecogrep $out/bin
+	cp -v ecofind $out/bin
+	cp -v ../tools/ecoPCRFormat.py $out/bin/ecoPCRFormat
+	chmod a+x $out/bin/ecoPCRFormat
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Electronic PCR software tool";
+    longDescription = ''
+      ecoPCR is an electronic PCR software developed by the LECA. It
+      helps you estimate Barcode primers quality. In conjunction with
+      OBITools, you can postprocess ecoPCR output to compute barcode
+      coverage and barcode specificity. New barcode primers can be
+      developed using the ecoPrimers software.
+    '';
+    homepage = https://git.metabarcoding.org/obitools/ecopcr/wikis/home;
+    license = licenses.cecill20;
+    maintainers = [ maintainers.metabar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 740f17c7426..6ea9f9e6774 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16835,6 +16835,8 @@ with pkgs;
 
   bcftools = callPackage ../applications/science/biology/bcftools { };
 
+  ecopcr = callPackage ../applications/science/biology/ecopcr { };
+
   emboss = callPackage ../applications/science/biology/emboss { };
 
   htslib = callPackage ../development/libraries/science/biology/htslib { };

From 82c1d98e94d8d3c7869f09c3e51e68b7c2661bc3 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 6 Feb 2017 19:05:55 +0000
Subject: [PATCH 516/899] asymptote: fix build on darwin

---
 pkgs/tools/graphics/asymptote/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index b090ceca02b..483c73d149b 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -2,6 +2,7 @@
   , freeglut, ghostscriptX, imagemagick, fftw 
   , boehmgc, mesa_glu, mesa_noglu, ncurses, readline, gsl, libsigsegv
   , python, zlib, perl, texLive, texinfo, xz
+, darwin
 }:
 
 let
@@ -20,6 +21,8 @@ let
    python zlib perl texLive texinfo xz ]
    ++ stdenv.lib.optionals stdenv.isLinux
      [ freeglut mesa_glu mesa_noglu mesa_noglu.osmesa ]
+   ++ stdenv.lib.optionals stdenv.isDarwin
+     (with darwin.apple_sdk.frameworks; [ OpenGL GLUT Cocoa ])
    ;
 in
 stdenv.mkDerivation {

From d3c7a94b77864949896dd1641200d185c83fd23c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 6 Feb 2017 20:09:45 +0100
Subject: [PATCH 517/899] openocd: 0.9.0 -> 0.10.0

Announcement:
http://openocd.org/2017/01/openocd-0-10-0-release-is-out/

The udev rules were renamed. Add code to automatically detect renames in
the future.
---
 pkgs/development/tools/misc/openocd/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix
index ea52fff64cc..3349213a741 100644
--- a/pkgs/development/tools/misc/openocd/default.nix
+++ b/pkgs/development/tools/misc/openocd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "openocd-${version}";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/openocd/openocd-${version}.tar.bz2";
-    sha256 = "0hzlnm19c4b35vsxs6ik94xbigv3ykdgr8gzrdir6sqmkan44w43";
+    sha256 = "1bhn2c85rdz4gf23358kg050xlzh7yxbbwmqp24c0akmh3bff4kk";
   };
 
   buildInputs = [ libftdi libusb1 pkgconfig hidapi ];
@@ -26,7 +26,12 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     mkdir -p "$out/etc/udev/rules.d"
-    ln -s "$out/share/openocd/contrib/99-openocd.rules" "$out/etc/udev/rules.d/99-openocd.rules"
+    rules="$out/share/openocd/contrib/60-openocd.rules"
+    if [ ! -f "$rules" ]; then
+        echo "$rules is missing, must update the Nix file."
+        exit 1
+    fi
+    ln -s "$rules" "$out/etc/udev/rules.d/"
   '';
 
   meta = with stdenv.lib; {

From 9ed8627a7615a268a57d5e738cd78246ca378769 Mon Sep 17 00:00:00 2001
From: Hannu Hartikainen <hannu.hartikainen@gmail.com>
Date: Mon, 6 Feb 2017 22:26:32 +0200
Subject: [PATCH 518/899] CONTRIBUTING.md: improve commit message guidelines

Add a brief request for expressing the motivation for a change. Change the example commit messages to match.

Resolves #19126.
---
 .github/CONTRIBUTING.md | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 8400aa5c684..14f60b936f8 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -14,14 +14,22 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license.
 
 * Format the commits in the following way:
 
-  `(pkg-name | service-name): (from -> to | init at version | refactor | etc)`
+  ```
+  (pkg-name | service-name): (from -> to | init at version | refactor | etc)
+  
+  (Motivation for change. Additional information.)
+  ```
 
   Examples:
 
   * nginx: init at 2.0.1
   * firefox: 3.0 -> 3.1.1
   * hydra service: add bazBaz option
+  
+    Dual baz behavior is needed to do foo.
   * nginx service: refactor config generation
+    
+    The old config generation system used impure shell scripts and could break in specific circumstances (see #1234).
 
 * `meta.description` should:
   * Be capitalized
@@ -30,6 +38,12 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license.
 
 See the nixpkgs manual for more details on how to [Submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes).
 
+## Writing good commit messages
+
+In addition to writing properly formatted commit messages, it's important to include relevant information so other developers can later understand *why* a change was made. While this information usually can be found by digging code, mailing list archives, pull request discussions or upstream changes, it may require a lot of work.
+
+For package version upgrades and such a one-line commit message is usually sufficient.
+
 ## Reviewing contributions
 
 See the nixpkgs manual for more details on how to [Review contributions](https://nixos.org/nixpkgs/manual/#sec-reviewing-contributions).

From ae2932249edc58b3a95e5614497b83d60becefc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Facundo=20Dom=C3=ADnguez?= <facundo.dominguez@tweag.io>
Date: Mon, 6 Feb 2017 17:18:15 -0300
Subject: [PATCH 519/899] spark: 1.6.0 -> 2.1.0

Tested in linux with:
nix-env -f . -i spark-1.6.0
nix-env -f . -i spark

cc @thoughtpolice @offlinehacker
---
 .../networking/cluster/spark/default.nix      | 26 +++++++++++++++----
 pkgs/top-level/all-packages.nix               |  4 ++-
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index b4c20e22680..bdcb0a84625 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -1,22 +1,38 @@
 { stdenv, fetchzip, makeWrapper, jre, pythonPackages
 , mesosSupport ? true, mesos
+, version
 }:
 
+let
+  versionMap = {
+    "1.6.0" = {
+                hadoopVersion = "cdh4";
+                sparkSha256 = "19ycx1r8g82vkvzmn9wxkssmv2damrg72yfmrgzpc6xyh071g91c";
+              };
+    "2.1.0" = {
+                hadoopVersion = "hadoop2.4";
+                sparkSha256 = "0pbsmbjwijsfgbnm56kgwnmnlqkz3w010ma0d7vzlkdklj40vqn2";
+              };
+  };
+in
+
+with versionMap.${version};
+
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name    = "spark-${version}";
-  version = "1.6.0";
+
+  name = "spark-${version}";
 
   src = fetchzip {
-    url    = "mirror://apache/spark/${name}/${name}-bin-cdh4.tgz";
-    sha256 = "19ycx1r8g82vkvzmn9wxkssmv2damrg72yfmrgzpc6xyh071g91c";
+    url    = "mirror://apache/spark/${name}/${name}-bin-${hadoopVersion}.tgz";
+    sha256 = sparkSha256;
   };
 
   buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ]
     ++ optional mesosSupport mesos;
 
-  untarDir = "${name}-bin-cdh4";
+  untarDir = "${name}-bin-${hadoopVersion}";
   installPhase = ''
     mkdir -p $out/{lib/${untarDir}/conf,bin,/share/java}
     mv * $out/lib/${untarDir}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d38479b26d5..53a6f253991 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5931,7 +5931,9 @@ with pkgs;
 
   self = callPackage_i686 ../development/interpreters/self { };
 
-  spark = callPackage ../applications/networking/cluster/spark { };
+  spark = spark_21;
+  spark_16 = callPackage ../applications/networking/cluster/spark { version = "1.6.0"; };
+  spark_21 = callPackage ../applications/networking/cluster/spark { version = "2.1.0"; };
 
   spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { };
   spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { };

From 6091bdfebe8c4d4f397f3f4c9e16724771fe5987 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 6 Feb 2017 22:34:05 +0200
Subject: [PATCH 520/899] fio: 2.12 -> 2.17

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

diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index 2c051bb5e78..0398ffc180a 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, libaio, python, zlib }:
 
 let
-  version = "2.12";
-  sha256 = "1m0fx0x1v2375vyxhd2i12b9w1qy4yh75f6qhwlcr78himcsmpp9";
+  version = "2.17";
+  sha256 = "17fygcy3flsp64mfmwpc66byy95cidby34s6grm3zgsjb7mcypr0";
 in
 
 stdenv.mkDerivation rec {

From 2ac2bd187eb9f76252f5dfea80c78549c64ed3b8 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Mon, 6 Feb 2017 15:42:38 -0500
Subject: [PATCH 521/899] pythonPackages.pyenchant: fix on darwin

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1a7a5e6ae5a..51703404ac4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19967,6 +19967,9 @@ in {
       path_hack_script = "s|LoadLibrary(e_path)|LoadLibrary('${pkgs.enchant}/lib/' + e_path)|";
     in ''
       sed -i "${path_hack_script}" enchant/_enchant.py
+
+      # They hardcode a bad path for Darwin in their library search code
+      substituteInPlace enchant/_enchant.py --replace '/opt/local/lib/' ""
     '';
 
     # dictionaries needed for tests

From 04bd77fa47aafed25dffcd044d110e32500fa6e0 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 6 Feb 2017 21:58:29 +0100
Subject: [PATCH 522/899] bash-completion: 2.4 -> 2.5

---
 pkgs/shells/bash-completion/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix
index ad4cc3d09d7..0c96c72ffd0 100644
--- a/pkgs/shells/bash-completion/default.nix
+++ b/pkgs/shells/bash-completion/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "bash-completion-${version}";
-  version = "2.4";
+  version = "2.5";
 
   src = fetchurl {
     url = "https://github.com/scop/bash-completion/releases/download/${version}/${name}.tar.xz";
-    sha256 = "1xlhd09sb2w3bw8qaypxgkr0782w082mcbx8zf7yzjgy0996pxy0";
+    sha256 = "1kwmii1z1ljx5i4z702ynsr8jgrq64bj9w9hl3n2aa2kcl659fdh";
   };
 
   doCheck = true;

From 714fdb425a90630517056552d77fa4ccb8fadae7 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 6 Feb 2017 16:43:23 -0500
Subject: [PATCH 523/899] firewall: Fix check for rpfilter on manual-config
 kernels

---
 nixos/modules/services/networking/firewall.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index 34b731ad35c..243cd04c96c 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -38,9 +38,9 @@ let
 
   cfg = config.networking.firewall;
 
-  kernelPackages = config.boot.kernelPackages;
+  inherit (config.boot.kernelPackages) kernel;
 
-  kernelHasRPFilter = kernelPackages.kernel.features.netfilterRPFilter or false;
+  kernelHasRPFilter = ((kernel.config.isEnabled or (x: false)) "IP_NF_MATCH_RPFILTER") || (kernel.features.netfilterRPFilter or false);
 
   helpers =
     ''

From ccb2d83980f3a871cf603ff00234020dd1d38add Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Mon, 6 Feb 2017 22:41:01 +0100
Subject: [PATCH 524/899] boogie: fix basename issues; promote to package

---
 pkgs/top-level/all-packages.nix    | 2 ++
 pkgs/top-level/dotnet-packages.nix | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d38479b26d5..299e4d1b846 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17007,6 +17007,8 @@ with pkgs;
 
   aspino = callPackage ../applications/science/logic/aspino {};
 
+  boogie = dotnetPackages.Boogie;
+
   coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix {
     make = pkgs.gnumake3;
     inherit (ocamlPackages_3_12_1) ocaml findlib;
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index c3d8b861c76..0e53e820a39 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -221,8 +221,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
   # SOURCE PACKAGES
 
   Boogie = buildDotnetPackage rec {
-    baseName = "Boogie-unstable";
+    baseName = "Boogie";
     version = "2017-01-03";
+    name = "${baseName}-unstable-${version}";
 
     src = fetchFromGitHub {
       owner = "boogie-org";
@@ -238,8 +239,8 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "Binaries/*" ];
 
     postInstall = ''
-        mkdir -pv "$out/lib/dotnet/Boogie"
-        ln -sv "${pkgs.z3}/bin/z3" "$out/lib/dotnet/Boogie/z3.exe"
+        mkdir -pv "$out/lib/dotnet/${baseName}"
+        ln -sv "${pkgs.z3}/bin/z3" "$out/lib/dotnet/${baseName}/z3.exe"
     '';
 
     meta = with stdenv.lib; {

From 17d74c49121478670c5842c2433d7298b8473fc7 Mon Sep 17 00:00:00 2001
From: Fernando J Pando <fernando.pando@stelligent.com>
Date: Sun, 29 Jan 2017 20:44:50 -0500
Subject: [PATCH 525/899] electricsheep: 2.6.8 -> 2.7b33

- Updates and fixes currently broken package.
- Provides Flam3 and GLee dependencies.
- Tested on Nixos Unstable.
---
 .../screensavers/electricsheep/default.nix    | 42 ++++++++++++++-----
 pkgs/tools/graphics/flam3/default.nix         | 25 +++++++++++
 pkgs/tools/graphics/glee/default.nix          | 34 +++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 4 files changed, 95 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/tools/graphics/flam3/default.nix
 create mode 100644 pkgs/tools/graphics/glee/default.nix

diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix
index 27e26d6d5df..990a25591c6 100644
--- a/pkgs/misc/screensavers/electricsheep/default.nix
+++ b/pkgs/misc/screensavers/electricsheep/default.nix
@@ -1,22 +1,44 @@
-{stdenv, fetchurl, pkgconfig, expat, zlib, libpng, libjpeg, xorg}:
+{ stdenv, fetchFromGitHub, autoreconfHook, libtool, wxGTK30, libav, lua5_1, curl,
+  libpng, xorg, pkgconfig, flam3, libgtop, boost, tinyxml, freeglut, mesa, glee }:
 
 stdenv.mkDerivation rec {
-  name = "electricsheep-2.6.8";
+  name = "${pname}-${version}";
+  pname = "electricsheep";
+  version = "2.7b33-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "598d93d90573b69559463567540aac8bc8a5b3f3";
   
-  src = fetchurl {
-    url = "http://electricsheep.org/${name}.tar.gz";
-    sha256 = "1flqcqfs75wg74hr5w85n6w8b26l4qrpwzi7fzylnry67yzf94y5";
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "scottdraves";
+    repo = "${pname}";
+    sha256 = "1zcn6q0dl0ip85b8b4kisc5lqjb1cs0hpzlx4l5995l6mhq9kxis";
   };
 
-  buildInputs = [pkgconfig expat zlib libpng libjpeg xorg.xlibsWrapper xorg.libXv];
+  nativeBuildInputs = [ autoreconfHook ];
 
-  preInstall = ''
-    installFlags=GNOME_DATADIR=$out
-    mkdir -p $out/control-center/screensavers
+  buildInputs = [
+    libtool wxGTK30 libav lua5_1 curl libpng xorg.libXrender pkgconfig
+    flam3 libgtop boost tinyxml freeglut mesa glee
+  ];
+
+  preAutoreconf = ''
+    cd client_generic
+    sed -i '/ACX_PTHREAD/d' configure.ac
   '';
 
-  meta = {
+  configureFlags = [
+   "CPPFLAGS=-I${glee}/include/GL"
+  ];
+
+  preBuild = ''
+    sed -i "s|/usr|$out|" Makefile
+  '';
+
+  meta = with stdenv.lib; {
     description = "Electric Sheep, a distributed screen saver for evolving artificial organisms";
     homepage = http://electricsheep.org/;
+    maintainers = maintainers.nand0p;
+    platforms = platforms.linux;
+    license = licenses.gpl1;
   };
 }
diff --git a/pkgs/tools/graphics/flam3/default.nix b/pkgs/tools/graphics/flam3/default.nix
new file mode 100644
index 00000000000..f4e0faffb0e
--- /dev/null
+++ b/pkgs/tools/graphics/flam3/default.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchFromGitHub, zlib, libpng, libxml2, libjpeg }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "flam3";
+  version = "3.1.1-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "e0801543538451234d7a8a240ba3b417cbda5b21";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "scottdraves";
+    repo = "${pname}";
+    sha256 = "18iyj16k0sn3fs52fj23lj31xi4avlddhbib6kk309576nlxp17w";
+  };
+
+  buildInputs = [ zlib libpng libxml2 libjpeg ];
+
+  meta = with stdenv.lib; {
+    description = "Cosmic recursive fractal flames";
+    homepage = http://flam3.com/;
+    maintainers = maintainers.nand0p;
+    platforms = platforms.linux;
+    license = licenses.cc-by-nc-sa-20;
+  };
+}
diff --git a/pkgs/tools/graphics/glee/default.nix b/pkgs/tools/graphics/glee/default.nix
new file mode 100644
index 00000000000..bdfecb9de73
--- /dev/null
+++ b/pkgs/tools/graphics/glee/default.nix
@@ -0,0 +1,34 @@
+{stdenv, fetchgit, cmake, mesa, xorg }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "glee";
+  rev = "f727ec7463d514b6279981d12833f2e11d62b33d";
+  version = "20170205-${stdenv.lib.strings.substring 0 7 rev}";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://git.code.sf.net/p/${pname}/${pname}";
+    sha256 = "13mf3s7nvmj26vr2wbcg08l4xxqsc1ha41sx3bfghvq8c5qpk2ph";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ mesa xorg.libX11 ];
+
+  configureScript = ''
+    cmake
+  '';
+
+  preInstall = ''
+    sed -i 's/readme/Readme/' cmake_install.cmake
+  '';
+
+  meta = with stdenv.lib; {
+    description = "GL Easy Extension Library";
+    homepage = https://sourceforge.net/p/glee/glee/;
+    maintainers = with maintainers; [ nand0p ];
+    platforms = platforms.linux;
+    license = licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b587b4fd43..a52ccc535a2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17428,6 +17428,10 @@ with pkgs;
 
   electricsheep = callPackage ../misc/screensavers/electricsheep { };
 
+  flam3 = callPackage ../tools/graphics/flam3 { };
+
+  glee = callPackage ../tools/graphics/glee { };
+
   fakenes = callPackage ../misc/emulators/fakenes { };
 
   faust = self.faust2;

From 41ba205dda86ce99dfdd58976dc845524d1d9933 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 6 Feb 2017 21:08:57 -0500
Subject: [PATCH 526/899] ming: remove.

The project seems dead and there are recent security issues.

See https://lwn.net/Vulnerabilities/712664/
---
 pkgs/development/libraries/ming/default.nix | 44 ---------------------
 pkgs/top-level/all-packages.nix             |  2 -
 2 files changed, 46 deletions(-)
 delete mode 100644 pkgs/development/libraries/ming/default.nix

diff --git a/pkgs/development/libraries/ming/default.nix b/pkgs/development/libraries/ming/default.nix
deleted file mode 100644
index e9777fe5635..00000000000
--- a/pkgs/development/libraries/ming/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, fetchFromGitHub
-, autoreconfHook, flex, bison, perl
-, zlib, freetype, libpng, giflib
-}:
-
-stdenv.mkDerivation rec {
-  pname = "ming";
-  version = "0.4.7";
-  name = "${pname}-${version}";
-
-  src = fetchFromGitHub {
-    repo = "libming";
-    owner = "libming";
-    rev = "${pname}-${stdenv.lib.replaceStrings ["."] ["_"] version}";
-    sha256 = "17ngz1n1mnknixzchywkhbw9s3scad8ajmk97gx14xbsw1603gd2";
-  };
-
-  # We don't currently build the Python, Perl, PHP, etc. bindings.
-  # Perl is needed for the test suite, though.
-
-  outputs = [ "bin" "dev" "out" ];
-  nativeBuildInputs = [ autoreconfHook flex bison perl ];
-  buildInputs = [ freetype zlib libpng giflib ];
-
-  postFixup = ''moveToOutput "bin/ming-config" $dev'';
-
-  doCheck = true;
-
-  meta = with stdenv.lib; {
-    description = "Library for generating Flash `.swf' files";
-
-    longDescription = ''
-      Ming is a library for generating Macromedia Flash files (.swf),
-      written in C, and includes useful utilities for working with
-      .swf files.  It has wrappers that allow it to be used in C++,
-      PHP, Python, Ruby, and Perl.
-    '';
-
-    homepage = http://www.libming.org/;
-
-    license = licenses.lgpl2Plus;
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d38479b26d5..9f052ffaaa6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8804,8 +8804,6 @@ with pkgs;
 
   mhddfs = callPackage ../tools/filesystems/mhddfs { };
 
-  ming = callPackage ../development/libraries/ming { };
-
   minizip = callPackage ../development/libraries/minizip { };
 
   miro = callPackage ../applications/video/miro {

From 12284fff17e96f31250669b5c8fc8dcecb2f2add Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 7 Feb 2017 03:06:30 +0100
Subject: [PATCH 527/899] jbig2dec: 0.11 -> 0.13, new upstream location

The most recent version on the sourceforge page is 0.11 which is quite
old; the official upstream site has 0.13; judging by the commit delta,
there've been quite a few bug fixes etc since 0.11.
---
 pkgs/development/libraries/jbig2dec/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix
index 123379d788d..8828d0057f3 100644
--- a/pkgs/development/libraries/jbig2dec/default.nix
+++ b/pkgs/development/libraries/jbig2dec/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "jbig2dec-0.11";
+  name = "jbig2dec-0.13";
 
   src = fetchurl {
-    url = "mirror://sourceforge/jbig2dec/${name}.tar.xz";
-    sha256 = "1xddc30garsg5j8p348cz5l8vn8j7723c0sykv0kc1w5ihaghsq1";
+    url = "http://downloads.ghostscript.com/public/jbig2dec/${name}.tar.gz";
+    sha256 = "04akiwab8iy5iy34razcvh9mcja9wy737civ3sbjxk4j143s1b2s";
   };
 
   meta = {
-    homepage = http://jbig2dec.sourceforge.net/;
+    homepage = https://www.ghostscript.com/jbig2dec.html;
     description = "Decoder implementation of the JBIG2 image compression format";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;

From 8608f91661f36bd4e3343309c5f6bc22ce153eef Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 6 Feb 2017 21:23:40 -0500
Subject: [PATCH 528/899] gnash: remove due to removal of ming

---
 pkgs/applications/video/gnash/default.nix | 122 ----------------------
 pkgs/top-level/all-packages.nix           |   5 -
 2 files changed, 127 deletions(-)
 delete mode 100644 pkgs/applications/video/gnash/default.nix

diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix
deleted file mode 100644
index cf17b66ef48..00000000000
--- a/pkgs/applications/video/gnash/default.nix
+++ /dev/null
@@ -1,122 +0,0 @@
-{ stdenv, fetchurl, fetchpatch
-, SDL, SDL_mixer, gstreamer, gst_plugins_base, gst_plugins_good
-, gst_ffmpeg, speex
-, libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool
-, boost, freetype, agg, dbus, curl, pkgconfig, gettext
-, glib, gtk2, gtkglext, pangox_compat, xlibsWrapper, ming, dejagnu, python, perl
-, freefont_ttf, haxe, swftools
-, lib, makeWrapper
-, xulrunner }:
-
-assert stdenv ? glibc;
-
-let version = "0.8.10";
-    patch_CVE = fetchpatch {
-      url = "http://git.savannah.gnu.org/cgit/gnash.git/patch/?id=bb4dc77eecb6ed1b967e3ecbce3dac6c5e6f1527";
-      sha256 = "0ghnki5w7xf3qwfl1x6vhijpd6q608niyxrvh0g8dw5xavkvallk";
-      name = "CVE-2012-1175.patch";
-    };
-in
-
-stdenv.mkDerivation rec {
-  name = "gnash-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnu/gnash/${version}/${name}.tar.bz2";
-    sha256 = "090j5lly5r6jzbnvlc3mhay6dsrd9sfrkjcgqaibm4nz8lp0f9cn";
-  };
-
-  patchPhase = ''
-    patch -p1 < ${patch_CVE}
-
-    # Add all libs to `macros/libslist', a list of library search paths.
-    libs=$(echo "$NIX_LDFLAGS" | tr ' ' '\n' | sed -n 's/.*-L\(.*\).*/\1/p')
-    for lib in $libs; do
-      echo -n "$lib " >> macros/libslist
-    done
-    echo -n "${stdenv.glibc.out}/lib" >> macros/libslist
-
-    # Make sure to honor $TMPDIR, for chroot builds.
-    for file in configure gui/Makefile.in Makefile.in
-    do
-      sed -i "$file" -es'|/tmp/|$TMPDIR/|g'
-    done
-
-    # Provide a default font.
-    sed -i "configure" \
-        -e 's|/usr/share/fonts/truetype/freefont/|${freefont_ttf}/share/fonts/truetype/|g'
-  '';
-
-  enableParallelBuilding = true;
-
-  # XXX: KDE is supported as well so we could make it available optionally.
-  buildInputs = [
-    gettext xlibsWrapper SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good
-    gst_ffmpeg speex libtool
-    libogg libxml2 libjpeg mesa libpng libungif boost freetype agg
-    dbus curl pkgconfig glib gtk2 gtkglext pangox_compat
-    xulrunner
-    makeWrapper
-  ]
-
-  ++ (stdenv.lib.optionals doCheck [
-        ming dejagnu python perl haxe swftools
-      ]);
-
-  preConfigure =
-    '' configureFlags="                                         \
-         --with-sdl-incl=${SDL.dev}/include/SDL                     \
-         --with-npapi-plugindir=$out/plugins                    \
-         --enable-media=gst                                     \
-         --without-gconf
-         --enable-gui=gtk"
-
-       # In `libmedia', Gnash compiles with "-I$gst_plugins_base/include",
-       # whereas it really needs "-I$gst_plugins_base/include/gstreamer-0.10".
-       # Work around this using GCC's $CPATH variable.
-       export CPATH="${gst_plugins_base}/include/gstreamer-0.10:${gst_plugins_good}/include/gstreamer-0.10"
-       echo "\$CPATH set to \`$CPATH'"
-
-       echo "\$GST_PLUGIN_PATH set to \`$GST_PLUGIN_PATH'"
-    '';
-
-  postConfigure = "echo '#define nullptr NULL' >> gnashconfig.h";
-
-  # Make sure `gtk-gnash' gets `libXext' in its `RPATH'.
-  NIX_LDFLAGS="-lX11 -lXext";
-
-  # XXX: Tests currently fail.
-  doCheck = false;
-
-  preInstall = ''mkdir -p $out/plugins'';
-  postInstall = ''
-    make install-plugins
-
-    # Wrap programs so the find the GStreamer plug-ins they need
-    # (e.g., gst-ffmpeg is needed to watch movies such as YouTube's).
-    for prog in "$out/bin/"*
-    do
-      wrapProgram "$prog" --prefix GST_PLUGIN_SYSTEM_PATH ":" "$GST_PLUGIN_SYSTEM_PATH"
-    done
-  '';
-
-  meta = {
-    homepage = http://www.gnu.org/software/gnash/;
-    description = "A libre SWF (Flash) movie player";
-
-    longDescription = ''
-      Gnash is a GNU Flash movie player.  Flash is an animation file format
-      pioneered by Macromedia which continues to be supported by their
-      successor company, Adobe.  Flash has been extended to include audio and
-      video content, and programs written in ActionScript, an
-      ECMAScript-compatible language.  Gnash is based on GameSWF, and
-      supports most SWF v7 features and some SWF v8 and v9.
-    '';
-
-    license = stdenv.lib.licenses.gpl3Plus;
-
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.gnu;
-    broken = true;
-  };
-} // {mozillaPlugin = "/plugins";}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f052ffaaa6..e066d1ababd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13526,11 +13526,6 @@ with pkgs;
 
   gmu = callPackage ../applications/audio/gmu { };
 
-  gnash = callPackage ../applications/video/gnash {
-    inherit (gnome2) gtkglext;
-    xulrunner = firefox-unwrapped;
-  };
-
   gnome_mplayer = callPackage ../applications/video/gnome-mplayer {
     inherit (gnome2) GConf;
   };

From 0cd174899c2f1d3e92d8a8657c412bad13be5a74 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 6 Feb 2017 21:27:44 -0500
Subject: [PATCH 529/899] xf86-video-intel: 15c5ff1245 -> e4fe79cf0d.

Fixes a GPU hang bug, see https://bugs.freedesktop.org/show_bug.cgi?id=99696
---
 pkgs/servers/x11/xorg/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index d5a3bea67a6..b825d86ac8d 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1813,11 +1813,11 @@ let
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videointel = (mkDerivation "xf86videointel" {
-    name = "xf86-video-intel-2016-09-08";
+    name = "xf86-video-intel-2017-02-05";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/15c5ff12459a034b552c787047d1af6d61047cd6.tar.gz;
-      sha256 = "0nggdll6i5qddv9r2imip4hf6aw1nmfxjqg3i6gcbwmqp2w3f003";
+      url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/e4fe79cf0d9a05ee3f3a027148ef0aeb2b1b34e1.tar.gz;
+      sha256 = "1hzfz5m9iclxk55531nqmyn25a50ggibl1qb80l6742k25k211cr";
     };
     buildInputs = [pkgconfig dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ];
     meta.platforms = stdenv.lib.platforms.unix;

From f77bc59af647f9fc055fb16077cf433d944988bc Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 6 Feb 2017 21:29:38 -0500
Subject: [PATCH 530/899] firefox-wrapper: remove gnash support, see #22342

---
 .../networking/browsers/firefox/wrapper.nix    |  5 +----
 .../development/libraries/jbig2dec/default.nix | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index e5e8cacd21c..ad1091c9d39 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, makeDesktopItem, makeWrapper, config
 
 ## various stuff that can be plugged in
-, gnash, flashplayer, hal-flash
+, flashplayer, hal-flash
 , MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra_gtk2
 , supportsJDK, jrePlugin, icedtea_web
 , trezor-bridge, bluejeans, djview4, adobe-reader
@@ -23,16 +23,13 @@ browser:
 let
   cfg = stdenv.lib.attrByPath [ browserName ] {} config;
   enableAdobeFlash = cfg.enableAdobeFlash or false;
-  enableGnash = cfg.enableGnash or false;
   ffmpegSupport = browser.ffmpegSupport or false;
   jre = cfg.jre or false;
   icedtea = cfg.icedtea or false;
 
   plugins =
-     assert !(enableGnash && enableAdobeFlash);
      assert !(jre && icedtea);
      ([ ]
-      ++ lib.optional enableGnash gnash
       ++ lib.optional enableAdobeFlash flashplayer
       ++ lib.optional (cfg.enableDjvu or false) (djview4)
       ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser)
diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix
index 123379d788d..45df4876be1 100644
--- a/pkgs/development/libraries/jbig2dec/default.nix
+++ b/pkgs/development/libraries/jbig2dec/default.nix
@@ -1,15 +1,23 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "jbig2dec-0.11";
+  name = "jbig2dec-0.13";
 
   src = fetchurl {
-    url = "mirror://sourceforge/jbig2dec/${name}.tar.xz";
-    sha256 = "1xddc30garsg5j8p348cz5l8vn8j7723c0sykv0kc1w5ihaghsq1";
+    url = "http://downloads.ghostscript.com/public/jbig2dec/${name}.tar.gz";
+    sha256 = "04akiwab8iy5iy34razcvh9mcja9wy737civ3sbjxk4j143s1b2s";
   };
 
+  patches =
+    [ (fetchpatch {
+        url = "http://git.ghostscript.com/?p=jbig2dec.git;a=patch;h=e698d5c11d27212aa1098bc5b1673a3378563092";
+        sha256 = "1fc8xm1z98xj2zkcl0zj7dpjjsbz3vn61b59jnkhcyzy3iiczv7f";
+        name = "CVE-2016-9601.patch";
+      })
+    ];
+
   meta = {
-    homepage = http://jbig2dec.sourceforge.net/;
+    homepage = https://www.ghostscript.com/jbig2dec.html;
     description = "Decoder implementation of the JBIG2 image compression format";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;

From 267813f4f7713bdcecff5a397ac4ab27fb9c93c1 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 6 Feb 2017 21:39:09 -0500
Subject: [PATCH 531/899] Revert "firefox-wrapper: remove gnash support, see
 #22342"

Accidentally committed other changes

This reverts commit f77bc59af647f9fc055fb16077cf433d944988bc.
---
 .../networking/browsers/firefox/wrapper.nix    |  5 ++++-
 .../development/libraries/jbig2dec/default.nix | 18 +++++-------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index ad1091c9d39..e5e8cacd21c 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, makeDesktopItem, makeWrapper, config
 
 ## various stuff that can be plugged in
-, flashplayer, hal-flash
+, gnash, flashplayer, hal-flash
 , MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra_gtk2
 , supportsJDK, jrePlugin, icedtea_web
 , trezor-bridge, bluejeans, djview4, adobe-reader
@@ -23,13 +23,16 @@ browser:
 let
   cfg = stdenv.lib.attrByPath [ browserName ] {} config;
   enableAdobeFlash = cfg.enableAdobeFlash or false;
+  enableGnash = cfg.enableGnash or false;
   ffmpegSupport = browser.ffmpegSupport or false;
   jre = cfg.jre or false;
   icedtea = cfg.icedtea or false;
 
   plugins =
+     assert !(enableGnash && enableAdobeFlash);
      assert !(jre && icedtea);
      ([ ]
+      ++ lib.optional enableGnash gnash
       ++ lib.optional enableAdobeFlash flashplayer
       ++ lib.optional (cfg.enableDjvu or false) (djview4)
       ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser)
diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix
index 45df4876be1..123379d788d 100644
--- a/pkgs/development/libraries/jbig2dec/default.nix
+++ b/pkgs/development/libraries/jbig2dec/default.nix
@@ -1,23 +1,15 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "jbig2dec-0.13";
+  name = "jbig2dec-0.11";
 
   src = fetchurl {
-    url = "http://downloads.ghostscript.com/public/jbig2dec/${name}.tar.gz";
-    sha256 = "04akiwab8iy5iy34razcvh9mcja9wy737civ3sbjxk4j143s1b2s";
+    url = "mirror://sourceforge/jbig2dec/${name}.tar.xz";
+    sha256 = "1xddc30garsg5j8p348cz5l8vn8j7723c0sykv0kc1w5ihaghsq1";
   };
 
-  patches =
-    [ (fetchpatch {
-        url = "http://git.ghostscript.com/?p=jbig2dec.git;a=patch;h=e698d5c11d27212aa1098bc5b1673a3378563092";
-        sha256 = "1fc8xm1z98xj2zkcl0zj7dpjjsbz3vn61b59jnkhcyzy3iiczv7f";
-        name = "CVE-2016-9601.patch";
-      })
-    ];
-
   meta = {
-    homepage = https://www.ghostscript.com/jbig2dec.html;
+    homepage = http://jbig2dec.sourceforge.net/;
     description = "Decoder implementation of the JBIG2 image compression format";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;

From 4c5b08e4e21504229552575eb0420971449d149d Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 6 Feb 2017 21:40:19 -0500
Subject: [PATCH 532/899] firefox-wrapper: remove gnash support, see #22342

---
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index e5e8cacd21c..ad1091c9d39 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, makeDesktopItem, makeWrapper, config
 
 ## various stuff that can be plugged in
-, gnash, flashplayer, hal-flash
+, flashplayer, hal-flash
 , MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra_gtk2
 , supportsJDK, jrePlugin, icedtea_web
 , trezor-bridge, bluejeans, djview4, adobe-reader
@@ -23,16 +23,13 @@ browser:
 let
   cfg = stdenv.lib.attrByPath [ browserName ] {} config;
   enableAdobeFlash = cfg.enableAdobeFlash or false;
-  enableGnash = cfg.enableGnash or false;
   ffmpegSupport = browser.ffmpegSupport or false;
   jre = cfg.jre or false;
   icedtea = cfg.icedtea or false;
 
   plugins =
-     assert !(enableGnash && enableAdobeFlash);
      assert !(jre && icedtea);
      ([ ]
-      ++ lib.optional enableGnash gnash
       ++ lib.optional enableAdobeFlash flashplayer
       ++ lib.optional (cfg.enableDjvu or false) (djview4)
       ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser)

From 83f83ca4345be7221dd63e4451e3cf5ef1374117 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 7 Feb 2017 03:08:04 +0100
Subject: [PATCH 533/899] jbig2dec: patch for CVE-2016-9601

Upstream bug: https://bugs.ghostscript.com/show_bug.cgi?id=697457

A new release containing this fix is expected in march; until then,
apply patch from upstream. Note that there have been essentially no
changes between 0.13 and this patch.
---
 pkgs/development/libraries/jbig2dec/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix
index 8828d0057f3..45df4876be1 100644
--- a/pkgs/development/libraries/jbig2dec/default.nix
+++ b/pkgs/development/libraries/jbig2dec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
   name = "jbig2dec-0.13";
@@ -8,6 +8,14 @@ stdenv.mkDerivation rec {
     sha256 = "04akiwab8iy5iy34razcvh9mcja9wy737civ3sbjxk4j143s1b2s";
   };
 
+  patches =
+    [ (fetchpatch {
+        url = "http://git.ghostscript.com/?p=jbig2dec.git;a=patch;h=e698d5c11d27212aa1098bc5b1673a3378563092";
+        sha256 = "1fc8xm1z98xj2zkcl0zj7dpjjsbz3vn61b59jnkhcyzy3iiczv7f";
+        name = "CVE-2016-9601.patch";
+      })
+    ];
+
   meta = {
     homepage = https://www.ghostscript.com/jbig2dec.html;
     description = "Decoder implementation of the JBIG2 image compression format";

From 47c166fe0525e06ef833e15b9f543a0f3f342d7d Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Sat, 28 Jan 2017 17:10:50 -0400
Subject: [PATCH 534/899] amdgpu-pro: 16.50 -> 16.60

---
 pkgs/os-specific/linux/amdgpu-pro/default.nix |  49 +++---
 ...1-Fix-kernel-module-install-location.patch |  25 ---
 .../patches/0001-disable-firmware-copy.patch  |  25 +++
 .../0002-Add-Gentoo-as-build-option.patch     |  30 ----
 .../patches/0002-linux-4.9-fixes.patch        |  97 +++++++++++
 ...eq_printf-format-for-64-bit-context.patch} |   8 +-
 ...ameter-from-ttm_bo_reserve-for-4.7.0.patch |  28 ---
 .../0004-fix-warnings-for-Werror.patch        |  74 ++++++++
 .../patches/0005-Fix-vblank-calls.patch       | 136 ---------------
 ...6-Fix-crtc_gamma-functions-for-4.8.0.patch | 163 ------------------
 ...m_atomic_helper_swap_state-for-4.8.0.patch |  28 ---
 ...lag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch |  40 -----
 ...0009-Remove-dependency-on-System.map.patch |  61 -------
 .../patches/0010-disable-dal-by-default.patch |  25 ---
 .../0011-kcl-fixes-for-16.50-linux-4.8.patch  | 114 ------------
 .../0012-use-kernel-fence_array-in-4.8.patch  |  55 ------
 16 files changed, 226 insertions(+), 732 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0001-Fix-kernel-module-install-location.patch
 create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0001-disable-firmware-copy.patch
 delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0002-Add-Gentoo-as-build-option.patch
 create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch
 rename pkgs/os-specific/linux/amdgpu-pro/patches/{0004-Change-seq_printf-format-for-64-bit-context.patch => 0003-Change-seq_printf-format-for-64-bit-context.patch} (72%)
 delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0003-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch
 create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch
 delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0005-Fix-vblank-calls.patch
 delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0006-Fix-crtc_gamma-functions-for-4.8.0.patch
 delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0007-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch
 delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0008-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch
 delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0009-Remove-dependency-on-System.map.patch
 delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0010-disable-dal-by-default.patch
 delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0011-kcl-fixes-for-16.50-linux-4.8.patch
 delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0012-use-kernel-fence_array-in-4.8.patch

diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix
index cbfa2e1b030..7cf2bc4f975 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/default.nix
+++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix
@@ -30,9 +30,9 @@ let
 
 in stdenv.mkDerivation rec {
 
-  version = "16.50";
+  version = "16.60";
   pname = "amdgpu-pro";
-  build = "${version}-362463";
+  build = "${version}-379184";
 
   libCompatDir = "/run/lib/${libArch}";
 
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
   src = fetchurl {
     url =
     "https://www2.ati.com/drivers/linux/ubuntu/amdgpu-pro-${build}.tar.xz";
-    sha256 = "1wl8mabk9g7s43bdarzl2i5crp8rl1advnb5mw3p3821sqzh2nd9";
+    sha256 = "1g90sryxw8y4abjgviibq34v3hr82ijgbaiqnxgafrf7g9s5m2yq";
     curlOpts = "--referer http://support.amd.com/en-us/kb-articles/Pages/AMD-Radeon-GPU-PRO-Linux-Beta-Driver%e2%80%93Release-Notes.aspx";
   };
 
@@ -58,18 +58,10 @@ in stdenv.mkDerivation rec {
   '';
 
   modulePatches = [
-    ./patches/0001-Fix-kernel-module-install-location.patch
-    ./patches/0002-Add-Gentoo-as-build-option.patch
-    ./patches/0003-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch
-    ./patches/0004-Change-seq_printf-format-for-64-bit-context.patch
-    ./patches/0005-Fix-vblank-calls.patch
-    ./patches/0006-Fix-crtc_gamma-functions-for-4.8.0.patch
-    ./patches/0007-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch
-    ./patches/0008-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch
-    ./patches/0009-Remove-dependency-on-System.map.patch
-    ./patches/0010-disable-dal-by-default.patch
-    ./patches/0011-kcl-fixes-for-16.50-linux-4.8.patch
-    ./patches/0012-use-kernel-fence_array-in-4.8.patch
+    ./patches/0001-disable-firmware-copy.patch
+    ./patches/0002-linux-4.9-fixes.patch
+    ./patches/0003-Change-seq_printf-format-for-64-bit-context.patch
+    ./patches/0004-fix-warnings-for-Werror.patch
   ];
 
   patchPhase = optionalString (!libsOnly) ''
@@ -83,12 +75,23 @@ in stdenv.mkDerivation rec {
   '';
 
   preBuild = optionalString (!libsOnly) ''
-    makeFlags="$makeFlags M=$(pwd)/usr/src/amdgpu-pro-${build}"
+    pushd usr/src/amdgpu-pro-${build}
+    makeFlags="$makeFlags M=$(pwd)"
+    patchShebangs pre-build.sh
+    ./pre-build.sh ${kernel.version}
+    popd
   '';
 
-  postBuild = optionalString (!libsOnly) ''
-    xz usr/src/amdgpu-pro-${build}/amd/amdgpu/amdgpu.ko
-  '';
+  modules = [
+    "amd/amdgpu/amdgpu.ko"
+    "amd/amdkcl/amdkcl.ko"
+    "ttm/amdttm.ko"
+  ];
+
+  postBuild = optionalString (!libsOnly)
+    (concatMapStrings (m: "xz usr/src/amdgpu-pro-${build}/${m}\n") modules);
+
+  NIX_CFLAGS_COMPILE = "-Werror";
 
   makeFlags = optionalString (!libsOnly)
     "-C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build modules";
@@ -123,10 +126,10 @@ in stdenv.mkDerivation rec {
   '' + ''
     popd
 
-  '' + optionalString (!libsOnly) ''
-    mkdir -p $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko.xz
-    cp usr/src/amdgpu-pro-${build}/amd/amdgpu/amdgpu.ko.xz $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko.xz
-  '' + ''
+  '' + optionalString (!libsOnly)
+    (concatMapStrings (m:
+      "install -Dm444 usr/src/amdgpu-pro-${build}/${m}.xz $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/${m}.xz\n") modules)
+  + ''
     mv $out/etc/vulkan $out/share
     interpreter="$(cat $NIX_CC/nix-support/dynamic-linker)"
     libPath="$out/lib:$out/lib/gbm:$depLibPath"
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Fix-kernel-module-install-location.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Fix-kernel-module-install-location.patch
deleted file mode 100644
index 5af823a9394..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Fix-kernel-module-install-location.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e787277fd4f43399de2da355b08e478c2a58d589 Mon Sep 17 00:00:00 2001
-From: "Luke A. Guest" <laguest@archeia.com>
-Date: Sun, 25 Sep 2016 15:31:13 +0100
-Subject: [PATCH 01/11] Fix kernel module install location
-
----
- dkms.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dkms.conf b/dkms.conf
-index 7f11158..2f080e2 100644
---- a/dkms.conf
-+++ b/dkms.conf
-@@ -2,7 +2,7 @@ PACKAGE_NAME="amdgpu-pro"
- PACKAGE_VERSION="16.50-362463"
- BUILT_MODULE_NAME[0]="amdgpu"
- BUILT_MODULE_LOCATION[0]="amd/amdgpu"
--DEST_MODULE_LOCATION[0]="/updates"
-+DEST_MODULE_LOCATION[0]="/kernel/drivers/gpu/drm/amd/amdgpu"
- AUTOINSTALL="yes"
- PRE_BUILD="pre-build.sh $kernelver"
- 
--- 
-2.11.0
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-disable-firmware-copy.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-disable-firmware-copy.patch
new file mode 100644
index 00000000000..6803cf03289
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-disable-firmware-copy.patch
@@ -0,0 +1,25 @@
+From ad3f6de6d16ea8ee76635dd39875eeab39def6e9 Mon Sep 17 00:00:00 2001
+From: David McFarland <corngood@gmail.com>
+Date: Sat, 28 Jan 2017 16:57:26 -0400
+Subject: [PATCH 1/4] disable firmware copy
+
+---
+ pre-build.sh | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/pre-build.sh b/pre-build.sh
+index 25e718f..e3cd009 100755
+--- a/pre-build.sh
++++ b/pre-build.sh
+@@ -35,8 +35,3 @@ find ttm -name '*.c' -exec grep EXPORT_SYMBOL {} + \
+     | sort -u \
+     | awk -F'[()]' '{print "#define "$2" amd"$2" //"$0}'\
+     > include/rename_symbol.h
+-
+-FW_DIR="/lib/firmware/$KERNELVER"
+-mkdir -p $FW_DIR
+-cp -ar /usr/src/amdgpu-pro-16.60-379184/firmware/radeon $FW_DIR
+-cp -ar /usr/src/amdgpu-pro-16.60-379184/firmware/amdgpu $FW_DIR
+-- 
+2.11.0
+
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Add-Gentoo-as-build-option.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Add-Gentoo-as-build-option.patch
deleted file mode 100644
index be627992c06..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Add-Gentoo-as-build-option.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From da51551f671be3282b6f69ef76e495b169a5dc3f Mon Sep 17 00:00:00 2001
-From: "Luke A. Guest" <laguest@archeia.com>
-Date: Sun, 25 Sep 2016 15:31:49 +0100
-Subject: [PATCH 02/11] Add Gentoo as build option
-
----
- amd/backport/Makefile | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/amd/backport/Makefile b/amd/backport/Makefile
-index a6ab7fe..ff9339d 100644
---- a/amd/backport/Makefile
-+++ b/amd/backport/Makefile
-@@ -22,8 +22,13 @@ else ifeq ("sled",$(OS_NAME))
- ccflags-y += -DOS_NAME_SLE
- else ifeq ("sles",$(OS_NAME))
- ccflags-y += -DOS_NAME_SLE
-+else ifeq ("gentoo",$(OS_NAME))
-+ccflags-y += -DOS_NAME_GENTOO
-+# We don't have a version inside /etc/os-release.
-+OS_VERSION = "0.0"
- else
- ccflags-y += -DOS_NAME_UNKNOWN
-+OS_VERSION = "0.0"
- endif
- 
- ccflags-y += \
--- 
-2.11.0
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch
new file mode 100644
index 00000000000..86dbea29e08
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch
@@ -0,0 +1,97 @@
+From 52e47be93c7a492730477f590e5eb42e035018bd Mon Sep 17 00:00:00 2001
+From: David McFarland <corngood@gmail.com>
+Date: Sun, 29 Jan 2017 18:23:47 -0400
+Subject: [PATCH 2/4] linux-4.9 fixes
+
+---
+ amd/amdgpu/amdgpu_connectors.c          | 8 ++++++++
+ amd/amdgpu/amdgpu_ttm.c                 | 4 ++++
+ amd/display/amdgpu_dm/amdgpu_dm_types.c | 8 ++++++++
+ include/kcl/kcl_mm.h                    | 4 +++-
+ 4 files changed, 23 insertions(+), 1 deletion(-)
+
+diff --git a/amd/amdgpu/amdgpu_connectors.c b/amd/amdgpu/amdgpu_connectors.c
+index 1b51981..4b43379 100644
+--- a/amd/amdgpu/amdgpu_connectors.c
++++ b/amd/amdgpu/amdgpu_connectors.c
+@@ -168,12 +168,20 @@ int amdgpu_connector_get_monitor_bpc(struct drm_connector *connector)
+ 		}
+ 
+ 		/* Any defined maximum tmds clock limit we must not exceed? */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++		if (connector->display_info.max_tmds_clock > 0) {
++#else
+ 		if (connector->max_tmds_clock > 0) {
++#endif
+ 			/* mode_clock is clock in kHz for mode to be modeset on this connector */
+ 			mode_clock = amdgpu_connector->pixelclock_for_modeset;
+ 
+ 			/* Maximum allowable input clock in kHz */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++			max_tmds_clock = connector->display_info.max_tmds_clock * 1000;
++#else
+ 			max_tmds_clock = connector->max_tmds_clock * 1000;
++#endif
+ 
+ 			DRM_DEBUG("%s: hdmi mode dotclock %d kHz, max tmds input clock %d kHz.\n",
+ 				  connector->name, mode_clock, max_tmds_clock);
+diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c
+index 447529d..252bab4 100644
+--- a/amd/amdgpu/amdgpu_ttm.c
++++ b/amd/amdgpu/amdgpu_ttm.c
+@@ -255,7 +255,11 @@ static int amdgpu_verify_access(struct ttm_buffer_object *bo, struct file *filp)
+ 
+ 	if (amdgpu_ttm_tt_get_usermm(bo->ttm))
+ 		return -EPERM;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++	return drm_vma_node_verify_access(&abo->gem_base.vma_node, filp->private_data);
++#else
+ 	return drm_vma_node_verify_access(&abo->gem_base.vma_node, filp);
++#endif
+ }
+ 
+ static void amdgpu_move_null(struct ttm_buffer_object *bo,
+diff --git a/amd/display/amdgpu_dm/amdgpu_dm_types.c b/amd/display/amdgpu_dm/amdgpu_dm_types.c
+index be7aafb..5e11f26 100644
+--- a/amd/display/amdgpu_dm/amdgpu_dm_types.c
++++ b/amd/display/amdgpu_dm/amdgpu_dm_types.c
+@@ -1692,6 +1692,10 @@ static int dm_plane_helper_prepare_fb(
+ 	struct drm_plane *plane,
+ 	struct drm_framebuffer *fb,
+ 	const struct drm_plane_state *new_state)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++static int dm_plane_helper_prepare_fb(
++	struct drm_plane *plane,
++	struct drm_plane_state *new_state)
+ #else
+ static int dm_plane_helper_prepare_fb(
+ 	struct drm_plane *plane,
+@@ -1735,6 +1739,10 @@ static void dm_plane_helper_cleanup_fb(
+ 	struct drm_plane *plane,
+ 	struct drm_framebuffer *fb,
+ 	const struct drm_plane_state *old_state)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++static void dm_plane_helper_cleanup_fb(
++	struct drm_plane *plane,
++	struct drm_plane_state *old_state)
+ #else
+ static void dm_plane_helper_cleanup_fb(
+ 	struct drm_plane *plane,
+diff --git a/include/kcl/kcl_mm.h b/include/kcl/kcl_mm.h
+index a18936d..f068195 100644
+--- a/include/kcl/kcl_mm.h
++++ b/include/kcl/kcl_mm.h
+@@ -8,7 +8,9 @@ static inline int kcl_get_user_pages(struct task_struct *tsk, struct mm_struct *
+                                      int write, int force, struct page **pages,
+                                      struct vm_area_struct **vmas)
+ {
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++        return get_user_pages(start, nr_pages, write ? FOLL_WRITE : 0, pages, vmas);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
+         return get_user_pages(start, nr_pages, write, force, pages, vmas);
+ #else
+         return get_user_pages(tsk, mm, start, nr_pages,
+-- 
+2.11.0
+
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-Change-seq_printf-format-for-64-bit-context.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch
similarity index 72%
rename from pkgs/os-specific/linux/amdgpu-pro/patches/0004-Change-seq_printf-format-for-64-bit-context.patch
rename to pkgs/os-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch
index 925a92e2a7e..6856b9ae092 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-Change-seq_printf-format-for-64-bit-context.patch
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch
@@ -1,17 +1,17 @@
-From 084b2915e6876d8fdb913938569c0ce7ffef65bc Mon Sep 17 00:00:00 2001
+From cc490c71a98b6bbe390fcf777fbe0360d01bf4ca Mon Sep 17 00:00:00 2001
 From: "Luke A. Guest" <laguest@archeia.com>
 Date: Sun, 25 Sep 2016 16:46:39 +0100
-Subject: [PATCH 04/11] Change seq_printf format for 64 bit context
+Subject: [PATCH 3/4] Change seq_printf format for 64 bit context
 
 ---
  amd/amdgpu/amdgpu_sa.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/amd/amdgpu/amdgpu_sa.c b/amd/amdgpu/amdgpu_sa.c
-index 052f745..5886b9a 100644
+index c43f582..8c4b9f7 100644
 --- a/amd/amdgpu/amdgpu_sa.c
 +++ b/amd/amdgpu/amdgpu_sa.c
-@@ -428,7 +428,7 @@ void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager,
+@@ -427,7 +427,7 @@ void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager,
  			   soffset, eoffset, eoffset - soffset);
  
  		if (i->fence)
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch
deleted file mode 100644
index ae5b62b1d23..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 999a30883f34c4603c3b747a58a89d4924583769 Mon Sep 17 00:00:00 2001
-From: "Luke A. Guest" <laguest@archeia.com>
-Date: Sun, 25 Sep 2016 15:46:58 +0100
-Subject: [PATCH 03/11] Remove extra parameter from ttm_bo_reserve for 4.7.0
-
----
- amd/backport/include/kcl/kcl_ttm.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/amd/backport/include/kcl/kcl_ttm.h b/amd/backport/include/kcl/kcl_ttm.h
-index 6e5a170..52cdbc8 100644
---- a/amd/backport/include/kcl/kcl_ttm.h
-+++ b/amd/backport/include/kcl/kcl_ttm.h
-@@ -113,7 +113,11 @@ static inline int kcl_ttm_bo_reserve(struct ttm_buffer_object *bo,
- 				 struct ww_acquire_ctx *ticket)
- {
- #if defined(BUILD_AS_DKMS)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+	return ttm_bo_reserve(bo, interruptible, no_wait, ticket);
-+#else
- 	return ttm_bo_reserve(bo, interruptible, no_wait, false, ticket);
-+#endif
- #else
- 	return ttm_bo_reserve(bo, interruptible, no_wait, ticket);
- #endif
--- 
-2.11.0
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch
new file mode 100644
index 00000000000..d226504c4e4
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch
@@ -0,0 +1,74 @@
+From 9970f3107aed7b2b1ff1c5f29129b62cec99980d Mon Sep 17 00:00:00 2001
+From: David McFarland <corngood@gmail.com>
+Date: Mon, 6 Feb 2017 22:13:49 -0400
+Subject: [PATCH 4/4] fix warnings for Werror
+
+---
+ amd/amdgpu/amdgpu_kms.c                 | 2 +-
+ amd/amdgpu/amdgpu_ttm.c                 | 2 ++
+ amd/display/amdgpu_dm/amdgpu_dm.c       | 2 +-
+ amd/display/amdgpu_dm/amdgpu_dm_types.c | 2 +-
+ 4 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/amd/amdgpu/amdgpu_kms.c b/amd/amdgpu/amdgpu_kms.c
+index b7b51ae..bc884f6 100644
+--- a/amd/amdgpu/amdgpu_kms.c
++++ b/amd/amdgpu/amdgpu_kms.c
+@@ -591,7 +591,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
+ 
+ 			bios = adev->bios + bios_offset;
+ 			return copy_to_user(out, bios,
+-				min((size_t)size, bios_size - bios_offset))
++				min(size, bios_size - bios_offset))
+ 					? -EFAULT : 0;
+ 		}
+ 		default:
+diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c
+index 252bab4..90f3655 100644
+--- a/amd/amdgpu/amdgpu_ttm.c
++++ b/amd/amdgpu/amdgpu_ttm.c
+@@ -1083,6 +1083,7 @@ uint32_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm,
+ 	return flags;
+ }
+ 
++#if 0
+ static void amdgpu_ttm_lru_removal(struct ttm_buffer_object *tbo)
+ {
+ 	struct amdgpu_device *adev = amdgpu_ttm_adev(tbo->bdev);
+@@ -1132,6 +1133,7 @@ static struct list_head *amdgpu_ttm_swap_lru_tail(struct ttm_buffer_object *tbo)
+ 
+ 	return res;
+ }
++#endif
+ 
+ static struct ttm_bo_driver amdgpu_bo_driver = {
+ 	.ttm_tt_create = &amdgpu_ttm_tt_create,
+diff --git a/amd/display/amdgpu_dm/amdgpu_dm.c b/amd/display/amdgpu_dm/amdgpu_dm.c
+index 3dcb619..5700861 100644
+--- a/amd/display/amdgpu_dm/amdgpu_dm.c
++++ b/amd/display/amdgpu_dm/amdgpu_dm.c
+@@ -121,7 +121,7 @@ static bool dm_check_soft_reset(void *handle)
+ 
+ static int dm_soft_reset(void *handle)
+ {
+-	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
++	/* struct amdgpu_device *adev = (struct amdgpu_device *)handle; */
+ 
+ 	/* XXX todo */
+ 	return 0;
+diff --git a/amd/display/amdgpu_dm/amdgpu_dm_types.c b/amd/display/amdgpu_dm/amdgpu_dm_types.c
+index 5e11f26..7039542 100644
+--- a/amd/display/amdgpu_dm/amdgpu_dm_types.c
++++ b/amd/display/amdgpu_dm/amdgpu_dm_types.c
+@@ -913,7 +913,7 @@ static void decide_crtc_timing_for_drm_display_mode(
+ }
+ 
+ static struct dc_target *create_target_for_sink(
+-		const struct amdgpu_connector *aconnector,
++		struct amdgpu_connector *aconnector,
+ 		const struct drm_display_mode *drm_mode,
+ 		const struct dm_connector_state *dm_state)
+ {
+-- 
+2.11.0
+
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0005-Fix-vblank-calls.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0005-Fix-vblank-calls.patch
deleted file mode 100644
index 99b54aca2ab..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0005-Fix-vblank-calls.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From 1884ef3a813f3dac0029c7539654ba978635d5d3 Mon Sep 17 00:00:00 2001
-From: "Luke A. Guest" <laguest@archeia.com>
-Date: Sun, 25 Sep 2016 16:49:09 +0100
-Subject: [PATCH 05/11] Fix vblank calls
-
----
- amd/amdgpu/amdgpu_display.c   | 8 ++++++++
- amd/amdgpu/dce_v10_0.c        | 4 ++++
- amd/amdgpu/dce_v11_0.c        | 4 ++++
- amd/amdgpu/dce_v8_0.c         | 4 ++++
- amd/amdgpu/dce_virtual.c      | 8 ++++++++
- amd/dal/amdgpu_dm/amdgpu_dm.c | 4 ++++
- 6 files changed, 32 insertions(+)
-
-diff --git a/amd/amdgpu/amdgpu_display.c b/amd/amdgpu/amdgpu_display.c
-index 8425b1d..d6cd383 100644
---- a/amd/amdgpu/amdgpu_display.c
-+++ b/amd/amdgpu/amdgpu_display.c
-@@ -268,7 +268,11 @@ int amdgpu_crtc_page_flip(struct drm_crtc *crtc,
- 
- 	work->base = base;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-+	r = drm_crtc_vblank_get(crtc);
-+#else
- 	r = drm_vblank_get(crtc->dev, amdgpu_crtc->crtc_id);
-+#endif
- 	if (r) {
- 		DRM_ERROR("failed to get vblank before flip\n");
- 		goto pflip_cleanup;
-@@ -296,7 +300,11 @@ int amdgpu_crtc_page_flip(struct drm_crtc *crtc,
- 	return 0;
- 
- vblank_cleanup:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-+	drm_crtc_vblank_put(&amdgpu_crtc->base);
-+#else
- 	drm_vblank_put(crtc->dev, amdgpu_crtc->crtc_id);
-+#endif
- 
- pflip_cleanup:
- 	if (unlikely(amdgpu_bo_reserve(new_abo, false) != 0)) {
-diff --git a/amd/amdgpu/dce_v10_0.c b/amd/amdgpu/dce_v10_0.c
-index 650d193..b1880ac 100644
---- a/amd/amdgpu/dce_v10_0.c
-+++ b/amd/amdgpu/dce_v10_0.c
-@@ -3342,7 +3342,11 @@ static int dce_v10_0_pageflip_irq(struct amdgpu_device *adev,
- 
- 	spin_unlock_irqrestore(&adev->ddev->event_lock, flags);
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-+	drm_crtc_vblank_put(&amdgpu_crtc->base);
-+#else
- 	drm_vblank_put(adev->ddev, amdgpu_crtc->crtc_id);
-+#endif
- 	schedule_work(&works->unpin_work);
- 
- 	return 0;
-diff --git a/amd/amdgpu/dce_v11_0.c b/amd/amdgpu/dce_v11_0.c
-index ca03d8e..b654b64 100644
---- a/amd/amdgpu/dce_v11_0.c
-+++ b/amd/amdgpu/dce_v11_0.c
-@@ -3391,7 +3391,11 @@ static int dce_v11_0_pageflip_irq(struct amdgpu_device *adev,
- 
- 	spin_unlock_irqrestore(&adev->ddev->event_lock, flags);
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-+	drm_crtc_vblank_put(&amdgpu_crtc->base);
-+#else
- 	drm_vblank_put(adev->ddev, amdgpu_crtc->crtc_id);
-+#endif
- 	schedule_work(&works->unpin_work);
- 
- 	return 0;
-diff --git a/amd/amdgpu/dce_v8_0.c b/amd/amdgpu/dce_v8_0.c
-index 8e4dff7..b598caa 100644
---- a/amd/amdgpu/dce_v8_0.c
-+++ b/amd/amdgpu/dce_v8_0.c
-@@ -3252,7 +3252,11 @@ static int dce_v8_0_pageflip_irq(struct amdgpu_device *adev,
- 
- 	spin_unlock_irqrestore(&adev->ddev->event_lock, flags);
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-+	drm_crtc_vblank_put(&amdgpu_crtc->base);
-+#else
- 	drm_vblank_put(adev->ddev, amdgpu_crtc->crtc_id);
-+#endif
- 	schedule_work(&works->unpin_work);
- 
- 	return 0;
-diff --git a/amd/amdgpu/dce_virtual.c b/amd/amdgpu/dce_virtual.c
-index 0c6e873..36e2094 100644
---- a/amd/amdgpu/dce_virtual.c
-+++ b/amd/amdgpu/dce_virtual.c
-@@ -746,11 +746,19 @@ static int dce_virtual_pageflip_irq(struct amdgpu_device *adev,
- 
- 	/* wakeup usersapce */
- 	if (works->event)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-+    drm_crtc_send_vblank_event(&amdgpu_crtc->base, works->event);
-+#else
- 		drm_send_vblank_event(adev->ddev, crtc_id, works->event);
-+#endif
- 
- 	spin_unlock_irqrestore(&adev->ddev->event_lock, flags);
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-+	drm_crtc_vblank_put(&amdgpu_crtc->base);
-+#else
- 	drm_vblank_put(adev->ddev, amdgpu_crtc->crtc_id);
-+#endif
- 	schedule_work(&works->unpin_work);
- 
- 	return 0;
-diff --git a/amd/dal/amdgpu_dm/amdgpu_dm.c b/amd/dal/amdgpu_dm/amdgpu_dm.c
-index c5fcf5a..e9892d8 100644
---- a/amd/dal/amdgpu_dm/amdgpu_dm.c
-+++ b/amd/dal/amdgpu_dm/amdgpu_dm.c
-@@ -213,10 +213,14 @@ static void dm_pflip_high_irq(void *interrupt_params)
- 
- 	/* wakeup usersapce */
- 	if(works->event)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-+		drm_crtc_send_vblank_event(&amdgpu_crtc->base, works->event);
-+#else
- 		drm_send_vblank_event(
- 			adev->ddev,
- 			amdgpu_crtc->crtc_id,
- 			works->event);
-+#endif
- 
- 	spin_unlock_irqrestore(&adev->ddev->event_lock, flags);
- 
--- 
-2.11.0
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Fix-crtc_gamma-functions-for-4.8.0.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Fix-crtc_gamma-functions-for-4.8.0.patch
deleted file mode 100644
index 566b7039bb3..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Fix-crtc_gamma-functions-for-4.8.0.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From 12660ae02838f99c0784194908f7a189bc2ab0ae Mon Sep 17 00:00:00 2001
-From: "Luke A. Guest" <laguest@archeia.com>
-Date: Sun, 25 Sep 2016 16:56:47 +0100
-Subject: [PATCH 06/11] Fix crtc_gamma functions for 4.8.0
-
----
- amd/amdgpu/dce_v10_0.c              | 19 +++++++++++++++++++
- amd/amdgpu/dce_v11_0.c              | 19 +++++++++++++++++++
- amd/amdgpu/dce_v8_0.c               | 19 +++++++++++++++++++
- amd/dal/amdgpu_dm/amdgpu_dm_types.c | 12 ++++++++++++
- 4 files changed, 69 insertions(+)
-
-diff --git a/amd/amdgpu/dce_v10_0.c b/amd/amdgpu/dce_v10_0.c
-index b1880ac..53746fa 100644
---- a/amd/amdgpu/dce_v10_0.c
-+++ b/amd/amdgpu/dce_v10_0.c
-@@ -2627,6 +2627,24 @@ static void dce_v10_0_cursor_reset(struct drm_crtc *crtc)
- 	}
- }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-+static int dce_v10_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
-+				    u16 *blue, uint32_t size)
-+{
-+	struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
-+	int i;
-+
-+	/* userspace palettes are always correct as is */
-+	for (i = 0; i < size; i++) {
-+		amdgpu_crtc->lut_r[i] = red[i] >> 6;
-+		amdgpu_crtc->lut_g[i] = green[i] >> 6;
-+		amdgpu_crtc->lut_b[i] = blue[i] >> 6;
-+	}
-+	dce_v10_0_crtc_load_lut(crtc);
-+
-+	return 0;
-+}
-+#else
- static void dce_v10_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
- 				    u16 *blue, uint32_t start, uint32_t size)
- {
-@@ -2641,6 +2659,7 @@ static void dce_v10_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green
- 	}
- 	dce_v10_0_crtc_load_lut(crtc);
- }
-+#endif
- 
- static void dce_v10_0_crtc_destroy(struct drm_crtc *crtc)
- {
-diff --git a/amd/amdgpu/dce_v11_0.c b/amd/amdgpu/dce_v11_0.c
-index b654b64..3edd66d 100644
---- a/amd/amdgpu/dce_v11_0.c
-+++ b/amd/amdgpu/dce_v11_0.c
-@@ -2643,6 +2643,24 @@ static void dce_v11_0_cursor_reset(struct drm_crtc *crtc)
- 	}
- }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-+static int dce_v11_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
-+				    u16 *blue, uint32_t size)
-+{
-+	struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
-+	int i;
-+
-+	/* userspace palettes are always correct as is */
-+	for (i = 0; i < size; i++) {
-+		amdgpu_crtc->lut_r[i] = red[i] >> 6;
-+		amdgpu_crtc->lut_g[i] = green[i] >> 6;
-+		amdgpu_crtc->lut_b[i] = blue[i] >> 6;
-+	}
-+	dce_v11_0_crtc_load_lut(crtc);
-+
-+	return 0;
-+}
-+#else
- static void dce_v11_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
- 				    u16 *blue, uint32_t start, uint32_t size)
- {
-@@ -2657,6 +2675,7 @@ static void dce_v11_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green
- 	}
- 	dce_v11_0_crtc_load_lut(crtc);
- }
-+#endif
- 
- static void dce_v11_0_crtc_destroy(struct drm_crtc *crtc)
- {
-diff --git a/amd/amdgpu/dce_v8_0.c b/amd/amdgpu/dce_v8_0.c
-index b598caa..d203894 100644
---- a/amd/amdgpu/dce_v8_0.c
-+++ b/amd/amdgpu/dce_v8_0.c
-@@ -2478,6 +2478,24 @@ static void dce_v8_0_cursor_reset(struct drm_crtc *crtc)
- 	}
- }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-+static int dce_v8_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
-+				    u16 *blue, uint32_t size)
-+{
-+	struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
-+	int i;
-+
-+	/* userspace palettes are always correct as is */
-+	for (i = 0; i < size; i++) {
-+		amdgpu_crtc->lut_r[i] = red[i] >> 6;
-+		amdgpu_crtc->lut_g[i] = green[i] >> 6;
-+		amdgpu_crtc->lut_b[i] = blue[i] >> 6;
-+	}
-+	dce_v8_0_crtc_load_lut(crtc);
-+
-+	return 0;
-+}
-+#else
- static void dce_v8_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
- 				    u16 *blue, uint32_t start, uint32_t size)
- {
-@@ -2492,6 +2510,7 @@ static void dce_v8_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
- 	}
- 	dce_v8_0_crtc_load_lut(crtc);
- }
-+#endif
- 
- static void dce_v8_0_crtc_destroy(struct drm_crtc *crtc)
- {
-diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
-index edc8e86..32755a9 100644
---- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c
-+++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
-@@ -998,6 +998,13 @@ void amdgpu_dm_crtc_destroy(struct drm_crtc *crtc)
- 	kfree(crtc);
- }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-+static int amdgpu_dm_atomic_crtc_gamma_set(struct drm_crtc *crtc,
-+					   u16 *red,
-+					   u16 *green,
-+					   u16 *blue,
-+					   uint32_t size)
-+#else
- static void amdgpu_dm_atomic_crtc_gamma_set(
- 		struct drm_crtc *crtc,
- 		u16 *red,
-@@ -1005,6 +1012,7 @@ static void amdgpu_dm_atomic_crtc_gamma_set(
- 		u16 *blue,
- 		uint32_t start,
- 		uint32_t size)
-+#endif
- {
- 	struct drm_device *dev = crtc->dev;
- 	struct drm_property *prop = dev->mode_config.prop_crtc_id;
-@@ -1012,6 +1020,10 @@ static void amdgpu_dm_atomic_crtc_gamma_set(
- 	crtc->state->mode.private_flags |= AMDGPU_CRTC_MODE_PRIVATE_FLAGS_GAMMASET;
- 
- 	drm_atomic_helper_crtc_set_property(crtc, prop, 0);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-+	return 0;
-+#endif
- }
- 
- static int dm_crtc_funcs_atomic_set_property(
--- 
-2.11.0
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch
deleted file mode 100644
index 197fdd32b10..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 7a5d45874b1e2bbbff2d2410f38203b5b0ae67c4 Mon Sep 17 00:00:00 2001
-From: "Luke A. Guest" <laguest@archeia.com>
-Date: Sun, 25 Sep 2016 17:00:32 +0100
-Subject: [PATCH 07/11] Fix drm_atomic_helper_swap_state for 4.8.0
-
----
- amd/dal/amdgpu_dm/amdgpu_dm_types.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
-index 32755a9..60ca073 100644
---- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c
-+++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
-@@ -2528,7 +2528,11 @@ int amdgpu_dm_atomic_commit(
- 	 * the software side now.
- 	 */
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-+	drm_atomic_helper_swap_state(state, true);
-+#else
- 	drm_atomic_helper_swap_state(dev, state);
-+#endif
- 
- 	/*
- 	 * From this point state become old state really. New state is
--- 
-2.11.0
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0008-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0008-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch
deleted file mode 100644
index 8674c3537e8..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0008-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 7c536e8b9f73926014c0622eb101f2cf174b507b Mon Sep 17 00:00:00 2001
-From: "Luke A. Guest" <laguest@archeia.com>
-Date: Sun, 25 Sep 2016 19:19:45 +0100
-Subject: [PATCH 08/11] Add extra flag to ttm_bo_move_ttm for >=4.8.0-rc2
-
----
- amd/amdgpu/amdgpu_ttm.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c
-index 89760f8..d102224 100644
---- a/amd/amdgpu/amdgpu_ttm.c
-+++ b/amd/amdgpu/amdgpu_ttm.c
-@@ -428,7 +428,11 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo,
- 	if (unlikely(r)) {
- 		goto out_cleanup;
- 	}
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-+	r = ttm_bo_move_ttm(bo, true, interruptible, no_wait_gpu, new_mem);
-+#else
- 	r = ttm_bo_move_ttm(bo, true, no_wait_gpu, new_mem);
-+#endif
- out_cleanup:
- 	ttm_bo_mem_put(bo, &tmp_mem);
- 	return r;
-@@ -461,7 +465,11 @@ static int amdgpu_move_ram_vram(struct ttm_buffer_object *bo,
- 	if (unlikely(r)) {
- 		return r;
- 	}
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-+	r = ttm_bo_move_ttm(bo, true, interruptible, no_wait_gpu, &tmp_mem);
-+#else
- 	r = ttm_bo_move_ttm(bo, true, no_wait_gpu, &tmp_mem);
-+#endif
- 	if (unlikely(r)) {
- 		goto out_cleanup;
- 	}
--- 
-2.11.0
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0009-Remove-dependency-on-System.map.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0009-Remove-dependency-on-System.map.patch
deleted file mode 100644
index 52c5f7f4593..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0009-Remove-dependency-on-System.map.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 4d645984264e449d6a4507af033b26daed952eac Mon Sep 17 00:00:00 2001
-From: David McFarland <corngood@gmail.com>
-Date: Wed, 26 Oct 2016 22:26:39 -0300
-Subject: [PATCH 09/11] Remove dependency on System.map
-
----
- amd/backport/Makefile    |  1 -
- amd/backport/kcl_fence.c | 10 ++++++++--
- amd/backport/symbols     |  7 -------
- 3 files changed, 8 insertions(+), 10 deletions(-)
- delete mode 100644 amd/backport/symbols
-
-diff --git a/amd/backport/Makefile b/amd/backport/Makefile
-index ff9339d..3f2d9ea 100644
---- a/amd/backport/Makefile
-+++ b/amd/backport/Makefile
-@@ -64,7 +64,6 @@ ccflags-y += -DOS_NAME_RHEL_7_3
- endif
- endif
- 
--BACKPORT_OBJS = symbols.o
- endif
- 
- BACKPORT_OBJS += kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o amdgpu_kcl.o kcl_fence_array.o kcl_kthread.o
-diff --git a/amd/backport/kcl_fence.c b/amd/backport/kcl_fence.c
-index 54ad819..39f6d61 100644
---- a/amd/backport/kcl_fence.c
-+++ b/amd/backport/kcl_fence.c
-@@ -52,8 +52,14 @@ struct default_wait_cb {
- 	struct task_struct *task;
- };
- 
--extern void
--(*fence_default_wait_cb)(struct fence *fence, struct fence_cb *cb);
-+static void
-+fence_default_wait_cb(struct fence *fence, struct fence_cb *cb)
-+{
-+	struct default_wait_cb *wait =
-+		container_of(cb, struct default_wait_cb, base);
-+
-+	wake_up_process(wait->task);
-+}
- 
- signed long
- _kcl_fence_wait_any_timeout(struct fence **fences, uint32_t count,
-diff --git a/amd/backport/symbols b/amd/backport/symbols
-deleted file mode 100644
-index 68cae63..0000000
---- a/amd/backport/symbols
-+++ /dev/null
-@@ -1,7 +0,0 @@
--SYMS=""
--
--SYMS+="fence_default_wait_cb"
--
--if version_lt 2.6.33; then
--    SYMS+=" kallsyms_lookup_name"
--fi
--- 
-2.11.0
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0010-disable-dal-by-default.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0010-disable-dal-by-default.patch
deleted file mode 100644
index e69e5c58319..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0010-disable-dal-by-default.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5ab8e5e36634391a5c440bf78463226b2074485e Mon Sep 17 00:00:00 2001
-From: David McFarland <corngood@gmail.com>
-Date: Thu, 25 Aug 2016 22:17:06 -0300
-Subject: [PATCH 10/11] disable dal by default
-
----
- amd/amdgpu/amdgpu_drv.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/amd/amdgpu/amdgpu_drv.c b/amd/amdgpu/amdgpu_drv.c
-index d6b3f35..4477865 100755
---- a/amd/amdgpu/amdgpu_drv.c
-+++ b/amd/amdgpu/amdgpu_drv.c
-@@ -88,7 +88,7 @@ int amdgpu_vm_fault_stop = 0;
- int amdgpu_vm_debug = 0;
- int amdgpu_vram_page_split = -1;
- int amdgpu_exp_hw_support = 0;
--int amdgpu_dal = -1;
-+int amdgpu_dal = 0;
- int amdgpu_sched_jobs = 32;
- int amdgpu_sched_hw_submission = 2;
- int amdgpu_powerplay = -1;
--- 
-2.11.0
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0011-kcl-fixes-for-16.50-linux-4.8.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0011-kcl-fixes-for-16.50-linux-4.8.patch
deleted file mode 100644
index 0cf3ad262f6..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0011-kcl-fixes-for-16.50-linux-4.8.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 156445f6eda047ee5a5d6e4bde36c3e9ccbbd7d9 Mon Sep 17 00:00:00 2001
-From: David McFarland <corngood@gmail.com>
-Date: Thu, 29 Dec 2016 14:20:06 -0400
-Subject: [PATCH 11/11] kcl fixes for 16.50 + linux-4.8
-
----
- amd/amdgpu/dce_v6_0.c              |  5 +++--
- amd/amdgpu/dce_virtual.c           |  5 +++--
- amd/backport/include/kcl/kcl_drm.h | 12 ++++++++++++
- amd/backport/include/kcl/kcl_ttm.h |  2 +-
- amd/backport/kcl_drm.c             |  4 ++++
- 5 files changed, 23 insertions(+), 5 deletions(-)
-
-diff --git a/amd/amdgpu/dce_v6_0.c b/amd/amdgpu/dce_v6_0.c
-index fd3eeb0..1f1874c 100644
---- a/amd/amdgpu/dce_v6_0.c
-+++ b/amd/amdgpu/dce_v6_0.c
-@@ -1946,9 +1946,9 @@ static void dce_v6_0_cursor_reset(struct drm_crtc *crtc)
- 	}
- }
- 
--static void dce_v6_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
--				    u16 *blue, uint32_t start, uint32_t size)
-+static kcl_crtc_gamma_set_callback(dce_v6_0_crtc_gamma_set)
- {
-+  kcl_crtc_gamma_set_pre
- 	struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
- 	int end = (start + size > 256) ? 256 : start + size, i;
- 
-@@ -1959,6 +1959,7 @@ static void dce_v6_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
- 		amdgpu_crtc->lut_b[i] = blue[i] >> 6;
- 	}
- 	dce_v6_0_crtc_load_lut(crtc);
-+  kcl_crtc_gamma_set_suf
- }
- 
- static void dce_v6_0_crtc_destroy(struct drm_crtc *crtc)
-diff --git a/amd/amdgpu/dce_virtual.c b/amd/amdgpu/dce_virtual.c
-index 36e2094..11b98e2 100644
---- a/amd/amdgpu/dce_virtual.c
-+++ b/amd/amdgpu/dce_virtual.c
-@@ -152,9 +152,9 @@ static void dce_virtual_bandwidth_update(struct amdgpu_device *adev)
- 	return;
- }
- 
--static void dce_virtual_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
--				    u16 *blue, uint32_t start, uint32_t size)
-+static kcl_crtc_gamma_set_callback(dce_virtual_crtc_gamma_set)
- {
-+  kcl_crtc_gamma_set_pre
- 	struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
- 	int end = (start + size > 256) ? 256 : start + size, i;
- 
-@@ -164,6 +164,7 @@ static void dce_virtual_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *gre
- 		amdgpu_crtc->lut_g[i] = green[i] >> 6;
- 		amdgpu_crtc->lut_b[i] = blue[i] >> 6;
- 	}
-+  kcl_crtc_gamma_set_suf
- }
- 
- static void dce_virtual_crtc_destroy(struct drm_crtc *crtc)
-diff --git a/amd/backport/include/kcl/kcl_drm.h b/amd/backport/include/kcl/kcl_drm.h
-index 95bf640..61c38b1 100644
---- a/amd/backport/include/kcl/kcl_drm.h
-+++ b/amd/backport/include/kcl/kcl_drm.h
-@@ -206,4 +206,16 @@ int drm_atomic_helper_resume(struct drm_device *dev,
- 
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-+#define kcl_crtc_gamma_set_callback(n) int n(struct drm_crtc *crtc, \
-+    u16 *red, u16 *green, u16 *blue, uint32_t size)
-+#define kcl_crtc_gamma_set_pre uint32_t start = 0;
-+#define kcl_crtc_gamma_set_suf return 0;
-+#else
-+#define kcl_crtc_gamma_set_callback(n) void n(struct drm_crtc *crtc, \
-+    u16 *red, u16 *green, u16 *blue, uint32_t start, uint32_t size)
-+#define kcl_crtc_gamma_set_pre
-+#define kcl_crtc_gamma_set_suf
-+#endif
-+
- #endif /* AMDGPU_BACKPORT_KCL_DRM_H */
-diff --git a/amd/backport/include/kcl/kcl_ttm.h b/amd/backport/include/kcl/kcl_ttm.h
-index 52cdbc8..cdda0b5 100644
---- a/amd/backport/include/kcl/kcl_ttm.h
-+++ b/amd/backport/include/kcl/kcl_ttm.h
-@@ -152,7 +152,7 @@ static inline int kcl_ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
- 		bool evict, bool no_wait_gpu,
- 		struct ttm_mem_reg *new_mem)
- {
--#if defined(BUILD_AS_DKMS)
-+#if defined(BUILD_AS_DKMS) && (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0))
- 	return ttm_bo_move_accel_cleanup(bo, fence,
- 			evict, no_wait_gpu, new_mem);
- #else
-diff --git a/amd/backport/kcl_drm.c b/amd/backport/kcl_drm.c
-index 27d4aaa..a083c87 100644
---- a/amd/backport/kcl_drm.c
-+++ b/amd/backport/kcl_drm.c
-@@ -178,7 +178,11 @@ static inline struct drm_plane_state *
- _kcl_drm_atomic_get_existing_plane_state(struct drm_atomic_state *state,
-                     struct drm_plane *plane)
- {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-+    return drm_atomic_get_existing_plane_state(state, plane);
-+#else
-     return state->plane_states[drm_plane_index(plane)];
-+#endif
- }
- 
- void
--- 
-2.11.0
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0012-use-kernel-fence_array-in-4.8.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0012-use-kernel-fence_array-in-4.8.patch
deleted file mode 100644
index 07ce868c29d..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0012-use-kernel-fence_array-in-4.8.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 73e77e056427e2042b8d84933c02db92e17cf233 Mon Sep 17 00:00:00 2001
-From: David McFarland <corngood@gmail.com>
-Date: Thu, 29 Dec 2016 14:49:18 -0400
-Subject: [PATCH] use kernel fence_array in 4.8+
-
----
- amd/backport/include/kcl/kcl_fence_array.h | 10 ++++++++--
- amd/backport/kcl_fence_array.c             |  2 +-
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/amd/backport/include/kcl/kcl_fence_array.h b/amd/backport/include/kcl/kcl_fence_array.h
-index bb4401e..0d9f344 100644
---- a/amd/backport/include/kcl/kcl_fence_array.h
-+++ b/amd/backport/include/kcl/kcl_fence_array.h
-@@ -19,11 +19,15 @@
-  * more details.
-  */
- 
--#ifndef __LINUX_FENCE_ARRAY_H
--#define __LINUX_FENCE_ARRAY_H
-+#ifndef __KCL_FENCE_ARRAY_H
-+#define __KCL_FENCE_ARRAY_H
- 
- #include <linux/fence.h>
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)
-+#include <linux/fence-array.h>
-+#else
-+
- /**
-  * struct fence_array_cb - callback helper for fence array
-  * @cb: fence callback structure for signaling
-@@ -72,4 +76,6 @@ struct fence_array *fence_array_create(int num_fences, struct fence **fences,
- 				       u64 context, unsigned seqno,
- 				       bool signal_on_any);
- 
-+#endif
-+
- #endif /* __LINUX_FENCE_ARRAY_H */
-diff --git a/amd/backport/kcl_fence_array.c b/amd/backport/kcl_fence_array.c
-index d7ee15c..1865444 100644
---- a/amd/backport/kcl_fence_array.c
-+++ b/amd/backport/kcl_fence_array.c
-@@ -21,7 +21,7 @@
- #include <linux/export.h>
- #include <linux/slab.h>
- 
--#if defined(BUILD_AS_DKMS)
-+#if defined(BUILD_AS_DKMS) && LINUX_VERSION_CODE < KERNEL_VERSION(4,8,0)
- static void fence_array_cb_func(struct fence *f, struct fence_cb *cb);
- 
- static const char *fence_array_get_driver_name(struct fence *fence)
--- 
-2.11.0
-

From 905627c7c5d25f6006ff3d757e8800958fc00e14 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Sun, 29 Jan 2017 19:02:48 -0400
Subject: [PATCH 535/899] xorg-server: fglrxCompat -> abiCompat

Allows it to be used for fglrx (1.17) and amdgpu-pro (1.18)
---
 nixos/modules/hardware/video/amdgpu-pro.nix |  2 ++
 nixos/modules/hardware/video/ati.nix        |  2 +-
 pkgs/servers/x11/xorg/overrides.nix         | 18 ++++++++++++++----
 pkgs/top-level/all-packages.nix             |  2 +-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/hardware/video/amdgpu-pro.nix b/nixos/modules/hardware/video/amdgpu-pro.nix
index 979810abf90..9e81f1b48a2 100644
--- a/nixos/modules/hardware/video/amdgpu-pro.nix
+++ b/nixos/modules/hardware/video/amdgpu-pro.nix
@@ -21,6 +21,8 @@ in
 
   config = mkIf enabled {
 
+    nixpkgs.config.xorg.abiCompat = "1.18";
+
     services.xserver.drivers = singleton
       { name = "amdgpu"; modules = [ package ]; libPath = [ package ]; };
 
diff --git a/nixos/modules/hardware/video/ati.nix b/nixos/modules/hardware/video/ati.nix
index bf91bcf0776..022fdea0a0a 100644
--- a/nixos/modules/hardware/video/ati.nix
+++ b/nixos/modules/hardware/video/ati.nix
@@ -18,7 +18,7 @@ in
 
   config = mkIf enabled {
 
-    nixpkgs.config.xorg.fglrxCompat = true;
+    nixpkgs.config.xorg.abiCompat = "1.17";
 
     services.xserver.drivers = singleton
       { name = "fglrx"; modules = [ ati_x11 ]; libPath = [ "${ati_x11}/lib" ]; };
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 889dd58c01b..9c4225c7e5e 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -393,10 +393,11 @@ in
   };
 
   xorgserver = with xorg; attrs_passed:
-    # exchange attrs if fglrxCompat is set
+    # exchange attrs if abiCompat is set
     let
-      attrs = if !args.fglrxCompat then attrs_passed else
-        with args; {
+      attrs = with args;
+        if (args.abiCompat == null) then attrs_passed
+        else if (args.abiCompat == "1.17") then {
           name = "xorg-server-1.17.4";
           builder = ./builder.sh;
           src = fetchurl {
@@ -405,7 +406,16 @@ in
           };
           buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
           meta.platforms = stdenv.lib.platforms.unix;
-        };
+        } else if (args.abiCompat == "1.18") then {
+            name = "xorg-server-1.18.4";
+            builder = ./builder.sh;
+            src = fetchurl {
+              url = mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2;
+              sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117";
+            };
+            buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
+            meta.platforms = stdenv.lib.platforms.unix;
+        } else throw "unsupported xorg abiCompat: ${args.abiCompat}";
 
     in attrs //
     (let
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e5576e0f82e..ff3dfaf5a7d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10769,7 +10769,7 @@ with pkgs;
     python = python2; # Incompatible with Python 3x
     udev = if stdenv.isLinux then udev else null;
     libdrm = if stdenv.isLinux then libdrm else null;
-    fglrxCompat = config.xorg.fglrxCompat or false; # `config` because we have no `xorg.override`
+    abiCompat = config.xorg.abiCompat or null; # `config` because we have no `xorg.override`
   } // { inherit xlibsWrapper; } );
 
   xwayland = callPackage ../servers/x11/xorg/xwayland.nix { };

From 9611a607085a961ee324d81e3b68a15df38906cf Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 7 Feb 2017 04:44:31 +0100
Subject: [PATCH 536/899] jfbview: 0.5.2 -> 0.5.3, fixes build

Also convert tabs to spaces
---
 pkgs/os-specific/linux/jfbview/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix
index bad64a20cac..0700191e7a8 100644
--- a/pkgs/os-specific/linux/jfbview/default.nix
+++ b/pkgs/os-specific/linux/jfbview/default.nix
@@ -9,16 +9,16 @@ let
     then "jfbview"
     else "jfbpdf";
   binaries = if imageSupport
-    then [ "jfbview" "jpdfcat" "jpdfgrep" ]	# all require imlib2
-    else [ "jfbpdf" ];	       		  	# does not
+    then [ "jfbview" "jpdfcat" "jpdfgrep" ] # all require imlib2
+    else [ "jfbpdf" ]; # does not
 in
 
 stdenv.mkDerivation rec {
   name = "${package}-${version}";
-  version = "0.5.2";
+  version = "0.5.3";
 
   src = fetchFromGitHub {
-    sha256 = "1vd2ndl4ar2bzqf0k11qid6gvma59qg62imsa81mgczsqw7kvbx6";
+    sha256 = "18iyvisslqp5ibhix00j4y7q8fmf2a79chflimc78xf52x4m2p5q";
     rev = version;
     repo = "JFBView";
     owner = "jichu4n";

From ac72948c94421bbc714076992e21953d78f67205 Mon Sep 17 00:00:00 2001
From: Remy Goldschmidt <taktoa@gmail.com>
Date: Sun, 5 Feb 2017 11:55:39 -0600
Subject: [PATCH 537/899] souper: init at 2017-01-05

---
 pkgs/development/compilers/souper/default.nix | 56 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 58 insertions(+)
 create mode 100644 pkgs/development/compilers/souper/default.nix

diff --git a/pkgs/development/compilers/souper/default.nix b/pkgs/development/compilers/souper/default.nix
new file mode 100644
index 00000000000..74e1cbf68d3
--- /dev/null
+++ b/pkgs/development/compilers/souper/default.nix
@@ -0,0 +1,56 @@
+{ stdenv, fetchFromGitHub, cmake, makeWrapper
+, llvmPackages_39, hiredis, z3_opt, gtest
+}:
+
+let
+  klee = fetchFromGitHub {
+    owner = "klee";
+    repo  = "klee";
+    rev   = "a743d7072d9ccf11f96e3df45f25ad07da6ad9d6";
+    sha256 = "0qwzs029vlba8xz362n4b00hdm2z3lzhzmvix1r8kpbfrvs8vv91";
+  };
+in stdenv.mkDerivation {
+  name = "souper-unstable-2017-01-05";
+
+  src = fetchFromGitHub {
+    owner  = "google";
+    repo   = "souper";
+    rev    = "1be75fe6a96993b57dcba038798fe6d1c7d113eb";
+    sha256 = "0r8mjb88lwz9a3syx7gwsxlwfg0krffaml04ggaf3ad0cza2mvm8";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    makeWrapper
+  ];
+
+  buildInputs = [
+    llvmPackages_39.llvm
+    llvmPackages_39.clang-unwrapped
+    hiredis
+    gtest
+  ];
+
+  enableParallelBuilding = true;
+
+  preConfigure = ''
+      mkdir -pv third_party
+      cp -R "${klee}" third_party/klee
+  '';
+
+  installPhase = ''
+      mkdir -pv $out/bin
+      cp -v ./souper       $out/bin/
+      cp -v ./clang-souper $out/bin/
+      wrapProgram "$out/bin/souper" \
+          --add-flags "-z3-path=\"${z3_opt}/bin/z3\""
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A superoptimizer for LLVM IR";
+    homepage    = "https://github.com/google/souper";
+    license     = licenses.asl20;
+    maintainers = with maintainers; [ taktoa ];
+    platforms   = with platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1264013db36..b27f42f55f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3844,6 +3844,8 @@ with pkgs;
 
   sonata = callPackage ../applications/audio/sonata { };
 
+  souper = callPackage ../development/compilers/souper { };
+
   sparsehash = callPackage ../development/libraries/sparsehash { };
 
   spiped = callPackage ../tools/networking/spiped { };

From 87cc20eddbabce1572c8f10d8872a592b53a58ce Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 7 Feb 2017 07:05:31 +0100
Subject: [PATCH 538/899] nixos/networkd: Fix eval error for defaultGateway

Regression introduced by 0cb487ee044bbe5cfa1d6421df385b6bc2447bd2.

This changed the result for defaultGateway to be a submodule instead of
just a plain string, so instead of using just cfg.defaultGateway we need
to pass cfg.defaultGateway.address now.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @abbradar
---
 nixos/modules/tasks/network-interfaces-systemd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix
index a1212c90556..cd599d8b894 100644
--- a/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -62,9 +62,9 @@ in
         genericNetwork = override: {
           DHCP = override (dhcpStr cfg.useDHCP);
         } // optionalAttrs (cfg.defaultGateway != null) {
-          gateway = override [ cfg.defaultGateway ];
+          gateway = override [ cfg.defaultGateway.address ];
         } // optionalAttrs (cfg.defaultGateway6 != null) {
-          gateway = override [ cfg.defaultGateway6 ];
+          gateway = override [ cfg.defaultGateway6.address ];
         } // optionalAttrs (domains != [ ]) {
           domains = override domains;
         };

From cd10e3c4ffa3d6c729aab8778bf6027415025c44 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 7 Feb 2017 07:36:56 +0100
Subject: [PATCH 539/899] nixos/tests/chromium: Run tests as normal user

The tests have failed because Chromium has started up displaying the
following error message in a dialog window:

  Chromium can not be run as root.

  Please start Chromium as a normal user. If you need to run as root for
  development, rerun with the --no-sandbox flag.

So let's run as user "alice" and pass all commands using the small
helper function "ru" (to keep it short, it's for "Run as User").

Tested it by running the "stable" test on x86_64-linux.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: @globin
---
 nixos/tests/chromium.nix | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix
index 55b1fb5a722..3a2c6516476 100644
--- a/nixos/tests/chromium.nix
+++ b/nixos/tests/chromium.nix
@@ -18,8 +18,9 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
 
   enableOCR = true;
 
-  machine.imports = [ ./common/x11.nix ];
+  machine.imports = [ ./common/user-account.nix ./common/x11.nix ];
   machine.virtualisation.memorySize = 2047;
+  machine.services.xserver.displayManager.auto.user = "alice";
   machine.environment.systemPackages = [ chromiumPkg ];
 
   startupHTML = pkgs.writeText "chromium-startup.html" ''
@@ -43,14 +44,20 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
       xdoScript = pkgs.writeText "${name}.xdo" text;
     in "${pkgs.xdotool}/bin/xdotool '${xdoScript}'";
   in ''
+    # Run as user alice
+    sub ru ($) {
+      my $esc = $_[0] =~ s/'/'\\${"'"}'/gr;
+      return "su - alice -c '$esc'";
+    }
+
     sub createNewWin {
       $machine->nest("creating a new Chromium window", sub {
-        $machine->execute("${xdo "new-window" ''
+        $machine->execute(ru "${xdo "new-window" ''
           search --onlyvisible --name "startup done"
           windowfocus --sync
           windowactivate --sync
         ''}");
-        $machine->execute("${xdo "new-window" ''
+        $machine->execute(ru "${xdo "new-window" ''
           key Ctrl+n
         ''}");
       });
@@ -58,16 +65,16 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
 
     sub closeWin {
       Machine::retry sub {
-        $machine->execute("${xdo "close-window" ''
+        $machine->execute(ru "${xdo "close-window" ''
           search --onlyvisible --name "new tab"
           windowfocus --sync
           windowactivate --sync
         ''}");
-        $machine->execute("${xdo "close-window" ''
+        $machine->execute(ru "${xdo "close-window" ''
           key Ctrl+w
         ''}");
         for (1..20) {
-          my ($status, $out) = $machine->execute("${xdo "wait-for-close" ''
+          my ($status, $out) = $machine->execute(ru "${xdo "wait-for-close" ''
             search --onlyvisible --name "new tab"
           ''}");
           return 1 if $status != 0;
@@ -80,7 +87,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
       my $ret = 0;
       $machine->nest("waiting for new Chromium window to appear", sub {
         for (1..20) {
-          my ($status, $out) = $machine->execute("${xdo "wait-for-window" ''
+          my ($status, $out) = $machine->execute(ru "${xdo "wait-for-window" ''
             search --onlyvisible --name "new tab"
             windowfocus --sync
             windowactivate --sync
@@ -113,13 +120,9 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
     $machine->waitForX;
 
     my $url = "file://${startupHTML}";
-    my $args = "--user-data-dir=/tmp/chromium-${channel}";
-    $machine->execute(
-      "ulimit -c unlimited; ".
-      "chromium $args \"$url\" & disown"
-    );
+    $machine->execute(ru "ulimit -c unlimited; chromium \"$url\" & disown");
     $machine->waitForText(qr/startup done/);
-    $machine->waitUntilSucceeds("${xdo "check-startup" ''
+    $machine->waitUntilSucceeds(ru "${xdo "check-startup" ''
       search --sync --onlyvisible --name "startup done"
       # close first start help popup
       key -delay 1000 Escape
@@ -134,13 +137,13 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
     $machine->screenshot("startup_done");
 
     testNewWin "check sandbox", sub {
-      $machine->succeed("${xdo "type-url" ''
+      $machine->succeed(ru "${xdo "type-url" ''
         search --sync --onlyvisible --name "new tab"
         windowfocus --sync
         type --delay 1000 "chrome://sandbox"
       ''}");
 
-      $machine->succeed("${xdo "submit-url" ''
+      $machine->succeed(ru "${xdo "submit-url" ''
         search --sync --onlyvisible --name "new tab"
         windowfocus --sync
         key --delay 1000 Return
@@ -148,15 +151,15 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
 
       $machine->screenshot("sandbox_info");
 
-      $machine->succeed("${xdo "submit-url" ''
+      $machine->succeed(ru "${xdo "submit-url" ''
         search --sync --onlyvisible --name "sandbox status"
         windowfocus --sync
       ''}");
-      $machine->succeed("${xdo "submit-url" ''
+      $machine->succeed(ru "${xdo "submit-url" ''
         key --delay 1000 Ctrl+a Ctrl+c
       ''}");
 
-      my $clipboard = $machine->succeed("${pkgs.xclip}/bin/xclip -o");
+      my $clipboard = $machine->succeed(ru "${pkgs.xclip}/bin/xclip -o");
       die "sandbox not working properly: $clipboard"
       unless $clipboard =~ /namespace sandbox.*yes/mi
           && $clipboard =~ /pid namespaces.*yes/mi

From 651d5019bc31055788818287d3264c55d6a03be3 Mon Sep 17 00:00:00 2001
From: Jake Waksbaum <jake.waksbaum@gmail.com>
Date: Tue, 7 Feb 2017 03:01:33 -0500
Subject: [PATCH 540/899] pstoedit,plotutils: fix for darwin and mark not
 broken (#22196)

pstoedit,plotutils: fix for darwin
---
 pkgs/tools/graphics/plotutils/default.nix |  2 +-
 pkgs/tools/graphics/pstoedit/default.nix  | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix
index c6bde4c5b0c..219bfdf8c14 100644
--- a/pkgs/tools/graphics/plotutils/default.nix
+++ b/pkgs/tools/graphics/plotutils/default.nix
@@ -52,6 +52,6 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.gnu;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix
index 93fc901aacf..170dfdac2b6 100644
--- a/pkgs/tools/graphics/pstoedit/default.nix
+++ b/pkgs/tools/graphics/pstoedit/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig
+{ stdenv, fetchurl, pkgconfig, darwin, lib
 , zlib, ghostscript, imagemagick, plotutils, gd
-, libjpeg, libwebp
+, libjpeg, libwebp, libiconv
 }:
 
 stdenv.mkDerivation rec {
@@ -13,13 +13,16 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ zlib ghostscript imagemagick plotutils gd libjpeg libwebp ];
+  buildInputs = [ zlib ghostscript imagemagick plotutils gd libjpeg libwebp ] 
+  ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+    libiconv ApplicationServices
+  ]);
 
   meta = with stdenv.lib; {
     description = "Translates PostScript and PDF graphics into other vector formats";
     homepage = https://sourceforge.net/projects/pstoedit/;
     license = licenses.gpl2;
     maintainers = [ maintainers.marcweber ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From 6640fe2e1e6b7f42fbf3a0c0648428c31c830c6e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 7 Feb 2017 08:48:40 +0100
Subject: [PATCH 541/899] pythonPackages.sphinx: fix make-mode, fixes #22501

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 51703404ac4..ddf5afaf5e5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24480,6 +24480,13 @@ in {
       imagesize
       requests2
     ];
+
+    # https://github.com/NixOS/nixpkgs/issues/22501
+    # Do not run `python sphinx-build arguments` but `sphinx-build arguments`.
+    postPatch = ''
+      substituteInPlace sphinx/make_mode.py --replace "sys.executable, " ""
+    '';
+
     meta = {
       description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects";
       homepage = http://sphinx.pocoo.org/;

From c73045ef1094de9323095ec3bef303a316f19a37 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 7 Feb 2017 08:49:04 +0100
Subject: [PATCH 542/899] pythonPackages.sphinx: 1.5.1 -> 1.5.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ddf5afaf5e5..c74885d6012 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24456,16 +24456,16 @@ in {
   sphinx = buildPythonPackage (rec {
     name = "${pname}-${version}";
     pname = "Sphinx";
-    version = "1.5.1";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-      sha256 = "8e6a77a20b2df950de322fc32f3b508697d9d654fe984e3cc88f446a5b4c17c5";
+    version = "1.5.2";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "049c48393909e4704a6ed4de76fd39c8622e165414660bfb767e981e7931c722";
     };
     LC_ALL = "en_US.UTF-8";
-    buildInputs = with self; [ nose simplejson mock pkgs.glibcLocales html5lib ] ++ optional (pythonOlder "3.4") self.enum34;
+    buildInputs = with self; [ pytest simplejson mock pkgs.glibcLocales html5lib ] ++ optional (pythonOlder "3.4") self.enum34;
     # Disable two tests that require network access.
     checkPhase = ''
-      NOSE_EXCLUDE=test_defaults,test_anchors_ignored make test
+      cd tests; ${python.interpreter} run.py --ignore py35 -k 'not test_defaults and not test_anchors_ignored'
     '';
     propagatedBuildInputs = with self; [
       docutils

From aeaf893e5733cb333256cb46f3925d69be103e38 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Thu, 1 Sep 2016 09:36:56 +0200
Subject: [PATCH 543/899] dafny: init at v1.9.8

---
 pkgs/top-level/all-packages.nix    |  2 ++
 pkgs/top-level/dotnet-packages.nix | 45 ++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 299e4d1b846..e1cad0b7810 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16993,6 +16993,8 @@ with pkgs;
 
   ### SCIENCE/PROGRAMMING
 
+  dafny = dotnetPackages.Dafny;
+
   plm = callPackage ../applications/science/programming/plm { };
 
   ### SCIENCE/LOGIC
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 0e53e820a39..30267a5ad96 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -252,6 +252,51 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     };
   };
 
+  Dafny = buildDotnetPackage rec {
+    baseName = "Dafny";
+    version = "1.9.8";
+
+    src = fetchurl {
+      url = "https://github.com/Microsoft/dafny/archive/v${version}.tar.gz";
+      sha256 = "0n4pk4cv7d2zsn4xmyjlxvpfl9avq79r06c7kzmrng24p3k4qj6s";
+    };
+
+    preBuild = ''
+      ln -s ${pkgs.z3} Binaries/z3
+    '';
+
+    buildInputs = [ Boogie ];
+
+    xBuildFiles = [ "Source/Dafny.sln" ];
+    xBuildFlags = [ ];
+
+    outputFiles = [ "Binaries/*" ];
+
+    # Do not wrap the z3 executable, only dafny-related ones.
+    exeFiles = [ "Dafny*.exe" ];
+
+    # Dafny needs mono in its path.
+    makeWrapperArgs = "--set PATH ${mono}/bin";
+
+    # Boogie as an input is not enough. Boogie libraries need to be at the same
+    # place as Dafny ones. Same for "*.dll.mdb". No idea why or how to fix.
+    postFixup = ''
+      for lib in ${Boogie}/lib/dotnet/${Boogie.baseName}/*.dll{,.mdb}; do
+        ln -s $lib $out/lib/dotnet/${baseName}/
+      done
+      # We generate our own executable scripts
+      rm -f $out/lib/dotnet/${baseName}/dafny{,-server}
+    '';
+
+    meta = {
+      description = "A programming language with built-in specification constructs";
+      homepage = "http://research.microsoft.com/dafny";
+      maintainers = with maintainers; [ layus ];
+      license = licenses.MIT;
+      platforms = with platforms; (linux ++ darwin);
+    };
+  };
+
   Deedle = buildDotnetPackage rec {
     baseName = "Deedle";
     version = "1.2.0";

From cf94e1862707aa48f423ce441b4bc058c1fe39a0 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 7 Feb 2017 09:28:32 +0100
Subject: [PATCH 544/899] linux-testing: 4.10-rc4 -> 4.10-rc7

Tested via building the linux_testing attribute only, not in production.

Verified unpacked tarball with GnuPG:

gpg: Signature made Mon 06 Feb 2017 12:21:50 AM CET
gpg:                using RSA key 79BE3E4300411886
gpg: Good signature from "Linus Torvalds <torvalds@linux-foundation.org>" [unknown]
Primary key fingerprint: ABAF 11C6 5A29 70B1 30AB  E3C4 79BE 3E43 0041 1886

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 1778f343903..e3a4206f1ca 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.10-rc4";
-  modDirVersion = "4.10.0-rc4";
+  version = "4.10-rc7";
+  modDirVersion = "4.10.0-rc7";
   extraMeta.branch = "4.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "0rsi9iw8ag3lcy4yjrr6ipf7zpm3f206anv5xzkn2mi1r4vfndvp";
+    sha256 = "01jq4bxb8jcnawhsklc9aa2ba9sg7k5g97jp0slpbi8xw71dripl";
   };
 
   features.iwlwifi = true;

From 25b61cc897ccca0c01fb2c8cb73cd5a283f749d2 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 7 Feb 2017 10:52:18 +0100
Subject: [PATCH 545/899] pyocr: Use skip instead of expectedFailure

Since the update of imagemagick in
5e753c1a65e106ffaeb71ad3fa66a13b2dfaf5d5 there are certain test cases
which now unexpectly succeed and in turn cause the whole build to fail.

So in order to prevent this from happening let's skip those tests
properly instead of running them and expect them to fail.

Tested by building pythonPackages.pyocr on x86_64-linux.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c74885d6012..84971210b6c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20657,7 +20657,7 @@ in {
       for test in $disabledTests; do
         file="''${test%%:*}"
         fun="''${test#*:}"
-        echo "$fun = unittest.expectedFailure($fun)" >> "tests/tests_$file.py"
+        echo "$fun = unittest.skip($fun)" >> "tests/tests_$file.py"
       done
     '';
 

From f7b7d8e7b59f5e13338be76256e8b524eb993959 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Tue, 7 Feb 2017 10:30:36 +0100
Subject: [PATCH 546/899] dafny: fix meta attribute

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 30267a5ad96..71f2326b937 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -288,11 +288,11 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
       rm -f $out/lib/dotnet/${baseName}/dafny{,-server}
     '';
 
-    meta = {
+    meta = with stdenv.lib; {
       description = "A programming language with built-in specification constructs";
       homepage = "http://research.microsoft.com/dafny";
       maintainers = with maintainers; [ layus ];
-      license = licenses.MIT;
+      license = licenses.mit;
       platforms = with platforms; (linux ++ darwin);
     };
   };

From 83865b2c6cba71c15336ab9aefa3b6bed6986abe Mon Sep 17 00:00:00 2001
From: Kier Davis <kierdavis@gmail.com>
Date: Sat, 4 Feb 2017 20:24:48 +0000
Subject: [PATCH 547/899] intel-ocl: init at r4.0-59481

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

diff --git a/pkgs/os-specific/linux/intel-ocl/default.nix b/pkgs/os-specific/linux/intel-ocl/default.nix
new file mode 100644
index 00000000000..688cfbb8df5
--- /dev/null
+++ b/pkgs/os-specific/linux/intel-ocl/default.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchzip, rpmextract, ncurses5, numactl, zlib }:
+
+stdenv.mkDerivation rec {
+  version = "r4.0-59481";
+  name = "intel-ocl-${version}";
+
+  src = fetchzip {
+    url = "https://software.intel.com/sites/default/files/managed/48/96/SRB4_linux64.zip";
+    sha256 = "1q69g28i6l7p13hnsk82g2qhdf2chwh4f0wvzac6xml67hna3v34";
+    stripRoot = false;
+  };
+
+  buildInputs = [ rpmextract ];
+
+  sourceRoot = ".";
+
+  libPath = stdenv.lib.makeLibraryPath [
+    stdenv.cc.cc.lib
+    ncurses5
+    numactl
+    zlib
+  ];
+
+  postUnpack = ''
+    # Extract the RPMs contained within the source ZIP.
+    rpmextract SRB4_linux64.zip/intel-opencl-${version}.x86_64.rpm
+    rpmextract SRB4_linux64.zip/intel-opencl-cpu-${version}.x86_64.rpm
+  '';
+
+  patchPhase = ''
+    # Remove libOpenCL.so, since we use ocl-icd's libOpenCL.so instead and this would cause a clash.
+    rm opt/intel/opencl/libOpenCL.so*
+
+    # Patch shared libraries.
+    for lib in opt/intel/opencl/*.so; do
+      patchelf --set-rpath "${libPath}:$out/lib/intel-ocl" $lib || true
+    done
+  '';
+
+  buildPhase = ''
+    # Create ICD file, which just contains the path of the corresponding shared library.
+    echo "$out/lib/intel-ocl/libintelocl.so" > intel.icd
+  '';
+
+  installPhase = ''
+    install -D -m 0755 opt/intel/opencl/*.so* -t $out/lib/intel-ocl
+    install -D -m 0644 opt/intel/opencl/*.{o,rtl,bin} -t $out/lib/intel-ocl
+    install -D -m 0644 opt/intel/opencl/{LICENSE,NOTICES} -t $out/share/doc/intel-ocl
+    install -D -m 0644 intel.icd -t $out/etc/OpenCL/vendors
+  '';
+
+  dontStrip = true;
+
+  meta = {
+    description = "Official OpenCL runtime for Intel CPUs";
+    homepage    = https://software.intel.com/en-us/articles/opencl-drivers;
+    license     = stdenv.lib.licenses.unfree;
+    platforms   = [ "x86_64-linux" ];
+    maintainers = [ stdenv.lib.maintainers.kierdavis ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a16ecc797be..e9e20f795fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11086,6 +11086,8 @@ with pkgs;
 
   intel2200BGFirmware = callPackage ../os-specific/linux/firmware/intel2200BGFirmware { };
 
+  intel-ocl = callPackage ../os-specific/linux/intel-ocl { };
+
   iomelt = callPackage ../os-specific/linux/iomelt { };
 
   iotop = callPackage ../os-specific/linux/iotop { };

From af4e6f155e29df6a8b4c938f0e79eb7be706f447 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 7 Feb 2017 13:16:17 +0100
Subject: [PATCH 548/899] nixos.chrony: pass config file directly to daemon

This fixes an issue where `nixops deploy` wouldn't restart the chrony
service when the chrony configuration changed, because it wouldn't
detect that `/etc/chrony.conf` was a dependency of the chrony service.
---
 nixos/modules/services/networking/chrony.nix | 39 ++++++++++----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/nixos/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix
index f2ff11633b1..ff62acff6eb 100644
--- a/nixos/modules/services/networking/chrony.nix
+++ b/nixos/modules/services/networking/chrony.nix
@@ -12,6 +12,24 @@ let
 
   cfg = config.services.chrony;
 
+  configFile = pkgs.writeText "chrony.conf" ''
+    ${concatMapStringsSep "\n" (server: "server " + server) cfg.servers}
+
+    ${optionalString
+      cfg.initstepslew.enabled
+      "initstepslew ${toString cfg.initstepslew.threshold} ${concatStringsSep " " cfg.initstepslew.servers}"
+    }
+
+    driftfile ${stateDir}/chrony.drift
+
+    keyfile ${keyFile}
+    generatecommandkey
+
+    ${optionalString (!config.time.hardwareClockInLocalTime) "rtconutc"}
+
+    ${cfg.extraConfig}
+  '';
+
 in
 
 {
@@ -70,25 +88,6 @@ in
     # Make chronyc available in the system path
     environment.systemPackages = [ pkgs.chrony ];
 
-    environment.etc."chrony.conf".text =
-      ''
-        ${concatMapStringsSep "\n" (server: "server " + server) cfg.servers}
-
-        ${optionalString
-          cfg.initstepslew.enabled
-          "initstepslew ${toString cfg.initstepslew.threshold} ${concatStringsSep " " cfg.initstepslew.servers}"
-        }
-
-        driftfile ${stateDir}/chrony.drift
-
-        keyfile ${keyFile}
-        generatecommandkey
-
-        ${optionalString (!config.time.hardwareClockInLocalTime) "rtconutc"}
-
-        ${cfg.extraConfig}
-      '';
-
     users.extraGroups = singleton
       { name = "chrony";
         gid = config.ids.gids.chrony;
@@ -124,7 +123,7 @@ in
           '';
 
         serviceConfig =
-          { ExecStart = "${pkgs.chrony}/bin/chronyd -n -m -u chrony";
+          { ExecStart = "${pkgs.chrony}/bin/chronyd -n -m -u chrony -f ${configFile}";
           };
       };
 

From f031f3105a814ec8e9c8d3930c7d3cdd9c3dc9c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 2 Jan 2017 17:19:28 +0100
Subject: [PATCH 549/899] GHC 8.0.2: use -split-sections

-split-sections replaced -split-objs with following upsides:

1) -split-objs adds considerable overhead to compile time

2) combined with stripping, it causes issues when cross-compiling

For upstream see https://ghc.haskell.org/trac/ghc/ticket/8405

This is supported only for Linux/Windows using ld linker.

GHC master also turns on -split-sections by default.

Example using stack:

Without splitting

  $ du /nix/store/5paayhibayr73zqfaj458g4k4mv108jn-stack-1.3.2
  4       /nix/store/5paayhibayr73zqfaj458g4k4mv108jn-stack-1.3.2/share/bash-completion/completions
  4       /nix/store/5paayhibayr73zqfaj458g4k4mv108jn-stack-1.3.2/share/bash-completion
  4       /nix/store/5paayhibayr73zqfaj458g4k4mv108jn-stack-1.3.2/share
  23416   /nix/store/5paayhibayr73zqfaj458g4k4mv108jn-stack-1.3.2/bin
  23420   /nix/store/5paayhibayr73zqfaj458g4k4mv108jn-stack-1.3.2

With -split-objs

  $ du /nix/store/fypymm529adpx71gdzm0851xz42wdbz0-stack-1.3.2
  20632   /nix/store/fypymm529adpx71gdzm0851xz42wdbz0-stack-1.3.2/bin
  4 /nix/store/fypymm529adpx71gdzm0851xz42wdbz0-stack-1.3.2/share/bash-completion/completions
  4 /nix/store/fypymm529adpx71gdzm0851xz42wdbz0-stack-1.3.2/share/bash-completion
  4       /nix/store/fypymm529adpx71gdzm0851xz42wdbz0-stack-1.3.2/share
  20636   /nix/store/fypymm529adpx71gdzm0851xz42wdbz0-stack-1.3.2

With -split-sections

  $ du /nix/store/40l6krinx1zx41lr87c4m12hxj4ldf3x-stack-1.3.2
  4       /nix/store/40l6krinx1zx41lr87c4m12hxj4ldf3x-stack-1.3.2/share/bash-completion/completions
  4       /nix/store/40l6krinx1zx41lr87c4m12hxj4ldf3x-stack-1.3.2/share/bash-completion
  4       /nix/store/40l6krinx1zx41lr87c4m12hxj4ldf3x-stack-1.3.2/share
  20672   /nix/store/40l6krinx1zx41lr87c4m12hxj4ldf3x-stack-1.3.2/bin
  20676   /nix/store/40l6krinx1zx41lr87c4m12hxj4ldf3x-stack-1.3.2

Note: you currently need following overrides to build stack on 802:

   vector-algorithms = dontCheck super.vector-algorithms;
   path-io = doJailbreak super.path-io;
   stack = doJailbreak super.stack;

Note: Should also work on GHC 8.0.1, but I'm being careful here.
      We could backport later on.
---
 pkgs/development/haskell-modules/generic-builder.nix | 9 +++++++--
 pkgs/development/haskell-modules/lib.nix             | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 7a421e4f7b6..09ab30bb176 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -20,7 +20,8 @@
 # TODO enable shared libs for cross-compiling
 , enableSharedExecutables ? !isCross && (((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version))
 , enableSharedLibraries ? !isCross && (((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version))
-, enableSplitObjs ? !stdenv.isDarwin # http://hackage.haskell.org/trac/ghc/ticket/4013
+, enableSplitObjs ? null # OBSOLETE, use enableDeadCodeElimination
+, enableDeadCodeElimination ? (!stdenv.isDarwin)  # TODO: use -dead_strip  for darwin
 , enableStaticLibraries ? true
 , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? []
 , homepage ? "http://hackage.haskell.org/package/${pname}"
@@ -53,6 +54,8 @@
 } @ args:
 
 assert editedCabalFile != null -> revision != null;
+# OBSOLETE, use enableDeadCodeElimination
+assert enableSplitObjs == null;
 
 let
 
@@ -108,13 +111,15 @@ let
     (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names")
     (optionalString enableParallelBuilding "--ghc-option=-j$NIX_BUILD_CORES")
     (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp")
-    (enableFeature enableSplitObjs "split-objs")
+    (enableFeature (enableDeadCodeElimination && (stdenv.lib.versionAtLeast "8.0.1" ghc.version)) "split-objs")
     (enableFeature enableLibraryProfiling "library-profiling")
     (enableFeature enableExecutableProfiling (if versionOlder ghc.version "8" then "executable-profiling" else "profiling"))
     (enableFeature enableSharedLibraries "shared")
     (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature enableStaticLibraries "library-vanilla"))
     (optionalString (isGhcjs || versionOlder "7.4" ghc.version) (enableFeature enableSharedExecutables "executable-dynamic"))
     (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature doCheck "tests"))
+  ] ++ optionals (enableDeadCodeElimination && (stdenv.lib.versionOlder "8.0.1" ghc.version)) [
+     "--ghc-option=-split-sections"
   ] ++ optionals isGhcjs [
     "--with-hsc2hs=${nativeGhc}/bin/hsc2hs"
     "--ghcjs"
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 246a9f305db..f7c9811234e 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -50,8 +50,8 @@ rec {
   enableSharedLibraries = drv: overrideCabal drv (drv: { enableSharedLibraries = true; });
   disableSharedLibraries = drv: overrideCabal drv (drv: { enableSharedLibraries = false; });
 
-  enableSplitObjs = drv: overrideCabal drv (drv: { enableSplitObjs = true; });
-  disableSplitObjs = drv: overrideCabal drv (drv: { enableSplitObjs = false; });
+  enableDeadCodeElimination = drv: overrideCabal drv (drv: { enableDeadCodeElimination = true; });
+  disableDeadCodeElimination = drv: overrideCabal drv (drv: { enableDeadCodeElimination = false; });
 
   enableStaticLibraries = drv: overrideCabal drv (drv: { enableStaticLibraries = true; });
   disableStaticLibraries = drv: overrideCabal drv (drv: { enableStaticLibraries = false; });

From 868eb826e1caad0f387c173e5b78716b0a511dd7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 5 Feb 2017 11:07:49 +0100
Subject: [PATCH 550/899] LTS Haskell 7.19

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 75b59ced71c..3a9bd4c2f4d 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -37,7 +37,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 7.18
+  # LTS Haskell 7.19
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Vector ==2.3.2
@@ -55,7 +55,7 @@ default-package-overrides:
   - aeson-casing ==0.1.0.5
   - aeson-compat ==0.3.6
   - aeson-generic-compat ==0.0.1.0
-  - aeson-injector ==1.0.6.0
+  - aeson-injector ==1.0.7.0
   - aeson-pretty ==0.8.2
   - aeson-qq ==0.8.1
   - aeson-utils ==0.3.0.2
@@ -261,6 +261,7 @@ default-package-overrides:
   - c2hs ==0.28.1
   - Cabal ==1.24.2.0
   - cabal-dependency-licenses ==0.1.2.0
+  - cabal-doctest ==1
   - cabal-file-th ==0.2.4
   - cabal-helper ==0.7.3.0
   - cabal-rpm ==0.10.1
@@ -329,7 +330,7 @@ default-package-overrides:
   - clumpiness ==0.17.0.0
   - ClustalParser ==1.1.4
   - clustering ==0.2.1
-  - cmark ==0.5.4
+  - cmark ==0.5.5
   - cmark-highlight ==0.2.0.0
   - cmark-lucid ==0.1.0.0
   - cmdargs ==0.10.14
@@ -463,7 +464,7 @@ default-package-overrides:
   - distributed-closure ==0.3.3.0
   - distributed-static ==0.3.5.0
   - distribution-nixpkgs ==1.0.0.1
-  - distributive ==0.5.1
+  - distributive ==0.5.2
   - diversity ==0.8.0.1
   - djinn-ghc ==0.0.2.3
   - djinn-lib ==0.0.1.2
@@ -493,7 +494,7 @@ default-package-overrides:
   - easy-file ==0.2.1
   - Ebnf2ps ==1.0.15
   - ed25519 ==0.0.5.0
-  - ede ==0.2.8.6
+  - ede ==0.2.8.7
   - EdisonAPI ==1.3.1
   - EdisonCore ==1.3.1.1
   - edit-distance ==0.2.2.1
@@ -544,7 +545,7 @@ default-package-overrides:
   - farmhash ==0.1.0.5
   - fast-builder ==0.0.0.6
   - fast-digits ==0.2.1.0
-  - fast-logger ==2.4.8
+  - fast-logger ==2.4.10
   - fasta ==0.10.4.0
   - fay ==0.23.1.12
   - fay-base ==0.20.0.1
@@ -609,7 +610,7 @@ default-package-overrides:
   - generic-xmlpickler ==0.1.0.5
   - GenericPretty ==1.2.1
   - generics-eot ==0.2.1.1
-  - generics-sop ==0.2.3.0
+  - generics-sop ==0.2.4.0
   - generics-sop-lens ==0.1.2.1
   - geniplate-mirror ==0.7.4
   - genvalidity ==0.2.0.4
@@ -819,7 +820,7 @@ default-package-overrides:
   - HaskellNet-SSL ==0.3.3.0
   - haskintex ==0.6.0.1
   - haskoin-core ==0.4.0
-  - hasql ==0.19.15.2
+  - hasql ==0.19.16
   - hastache ==0.6.1
   - hasty-hamiltonian ==1.1.5
   - HaTeX ==3.17.1.0
@@ -847,7 +848,7 @@ default-package-overrides:
   - hid ==0.2.2
   - hidapi ==0.1.4
   - hierarchical-clustering ==0.4.6
-  - highlighting-kate ==0.6.3
+  - highlighting-kate ==0.6.4
   - hinotify ==0.3.9
   - hint ==0.6.0
   - hip ==1.2.0.0
@@ -1052,7 +1053,7 @@ default-package-overrides:
   - knob ==0.1.1
   - koofr-client ==1.0.0.3
   - kraken ==0.0.3
-  - lackey ==0.4.1
+  - lackey ==0.4.2
   - language-c ==0.5.0
   - language-c-quote ==0.11.7.1
   - language-dockerfile ==0.3.5.0
@@ -1177,7 +1178,7 @@ default-package-overrides:
   - monad-time ==0.2
   - monad-unlift ==0.2.0
   - monad-unlift-ref ==0.2.0
-  - monadcryptorandom ==0.7.0
+  - monadcryptorandom ==0.7.1
   - monadic-arrays ==0.2.2
   - monadLib ==3.7.3
   - monadloc ==0.7.1
@@ -1295,7 +1296,7 @@ default-package-overrides:
   - parsec ==3.1.11
   - parsers ==0.12.4
   - partial-handler ==1.0.2
-  - path ==0.5.11
+  - path ==0.5.12
   - path-extra ==0.0.3
   - path-io ==1.2.2
   - path-pieces ==0.2.1
@@ -1361,7 +1362,7 @@ default-package-overrides:
   - polyparse ==1.12
   - posix-realtime ==0.0.0.4
   - post-mess-age ==0.2.1.0
-  - postgresql-binary ==0.9.1.1
+  - postgresql-binary ==0.9.2
   - postgresql-libpq ==0.9.3.0
   - postgresql-query ==3.0.1
   - postgresql-schema ==0.1.10
@@ -1443,7 +1444,7 @@ default-package-overrides:
   - readable ==0.3.1
   - ReadArgs ==1.2.3
   - readline ==1.0.3.0
-  - rebase ==1.0.6
+  - rebase ==1.0.8
   - redis-io ==0.7.0
   - redis-resp ==0.4.0
   - reducers ==3.12.1
@@ -1467,7 +1468,7 @@ default-package-overrides:
   - regex-tdfa ==1.2.2
   - regex-tdfa-text ==1.0.0.3
   - reinterpret-cast ==0.1.0
-  - relational-query ==0.8.3.2
+  - relational-query ==0.8.3.4
   - relational-query-HDBC ==0.6.0.2
   - relational-record ==0.1.5.1
   - relational-schemas ==0.1.3.1
@@ -1476,6 +1477,7 @@ default-package-overrides:
   - repa-algorithms ==3.4.1.1
   - repa-io ==3.4.1.1
   - RepLib ==0.5.4
+  - rerebase ==1.0.3
   - reroute ==0.4.0.1
   - resolve-trivial-conflicts ==0.3.2.4
   - resource-pool ==0.2.3.2
@@ -1517,7 +1519,7 @@ default-package-overrides:
   - scotty ==0.11.0
   - scrape-changes ==0.1.0.4
   - scrypt ==0.5.0
-  - sdl2 ==2.1.3
+  - sdl2 ==2.1.3.1
   - secp256k1 ==0.4.6
   - securemem ==0.1.9
   - SegmentTree ==0.3
@@ -1545,7 +1547,7 @@ default-package-overrides:
   - servant-server ==0.8.1
   - servant-subscriber ==0.5.0.3
   - servant-swagger ==1.1.2
-  - servant-swagger-ui ==0.2.1.2.2.8
+  - servant-swagger-ui ==0.2.2.2.2.8
   - servant-yaml ==0.1.0.0
   - serversession ==1.0.1
   - serversession-backend-acid-state ==1.0.3
@@ -1777,7 +1779,7 @@ default-package-overrides:
   - tree-fun ==0.8.1.0
   - tree-view ==0.4
   - tries ==0.0.4
-  - trifecta ==1.6.1
+  - trifecta ==1.6.2.1
   - true-name ==0.1.0.2
   - ttrie ==0.1.2.1
   - tttool ==1.6.1.2
@@ -1796,9 +1798,10 @@ default-package-overrides:
   - type-level-numbers ==0.1.1.1
   - type-list ==0.5.0.0
   - type-spec ==0.2.0.0
+  - typed-process ==0.1.0.0
   - typelits-witnesses ==0.2.3.0
   - typography-geometry ==1.0.0.1
-  - tzdata ==0.1.20160614.0
+  - tzdata ==0.1.20161123.0
   - ua-parser ==0.7.3
   - uglymemo ==0.1.0.1
   - unbound ==0.5.1
@@ -1893,7 +1896,7 @@ default-package-overrides:
   - wai-transformers ==0.0.7
   - wai-websockets ==3.0.1.1
   - waitra ==0.0.4.0
-  - warp ==3.2.10
+  - warp ==3.2.11
   - warp-tls ==3.2.3
   - web-plugins ==0.2.9
   - web-routes ==0.27.11
@@ -1966,17 +1969,17 @@ default-package-overrides:
   - yarr ==1.4.0.2
   - yes-precure5-command ==5.5.3
   - yesod ==1.4.4
-  - yesod-auth ==1.4.15
+  - yesod-auth ==1.4.16
   - yesod-auth-account ==1.4.3
   - yesod-auth-basic ==0.1.0.2
   - yesod-auth-hashdb ==1.5.1.3
   - yesod-auth-oauth2 ==0.2.2
-  - yesod-bin ==1.4.18.7
-  - yesod-core ==1.4.30
+  - yesod-bin ==1.5.1
+  - yesod-core ==1.4.31
   - yesod-eventsource ==1.4.0.1
   - yesod-fay ==0.8.0
   - yesod-fb ==0.3.4
-  - yesod-form ==1.4.9
+  - yesod-form ==1.4.10
   - yesod-form-richtext ==0.1.0.0
   - yesod-gitrepo ==0.2.1.0
   - yesod-gitrev ==0.1.0.0

From d0492177e38616a102f8365b28c1ab17e74b42ce Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 3 Feb 2017 10:30:15 +0100
Subject: [PATCH 551/899] hackage2nix: update list of broken packages

---
 .../configuration-hackage2nix.yaml            | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 3a9bd4c2f4d..0de3fc58a74 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2474,6 +2474,7 @@ dont-distribute-packages:
   battleships:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   bayes-stack:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   BCMtools:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bdd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   beam-th:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   beam:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   beamable:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2591,6 +2592,7 @@ dont-distribute-packages:
   blaze-html-hexpat:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   blaze-json:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   blaze-textual-native:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ble:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   blip:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bliplib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Blobs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2647,6 +2649,7 @@ dont-distribute-packages:
   buster-network:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Buster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   buster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bustle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   butterflies:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   byline:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytable:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2656,6 +2659,7 @@ dont-distribute-packages:
   bytestring-progress:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-read:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-rematch:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bytestring-typenats:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestringparser:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestringreadp:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   c-dsl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2852,6 +2856,7 @@ dont-distribute-packages:
   clevercss:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   CLI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   click-clack:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clif:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   clifford:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clippard:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clipper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3065,6 +3070,7 @@ dont-distribute-packages:
   crypto-enigma:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-multihash:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-random-effect:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  crypto-simple:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cryptsy-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   crystalfontz:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cse-ghc-plugin:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3326,6 +3332,7 @@ dont-distribute-packages:
   doctest-discover:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   DocTest:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   docvim:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  doi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   DOM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dominion:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   domplate:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3778,6 +3785,10 @@ dont-distribute-packages:
   gentlemark:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   GenussFold:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   genvalidity-containers:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  genvalidity-hspec-aeson:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  genvalidity-hspec-cereal:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  genvalidity-path:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  genvalidity-text:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   geo-resolver:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   GeocoderOpenCage:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   geodetic:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3920,6 +3931,7 @@ dont-distribute-packages:
   gooey:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-drive:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-html5-slide:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  google-oauth2-for-cli:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-oauth2-jwt:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-oauth2:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-translate:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3973,6 +3985,7 @@ dont-distribute-packages:
   graphics-formats-collada:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphicsFormats:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphicstools:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graphql-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphtype:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   graql:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   grasp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4038,6 +4051,7 @@ dont-distribute-packages:
   h2048:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   H:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haar:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  habit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hach:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-contrib-press:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-contrib:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4471,6 +4485,7 @@ dont-distribute-packages:
   hierarchy:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hiernotify:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hieroglyph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hifi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   HiggsSet:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   higher-leveldb:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   higherorder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4482,6 +4497,7 @@ dont-distribute-packages:
   hinquire:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinstaller:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hint-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hinterface:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinvaders:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinze-streams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hip:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4592,6 +4608,7 @@ dont-distribute-packages:
   hoq:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   horizon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hosts-server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hothasktags:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hotswap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hourglass-fuzzy-parsing:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   houseman:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4635,6 +4652,7 @@ dont-distribute-packages:
   HROOT-hist:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   HROOT-io:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HROOT-math:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HROOT-tree:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   HROOT:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hruby:                                        [ i686-linux, x86_64-darwin ]
   hs-blake2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4821,6 +4839,7 @@ dont-distribute-packages:
   hunt-searchengine:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hunt-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hurdle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hurriyet:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   husky:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hutton:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   huttons-razor:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4976,6 +4995,7 @@ dont-distribute-packages:
   interruptible:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   intro-prelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   intro:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  introduction-test:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   intset:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   invertible-syntax:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   invertible:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5466,6 +5486,7 @@ dont-distribute-packages:
   lvmlib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lxc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   lye:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Lykah:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   lzma-clib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lzma-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   lzma-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5474,6 +5495,7 @@ dont-distribute-packages:
   machinecell:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   machines-zlib:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   macosx-make-standalone:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  madlang:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mage:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   MagicHaskeller:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   magico:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5738,6 +5760,7 @@ dont-distribute-packages:
   multirec-binary:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   multirec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   multisetrewrite:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  multivariant:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Munkres-simple:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   muon:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   murder:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5790,6 +5813,7 @@ dont-distribute-packages:
   nanovg:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   nanq:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   narc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nat-sized-numbers:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   nats-queue:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   natural-number:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   NaturalLanguageAlphabets:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5949,6 +5973,7 @@ dont-distribute-packages:
   open-pandoc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   open-typerep:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   open-union:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  open-witness:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenAFP-Utils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenAFP:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenCL:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6294,6 +6319,7 @@ dont-distribute-packages:
   protobuf-native:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   protocol-buffers-descriptor-fork:             [ i686-linux, x86_64-linux, x86_64-darwin ]
   protocol-buffers-fork:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  protolude-lifted:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   proton-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   prove-everywhere-server:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   proxy-kindness:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6334,6 +6360,7 @@ dont-distribute-packages:
   qd:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   qed:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   qhull-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  qif:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   QIO:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   QLearn:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   qr-imager:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6363,6 +6390,7 @@ dont-distribute-packages:
   quickcheck-regex:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-relaxng:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-rematch:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quickcheck-special:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-webdriver:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-with-counterexamples:              [ i686-linux, x86_64-linux, x86_64-darwin ]
   QuickPlot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6420,6 +6448,7 @@ dont-distribute-packages:
   rawr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   raz:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   razom-text-util:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rbpcp-api:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   rbr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rcu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rdf4h:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6490,6 +6519,7 @@ dont-distribute-packages:
   regex-tre:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-type:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-xmlschema:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regex:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   regexchar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   regexdot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   regexp-tries:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6511,6 +6541,7 @@ dont-distribute-packages:
   reified-records:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   reify:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   reinterpret-cast:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  relapse:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   relation:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   relative-date:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   reload:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6546,6 +6577,7 @@ dont-distribute-packages:
   req:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   reqcatcher:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   request-monad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rerebase:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   resistor-cube:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   resource-effect:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   resource-embed:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6731,6 +6763,7 @@ dont-distribute-packages:
   semi-iso:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   semigroupoids-syntax:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   semigroups-actions:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  semiring-num:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   semiring:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   semver-range:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   sensei:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7215,6 +7248,7 @@ dont-distribute-packages:
   target:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   task-distribution:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   task:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tasty-auto:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-discover:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-fail-fast:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-groundhog-converters:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7277,6 +7311,7 @@ dont-distribute-packages:
   texrunner:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-all:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-and-plots:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  text-builder:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-generic-pretty:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-icu-normalized:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-json-qq:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7316,6 +7351,7 @@ dont-distribute-packages:
   Thingie:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   thorn:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   threads-extras:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  threepenny-gui-contextmenu:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   threepenny-gui:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Thrift:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   thrift:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7369,6 +7405,7 @@ dont-distribute-packages:
   to-haskell:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   to-string-class:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   to-string-instances:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  toboggan:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   todos:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   tofromxml:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   toilet:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7723,6 +7760,7 @@ dont-distribute-packages:
   whiskers:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   whitespace:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   why3:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wide-word:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   WikimediaParser:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   wikipedia4epub:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   windowslive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7781,6 +7819,7 @@ dont-distribute-packages:
   X11-xfixes:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   x11-xinput:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   x86-64bit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xcffib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   xchat-plugin:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   xcp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   xdcc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]

From 5a0368b87cc353d46226fc91329036d6c16a5c10 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 2 Feb 2017 11:34:48 +0100
Subject: [PATCH 552/899] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.0.4-10-g05c4803 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/5720a6c584761a60d01b4ba9e8702f814928bb1a.
---
 .../haskell-modules/hackage-packages.nix      | 1699 ++++++++++-------
 1 file changed, 1037 insertions(+), 662 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index b5b9954244a..cdf68fd0d0d 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -7829,8 +7829,8 @@ self: {
      }:
      mkDerivation {
        pname = "HROOT";
-       version = "0.9";
-       sha256 = "5a8e948e0970d901feafdc184270f1631314512b4bd967f0f16c83a640d1b975";
+       version = "0.9.0.1";
+       sha256 = "e8a677131caf8cef55d725a00993a22ed63792900617baa0189be72639a483d5";
        libraryHaskellDepends = [
          base fficxx fficxx-runtime HROOT-core HROOT-graf HROOT-hist
          HROOT-io HROOT-math HROOT-tree template-haskell
@@ -7839,15 +7839,14 @@ self: {
        description = "Haskell binding to the ROOT data analysis framework";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {HROOT-tree = null;};
+     }) {};
 
   "HROOT-core" = callPackage
     ({ mkDerivation, base, fficxx, fficxx-runtime, template-haskell }:
      mkDerivation {
        pname = "HROOT-core";
-       version = "0.9";
-       sha256 = "af2678d6fcd87531b2866b753e65b0c455216dd27c87fdfabb694201748bea83";
+       version = "0.9.0.1";
+       sha256 = "053dd486a4b0872fee1536eb5fcec930868c132c664ab3f6b01cb436c76eaae3";
        libraryHaskellDepends = [
          base fficxx fficxx-runtime template-haskell
        ];
@@ -7863,8 +7862,8 @@ self: {
      }:
      mkDerivation {
        pname = "HROOT-graf";
-       version = "0.9";
-       sha256 = "1e80209799bdceea7ef65e1dd6ca7d4e0d182209442ff3489d7fe5cd47fda552";
+       version = "0.9.0.1";
+       sha256 = "993866cd851a3fff908f5a4484b2ee217825f3a2a60ab0d124e6e3aca83e31a8";
        libraryHaskellDepends = [
          base fficxx fficxx-runtime HROOT-core HROOT-hist template-haskell
        ];
@@ -7880,8 +7879,8 @@ self: {
      }:
      mkDerivation {
        pname = "HROOT-hist";
-       version = "0.9";
-       sha256 = "18baee9511c105f92d11a9523f0b212e13d0975b733daf22733357cc56e04c5e";
+       version = "0.9.0.1";
+       sha256 = "4da911be3e79559af4cc7269db52e3cc6f380baaf9c302d06890a461b1a63015";
        libraryHaskellDepends = [
          base fficxx fficxx-runtime HROOT-core template-haskell
        ];
@@ -7897,8 +7896,8 @@ self: {
      }:
      mkDerivation {
        pname = "HROOT-io";
-       version = "0.9";
-       sha256 = "222bab39e503aa61775beb5904c72aa2e9018a46f4c4b2a9d0e68a5cd4c837ef";
+       version = "0.9.0.1";
+       sha256 = "1cebc91e14a3ebe98db155efef448884cadab0344879efaa68d7fa7dfd8ca34b";
        libraryHaskellDepends = [
          base fficxx fficxx-runtime HROOT-core template-haskell
        ];
@@ -7914,8 +7913,8 @@ self: {
      }:
      mkDerivation {
        pname = "HROOT-math";
-       version = "0.9";
-       sha256 = "f203711dac9891f394e9193f9bdf861edff163ec923b48f9c086961f6e1f6644";
+       version = "0.9.0.1";
+       sha256 = "2669f815a6b27dce14d561bdcb3d86ab7ea15c24ed9563e6893ab67a4c1d9d89";
        libraryHaskellDepends = [
          base fficxx fficxx-runtime HROOT-core template-haskell
        ];
@@ -7925,6 +7924,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "HROOT-tree" = callPackage
+    ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "HROOT-tree";
+       version = "0.9.0.1";
+       sha256 = "442e5c2a786b51b09229907f00b24021f5f1f5631ef8f5d5b4b582eaf28b0cf2";
+       libraryHaskellDepends = [
+         base fficxx fficxx-runtime HROOT-core template-haskell
+       ];
+       homepage = "http://ianwookim.org/HROOT";
+       description = "Haskell binding to ROOT Tree modules";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HRay" = callPackage
     ({ mkDerivation, array, base, directory, haskell98 }:
      mkDerivation {
@@ -11158,6 +11174,7 @@ self: {
        homepage = "http://johannesgerer.com/buchhaltung";
        description = "A static website and blog generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MASMGen" = callPackage
@@ -16011,6 +16028,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Spock_0_12_0_0" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, containers
+     , cryptonite, focus, hashable, hspec, hspec-wai, http-types, hvect
+     , list-t, monad-control, mtl, reroute, resource-pool, resourcet
+     , Spock-core, stm, stm-containers, text, time, transformers
+     , transformers-base, unordered-containers, vault, wai, wai-extra
+     }:
+     mkDerivation {
+       pname = "Spock";
+       version = "0.12.0.0";
+       sha256 = "8392d1ee34b46238c6bfe951080f06e11e1f3622d8402e7762c70aa61430e3d9";
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring containers cryptonite focus
+         hashable http-types hvect list-t monad-control mtl reroute
+         resource-pool resourcet Spock-core stm stm-containers text time
+         transformers transformers-base unordered-containers vault wai
+       ];
+       testHaskellDepends = [
+         base bytestring hspec hspec-wai Spock-core stm text time
+         unordered-containers vault wai wai-extra
+       ];
+       homepage = "https://www.spock.li";
+       description = "Another Haskell web framework for rapid development";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Spock-api" = callPackage
     ({ mkDerivation, aeson, base, deepseq, hvect, reroute }:
      mkDerivation {
@@ -16023,14 +16067,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Spock-api_0_12_0_0" = callPackage
+    ({ mkDerivation, aeson, base, deepseq, hvect, reroute }:
+     mkDerivation {
+       pname = "Spock-api";
+       version = "0.12.0.0";
+       sha256 = "8cfdbcbd2fa426c595fb7d29f8a6395dea17476c15d5ae863da2605b1c6ebe00";
+       libraryHaskellDepends = [ aeson base deepseq hvect reroute ];
+       homepage = "https://www.spock.li";
+       description = "Another Haskell web framework for rapid development";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Spock-api-ghcjs" = callPackage
     ({ mkDerivation, aeson, base, bytestring, ghcjs-base, hvect
      , Spock-api, text
      }:
      mkDerivation {
        pname = "Spock-api-ghcjs";
-       version = "0.11.0.0";
-       sha256 = "d533e4e76c50e8120675d0bbe1c7dd8d6909a4c7455cf0eea2ee75b7d868518c";
+       version = "0.12.0.0";
+       sha256 = "84a707da5f84417f5387731497bd51b8d80210b2be97e6afaa79b887568ea501";
        libraryHaskellDepends = [
          aeson base bytestring ghcjs-base hvect Spock-api text
        ];
@@ -16052,6 +16109,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Spock-api-server_0_12_0_0" = callPackage
+    ({ mkDerivation, base, hvect, mtl, Spock-api, Spock-core }:
+     mkDerivation {
+       pname = "Spock-api-server";
+       version = "0.12.0.0";
+       sha256 = "29734206823875ec71d7cad14bf012adb70b01700975e2181a7cb52713b131ce";
+       libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ];
+       homepage = "https://www.spock.li";
+       description = "Another Haskell web framework for rapid development";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Spock-auth" = callPackage
     ({ mkDerivation, base, http-types, Spock, text, time }:
      mkDerivation {
@@ -16091,6 +16161,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Spock-core_0_12_0_0" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , case-insensitive, containers, cookie, directory, hashable, hspec
+     , hspec-wai, http-api-data, http-types, hvect, mtl, old-locale
+     , reroute, resourcet, stm, superbuffer, text, time, transformers
+     , unordered-containers, vault, wai, wai-extra, warp
+     }:
+     mkDerivation {
+       pname = "Spock-core";
+       version = "0.12.0.0";
+       sha256 = "e69b70ea3027fa644d546bcae25bbf75e38abd6f4a7f88f0628fea6e16e97895";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring case-insensitive containers
+         cookie directory hashable http-api-data http-types hvect mtl
+         old-locale reroute resourcet stm superbuffer text time transformers
+         unordered-containers vault wai wai-extra warp
+       ];
+       testHaskellDepends = [
+         aeson base base64-bytestring bytestring hspec hspec-wai http-types
+         reroute text time transformers unordered-containers wai
+       ];
+       homepage = "https://www.spock.li";
+       description = "Another Haskell web framework for rapid development";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Spock-digestive" = callPackage
     ({ mkDerivation, base, digestive-functors, http-types, mtl
      , Spock-core, text, unordered-containers, wai
@@ -20510,8 +20607,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-injector";
-       version = "1.0.6.0";
-       sha256 = "3c0a68d4b3b55813eb3b4d93a0bd130504f367727308e77c01b8e1774024d78d";
+       version = "1.0.7.0";
+       sha256 = "de379a3727b81d537bd068d2b22dec4631daf193b992d4a0d9a878535eae41d8";
        libraryHaskellDepends = [
          aeson base bifunctors deepseq lens servant-docs swagger2 text
          unordered-containers
@@ -28440,6 +28537,23 @@ self: {
        license = "unknown";
      }) {};
 
+  "attoparsec-data" = callPackage
+    ({ mkDerivation, attoparsec, attoparsec-time, base, base-prelude
+     , bytestring, scientific, text, time
+     }:
+     mkDerivation {
+       pname = "attoparsec-data";
+       version = "0.1.1.2";
+       sha256 = "65ff7d4a796ea2c1991aeda1e288f0ff931e5fb1831d6571faa3cf68a9367b58";
+       libraryHaskellDepends = [
+         attoparsec attoparsec-time base base-prelude bytestring scientific
+         text time
+       ];
+       homepage = "https://github.com/nikita-volkov/attoparsec-data";
+       description = "Parsers for the standard Haskell data types";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "attoparsec-enumerator" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, enumerator, text }:
      mkDerivation {
@@ -29061,10 +29175,8 @@ self: {
      }:
      mkDerivation {
        pname = "avers-api";
-       version = "0.0.17.0";
-       sha256 = "affeffe0ac3c3eb15823fdb4c61654783ef8aff076bfb20b55c3df34be088182";
-       revision = "1";
-       editedCabalFile = "6ce2a1a63ecf6fcc5cd1d25ce3ee5b2756ebea0a78b7cc3a94fe73b3097668e3";
+       version = "0.0.18.0";
+       sha256 = "b1ba2ad32420636bf298efa7d4ff42fda9501672306f04b11c91aee1fe7805c5";
        libraryHaskellDepends = [
          aeson avers base bytestring cookie http-api-data servant text time
          vector
@@ -29081,10 +29193,8 @@ self: {
      }:
      mkDerivation {
        pname = "avers-api-docs";
-       version = "0.0.17.0";
-       sha256 = "24029af182f7eff072fa05615cea5cf69ab2c5b481f1b2df5f7a606714ca716f";
-       revision = "1";
-       editedCabalFile = "cfd40f6559ac3e05f5d0da009454b18208e7b76ec87a15fa7311d4f0a7caf7ec";
+       version = "0.0.18.0";
+       sha256 = "38a9f290cfd92ee922253337b30297dd5d3fa0db28c5aad5a0e6d01a205efca1";
        libraryHaskellDepends = [
          aeson avers avers-api base cookie lens servant servant-swagger
          swagger2 text unordered-containers
@@ -29104,10 +29214,8 @@ self: {
      }:
      mkDerivation {
        pname = "avers-server";
-       version = "0.0.17.0";
-       sha256 = "6da0c28f2b75989805cb4c2c7bf10b1b6ac4211f310d2bb902a4a7725ce05c3c";
-       revision = "3";
-       editedCabalFile = "025cc10ba6aa604876978781fcfbffbce27867d9155257411a7a40d4c4687988";
+       version = "0.0.18.0";
+       sha256 = "44ea17fd5f2351ae0c63d630f3c4a4879541f47b63b57bd447683d4644901cf7";
        libraryHaskellDepends = [
          aeson avers avers-api base base64-bytestring bytestring
          bytestring-conversion containers cookie cryptonite either
@@ -29288,22 +29396,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "aws_0_15" = callPackage
+  "aws_0_16" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , base64-bytestring, blaze-builder, byteable, bytestring
-     , case-insensitive, cereal, conduit, conduit-extra, containers
-     , cryptohash, data-default, directory, errors, filepath
-     , http-client, http-client-tls, http-conduit, http-types
-     , lifted-base, monad-control, mtl, network, old-locale, QuickCheck
-     , quickcheck-instances, resourcet, safe, scientific, tagged, tasty
-     , tasty-hunit, tasty-quickcheck, text, time, transformers
-     , transformers-base, unordered-containers, utf8-string, vector
-     , xml-conduit
+     , case-insensitive, cereal, conduit, conduit-combinators
+     , conduit-extra, containers, cryptohash, data-default, directory
+     , errors, filepath, http-client, http-client-tls, http-conduit
+     , http-types, lifted-base, monad-control, mtl, network, old-locale
+     , QuickCheck, quickcheck-instances, resourcet, safe, scientific
+     , tagged, tasty, tasty-hunit, tasty-quickcheck, text, time
+     , transformers, transformers-base, unordered-containers
+     , utf8-string, vector, xml-conduit
      }:
      mkDerivation {
        pname = "aws";
-       version = "0.15";
-       sha256 = "53c73595bddd5614d980486a380d4ce83c100fd25b5fa35d477609f1bd03b11b";
+       version = "0.16";
+       sha256 = "84b5c60227f3c9eddc0abf0881aee22443fc4a211b8a95f18be628eaa492209c";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          blaze-builder byteable bytestring case-insensitive cereal conduit
@@ -29313,10 +29421,10 @@ self: {
          unordered-containers utf8-string vector xml-conduit
        ];
        testHaskellDepends = [
-         aeson base bytestring errors http-client http-client-tls http-types
-         lifted-base monad-control mtl QuickCheck quickcheck-instances
-         resourcet tagged tasty tasty-hunit tasty-quickcheck text time
-         transformers transformers-base
+         aeson base bytestring conduit-combinators errors http-client
+         http-client-tls http-types lifted-base monad-control mtl QuickCheck
+         quickcheck-instances resourcet tagged tasty tasty-hunit
+         tasty-quickcheck text time transformers transformers-base
        ];
        homepage = "http://github.com/aristidb/aws";
        description = "Amazon Web Services (AWS) for Haskell";
@@ -30957,6 +31065,7 @@ self: {
        homepage = "http://github.com/humane-software/haskell-bdd";
        description = "Behavior-Driven Development DSL";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bdelta" = callPackage
@@ -34467,6 +34576,7 @@ self: {
        homepage = "http://github.com/plow-technologies/ble#readme";
        description = "Bluetooth Low Energy (BLE) peripherals";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blink1" = callPackage
@@ -36238,6 +36348,7 @@ self: {
        homepage = "http://www.freedesktop.org/wiki/Software/Bustle/";
        description = "Draw sequence diagrams of D-Bus traffic";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {system-glib = pkgs.glib;};
 
   "butterflies" = callPackage
@@ -36710,6 +36821,7 @@ self: {
        homepage = "https://github.com/tsuraan/bytestring-typenats";
        description = "Bytestrings with typenat lengths";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestringparser" = callPackage
@@ -39098,8 +39210,8 @@ self: {
     ({ mkDerivation, base, split }:
      mkDerivation {
        pname = "casing";
-       version = "0.1.0.1";
-       sha256 = "9039e45dc21851b7b6e5e58c79603beb27a03a79588c3176150d5c83d6e077ac";
+       version = "0.1.1.0";
+       sha256 = "db3ba2aa997885da68348ff8c71e98434edc5a80e8e665154ccbf6f9ee3b63fb";
        libraryHaskellDepends = [ base split ];
        description = "Convert between various source code casing conventions";
        license = stdenv.lib.licenses.mit;
@@ -42511,6 +42623,7 @@ self: {
        ];
        description = "A Clifford algebra number type for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clifford" = callPackage
@@ -42960,19 +43073,6 @@ self: {
      }) {};
 
   "cmark" = callPackage
-    ({ mkDerivation, base, bytestring, HUnit, text }:
-     mkDerivation {
-       pname = "cmark";
-       version = "0.5.4";
-       sha256 = "06f62f52870103be29c92eabfed84be96b4b38a12c3c0b96dffe61b3a0dfa807";
-       libraryHaskellDepends = [ base bytestring text ];
-       testHaskellDepends = [ base HUnit text ];
-       homepage = "https://github.com/jgm/cmark-hs";
-       description = "Fast, accurate CommonMark (Markdown) parser and renderer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cmark_0_5_5" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, text }:
      mkDerivation {
        pname = "cmark";
@@ -42983,7 +43083,6 @@ self: {
        homepage = "https://github.com/jgm/cmark-hs";
        description = "Fast, accurate CommonMark (Markdown) parser and renderer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cmark-highlight" = callPackage
@@ -48714,6 +48813,7 @@ self: {
        homepage = "https://github.com/Risto-Stevcev/haskell-crypto-simple#readme";
        description = "A simple high level encryption interface based on cryptonite";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crypto-totp" = callPackage
@@ -48945,6 +49045,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cryptonite-conduit_0_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, conduit-combinators
+     , conduit-extra, cryptonite, memory, resourcet, tasty, tasty-hunit
+     , transformers
+     }:
+     mkDerivation {
+       pname = "cryptonite-conduit";
+       version = "0.2.0";
+       sha256 = "15edae989ad62b0bdaf817bba8e711323b22d3a3466025f778a54757ba567628";
+       libraryHaskellDepends = [
+         base bytestring conduit conduit-extra cryptonite memory resourcet
+         transformers
+       ];
+       testHaskellDepends = [
+         base bytestring conduit conduit-combinators cryptonite memory tasty
+         tasty-hunit
+       ];
+       homepage = "https://github.com/haskell-crypto/cryptonite-conduit";
+       description = "cryptonite conduit";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cryptonite-openssl" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, memory, openssl
      , tasty, tasty-hunit, tasty-kat, tasty-quickcheck
@@ -54157,36 +54280,55 @@ self: {
 
   "dhall" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
-     , http-client, http-client-tls, microlens, microlens-mtl
-     , neat-interpolation, optparse-generic, parsers, system-fileio
-     , system-filepath, text, text-format, transformers, trifecta
-     , unordered-containers, vector
+     , http-client, http-client-tls, lens, neat-interpolation
+     , optparse-generic, parsers, system-fileio, system-filepath, text
+     , text-format, transformers, trifecta, unordered-containers, vector
      }:
      mkDerivation {
        pname = "dhall";
-       version = "1.0.2";
-       sha256 = "75816f0ca8c8c4bd764cc5d55654656839e72179bd047491ad7f9b7826fda845";
+       version = "1.1.0";
+       sha256 = "338152e2bd5e894f6d331f4c7230facb6585ebf789aab18b129d4873093f1302";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-wl-pprint base bytestring containers http-client
-         http-client-tls microlens microlens-mtl neat-interpolation parsers
-         system-fileio system-filepath text text-format transformers
-         trifecta unordered-containers vector
+         http-client-tls lens neat-interpolation parsers system-fileio
+         system-filepath text text-format transformers trifecta
+         unordered-containers vector
        ];
        executableHaskellDepends = [ base optparse-generic text trifecta ];
        description = "A configuration language guaranteed to terminate";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dhall-json" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, dhall, neat-interpolation
+     , optparse-generic, text, trifecta, vector, yaml
+     }:
+     mkDerivation {
+       pname = "dhall-json";
+       version = "1.0.0";
+       sha256 = "514e14a765b0fd360dad7aec62980ca02424d6670be9bf5b9a5a171835a7758d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base dhall neat-interpolation text vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring dhall optparse-generic text trifecta yaml
+       ];
+       description = "Compile Dhall to JSON or YAML";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dhall-nix" = callPackage
     ({ mkDerivation, base, containers, data-fix, dhall, hnix
      , neat-interpolation, optparse-generic, text, trifecta, vector
      }:
      mkDerivation {
        pname = "dhall-nix";
-       version = "1.0.0";
-       sha256 = "a3331f9fd1fb35cbd9aa4690fe755e85d89a3f66f28430108dd4f29f3a994e4e";
+       version = "1.0.1";
+       sha256 = "83e217056193e67bfa9b81074baeb0289372dd4bb185be4aff034956340d8f4c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -56093,6 +56235,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "distance-of-time" = callPackage
+    ({ mkDerivation, base, hspec, QuickCheck, time }:
+     mkDerivation {
+       pname = "distance-of-time";
+       version = "0.1.2.0";
+       sha256 = "f33ee0922bc8ad531407883de9ee70a396f53855f81e38f4ab1ddfb18432cd68";
+       libraryHaskellDepends = [ base time ];
+       testHaskellDepends = [ base hspec QuickCheck time ];
+       homepage = "https://github.com/joshuaclayton/distance-of-time#readme";
+       description = "Generate readable distances between times";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "distributed-closure" = callPackage
     ({ mkDerivation, base, binary, bytestring, constraints, hspec
      , QuickCheck, syb, template-haskell
@@ -56273,25 +56428,25 @@ self: {
   "distributed-process-extras" = callPackage
     ({ mkDerivation, ansi-terminal, base, binary, bytestring
      , containers, data-accessor, deepseq, distributed-process
-     , distributed-process-tests, distributed-static, fingertree
-     , ghc-prim, hashable, HUnit, mtl, network, network-transport
-     , network-transport-tcp, QuickCheck, rematch, stm, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, time
-     , transformers, unordered-containers
+     , distributed-process-systest, distributed-static, exceptions
+     , fingertree, ghc-prim, hashable, HUnit, mtl, network
+     , network-transport, network-transport-tcp, QuickCheck, rematch
+     , stm, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, time, transformers
+     , unordered-containers
      }:
      mkDerivation {
        pname = "distributed-process-extras";
-       version = "0.2.1.2";
-       sha256 = "c1a4e1a5e3ec30089251db40fd479b19c5fd74c9dd8ca50f8eb32aaf9747a048";
-       revision = "3";
-       editedCabalFile = "a7d9628e4fa3b916e130422a1370532cda52e1b1a2818574a38e9335fe0074c7";
+       version = "0.3.0";
+       sha256 = "bffa1640ec7f59bf415e18fb68e6085bf1cf96d4fc4c51c260ef554385e3cb36";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
-         fingertree hashable mtl stm time transformers unordered-containers
+         exceptions fingertree hashable mtl stm time transformers
+         unordered-containers
        ];
        testHaskellDepends = [
          ansi-terminal base binary bytestring containers data-accessor
-         deepseq distributed-process distributed-process-tests
+         deepseq distributed-process distributed-process-systest
          distributed-static fingertree ghc-prim hashable HUnit mtl network
          network-transport network-transport-tcp QuickCheck rematch stm
          test-framework test-framework-hunit test-framework-quickcheck2 time
@@ -56485,6 +56640,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "distributed-process-systest" = callPackage
+    ({ mkDerivation, ansi-terminal, base, binary, bytestring
+     , distributed-process, distributed-static, HUnit, network
+     , network-transport, random, rematch, stm, test-framework
+     , test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "distributed-process-systest";
+       version = "0.1.1";
+       sha256 = "a173434da0662635ecd4adebe49eedb5a0e4ec832020bf8e7c154c39b94e118e";
+       libraryHaskellDepends = [
+         ansi-terminal base binary bytestring distributed-process
+         distributed-static HUnit network network-transport random rematch
+         stm test-framework test-framework-hunit
+       ];
+       homepage = "http://github.com/haskell-distributed/distributed-process-systest";
+       description = "Cloud Haskell Test Support";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "distributed-process-task" = callPackage
     ({ mkDerivation, ansi-terminal, base, binary, bytestring
      , containers, data-accessor, deepseq, distributed-process
@@ -56644,36 +56819,17 @@ self: {
      }) {};
 
   "distributive" = callPackage
-    ({ mkDerivation, base, base-orphans, directory, doctest, filepath
-     , tagged, transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "distributive";
-       version = "0.5.1";
-       sha256 = "8fd0968c19b00b64c8219b81903c72841494460fcf1c10e84fa44f321bb3ae92";
-       libraryHaskellDepends = [
-         base base-orphans tagged transformers transformers-compat
-       ];
-       testHaskellDepends = [ base directory doctest filepath ];
-       homepage = "http://github.com/ekmett/distributive/";
-       description = "Distributive functors -- Dual to Traversable";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "distributive_0_5_2" = callPackage
-    ({ mkDerivation, base, base-orphans, Cabal, cabal-doctest
-     , directory, doctest, filepath, generic-deriving, hspec, tagged
-     , transformers, transformers-compat
+    ({ mkDerivation, base, base-orphans, Cabal, cabal-doctest, doctest
+     , generic-deriving, hspec, tagged, transformers
+     , transformers-compat
      }:
      mkDerivation {
        pname = "distributive";
        version = "0.5.2";
        sha256 = "ade2be6a5e81950ab2918d938037dde0ce09d04dc399cefbf191ce6cb5f76cd9";
-       revision = "1";
-       editedCabalFile = "b8e7dbc541e69b9f8e79faefd636e50d42eb38354ffbe5512af6f2bc98c3e257";
-       setupHaskellDepends = [
-         base Cabal cabal-doctest directory filepath
-       ];
+       revision = "2";
+       editedCabalFile = "29cf1ac04b774831a231c83cd13c4356c65dc657000f1a79ef3e42ad21e6e2f2";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base base-orphans tagged transformers transformers-compat
        ];
@@ -56681,7 +56837,6 @@ self: {
        homepage = "http://github.com/ekmett/distributive/";
        description = "Distributive functors -- Dual to Traversable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diversity" = callPackage
@@ -57356,6 +57511,7 @@ self: {
        homepage = "http://johannesgerer.com/doi";
        description = "Automatic Bibtex and fulltext of scientific articles";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dom-lt" = callPackage
@@ -58897,6 +59053,20 @@ self: {
        license = "GPL";
      }) {};
 
+  "each" = callPackage
+    ({ mkDerivation, base, dlist, hspec, QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "each";
+       version = "1.1.0.0";
+       sha256 = "b4935754b33a1078e7ad652c321cd610071ae2c6a37e5812f5f9fc3a0dc2077a";
+       libraryHaskellDepends = [ base dlist template-haskell ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/dramforever/each#readme";
+       description = "Template Haskell library for writing monadic expressions more easily";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "eager-sockets" = callPackage
     ({ mkDerivation, base, bytestring, network }:
      mkDerivation {
@@ -59228,19 +59398,20 @@ self: {
 
   "ede" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, base, bifunctors
-     , bytestring, comonad, directory, filepath, free, lens, mtl
-     , parsers, scientific, semigroups, tasty, tasty-golden, text
-     , text-format, text-manipulate, trifecta, unordered-containers
-     , vector
+     , bytestring, comonad, directory, double-conversion, filepath, free
+     , lens, mtl, parsers, scientific, semigroups, tasty, tasty-golden
+     , text, text-format, text-manipulate, trifecta
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "ede";
-       version = "0.2.8.6";
-       sha256 = "6388ce61ebc6153fcae1aeabe426ef4eb07f2080fd5019bb4d441184570cf2a5";
+       version = "0.2.8.7";
+       sha256 = "8b6be46bb0ef2b6503124fb1ae63c26e377013686fbb19ddd0ffeec3d3365e0a";
        libraryHaskellDepends = [
          aeson ansi-wl-pprint base bifunctors bytestring comonad directory
-         filepath free lens mtl parsers scientific semigroups text
-         text-format text-manipulate trifecta unordered-containers vector
+         double-conversion filepath free lens mtl parsers scientific
+         semigroups text text-format text-manipulate trifecta
+         unordered-containers vector
        ];
        testHaskellDepends = [
          aeson base bifunctors bytestring directory tasty tasty-golden text
@@ -60716,8 +60887,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "empty-monad";
-       version = "0.1.0.0";
-       sha256 = "bea74c847e505c3432c39de3e419f2f65d88b6c2ec83415d184409c8ffe56605";
+       version = "0.1.0.1";
+       sha256 = "e5c61b20ce90d48d3eda2da1c1b55cac7b8bdeaba631acefbcca5f0c9c73c840";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/vadimvinnik/empty-monad";
        description = "A container that always has no values";
@@ -63650,24 +63821,6 @@ self: {
      }) {};
 
   "fast-logger" = callPackage
-    ({ mkDerivation, array, auto-update, base, bytestring, directory
-     , easy-file, filepath, hspec, text, unix, unix-time
-     }:
-     mkDerivation {
-       pname = "fast-logger";
-       version = "2.4.8";
-       sha256 = "444cdd6e795b79de8b7e14d62f43c9231e7388ab63cb6f9b6f395555422d30ac";
-       libraryHaskellDepends = [
-         array auto-update base bytestring directory easy-file filepath text
-         unix unix-time
-       ];
-       testHaskellDepends = [ base bytestring directory hspec ];
-       homepage = "https://github.com/kazu-yamamoto/logger";
-       description = "A fast logging system";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fast-logger_2_4_10" = callPackage
     ({ mkDerivation, array, auto-update, base, bytestring, directory
      , easy-file, filepath, hspec, text, unix, unix-time
      }:
@@ -63683,7 +63836,6 @@ self: {
        homepage = "https://github.com/kazu-yamamoto/logger";
        description = "A fast logging system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fast-math" = callPackage
@@ -63715,8 +63867,8 @@ self: {
      }:
      mkDerivation {
        pname = "fast-tags";
-       version = "1.2.1";
-       sha256 = "6802c0275d28695c475d2cb41c4e2644b04d6f43befff0b6ac950081eb4cc0d3";
+       version = "1.3";
+       sha256 = "d81da625154eccdf61c81db1f8d041055470c977a33ad29c302482d7441e1fdf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63725,7 +63877,7 @@ self: {
        ];
        libraryToolDepends = [ alex ];
        executableHaskellDepends = [
-         async base bytestring containers directory filepath text
+         async base bytestring containers deepseq directory filepath text
        ];
        testHaskellDepends = [
          async base bytestring containers directory filepath tasty
@@ -64672,8 +64824,8 @@ self: {
      }:
      mkDerivation {
        pname = "fficxx";
-       version = "0.3";
-       sha256 = "bdf56fb5f2226ef17c525c3f83fc8c85e7f0c2238da3f06280a7d40748b746a6";
+       version = "0.3.1";
+       sha256 = "93888f04f6d65c92368b69f14e5744a2dcc5194c93eb4793ab21174344a48078";
        libraryHaskellDepends = [
          base bytestring Cabal containers data-default directory either
          errors filepath hashable haskell-src-exts lens mtl process pureMD5
@@ -65101,12 +65253,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "filepath_1_4_1_1" = callPackage
+  "filepath_1_4_1_2" = callPackage
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "filepath";
-       version = "1.4.1.1";
-       sha256 = "52fdbde3bc3a44d920544b8d184bd7241bac3f92d1fc6e299d716e06e99f12b4";
+       version = "1.4.1.2";
+       sha256 = "7bfb0c8776dc161cf10e324b306f3a0c89db01803ee2f8c7e11fcf3cd9892bc3";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        homepage = "https://github.com/haskell/filepath#readme";
@@ -66451,8 +66603,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.0.3";
-       sha256 = "6c90ce6d51ebba82fc3148b6a60d0665f941be04f12328ace8ac69ad825bdeec";
+       version = "0.5.0.6";
+       sha256 = "aef86dd12b001265c4e3ab15edea6cdae8f795baafc8a32764740179c2159fdd";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal ];
@@ -67758,16 +67910,17 @@ self: {
      }) {};
 
   "free-functors" = callPackage
-    ({ mkDerivation, algebraic-classes, base, comonad, constraints
-     , template-haskell, transformers, void
+    ({ mkDerivation, algebraic-classes, base, bifunctors, comonad
+     , constraints, contravariant, profunctors, template-haskell
+     , transformers
      }:
      mkDerivation {
        pname = "free-functors";
-       version = "0.6.5";
-       sha256 = "be107f1140b11d043e93682e1ab988a4aa7fd00cb460417daca97c90d61f7ddf";
+       version = "0.7";
+       sha256 = "bb30362bc3c5f8293a75af0bda8e52dee497e06ab3c0f44b088d619a41f5707d";
        libraryHaskellDepends = [
-         algebraic-classes base comonad constraints template-haskell
-         transformers void
+         algebraic-classes base bifunctors comonad constraints contravariant
+         profunctors template-haskell transformers
        ];
        homepage = "https://github.com/sjoerdvisscher/free-functors";
        description = "Free functors, adjoint to functors that forget class constraints";
@@ -69881,13 +70034,12 @@ self: {
      }:
      mkDerivation {
        pname = "generic-random";
-       version = "0.3.0.0";
-       sha256 = "80a8484be904a8ac7a536c454bffe8e912897e184bfb8574ff317461eb228546";
+       version = "0.4.0.0";
+       sha256 = "68c5036f55584c5164c79a6adf6d9dc4435844fc98d206be80a1683cc4929f22";
        libraryHaskellDepends = [
          ad base containers hashable hmatrix ieee754 MonadRandom mtl
          QuickCheck transformers unordered-containers vector
        ];
-       testHaskellDepends = [ base QuickCheck ];
        homepage = "http://github.com/lysxia/generic-random";
        description = "Generic random generators";
        license = stdenv.lib.licenses.mit;
@@ -70008,8 +70160,8 @@ self: {
     ({ mkDerivation, base, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "generics-sop";
-       version = "0.2.3.0";
-       sha256 = "2e2c8291de476e103d1978c6ad569be05705fbc178ac89ec68d6a8e20672d377";
+       version = "0.2.4.0";
+       sha256 = "481f73f122970efc24fe9dea71077e265d260834d975dd41395671d9a86a1863";
        libraryHaskellDepends = [ base ghc-prim template-haskell ];
        testHaskellDepends = [ base ];
        description = "Generic Programming using True Sums of Products";
@@ -70312,6 +70464,7 @@ self: {
        homepage = "http://cs-syd.eu";
        description = "Standard spec's for aeson-related instances";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-hspec-cereal" = callPackage
@@ -70329,6 +70482,7 @@ self: {
        homepage = "http://cs-syd.eu";
        description = "Standard spec's for cereal-related instances";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-path" = callPackage
@@ -70344,6 +70498,7 @@ self: {
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for Path";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-text" = callPackage
@@ -70361,6 +70516,7 @@ self: {
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for Text";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geo-resolver" = callPackage
@@ -71738,6 +71894,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ghcjs-perch_0_3_3_1" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "ghcjs-perch";
+       version = "0.3.3.1";
+       sha256 = "5a9e656474f2b57c18ed028217f7c44d00468ca2b8d433422b049084143a1275";
+       libraryHaskellDepends = [ base transformers ];
+       description = "GHCJS version of Perch library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghcjs-promise" = callPackage
     ({ mkDerivation, base, ghcjs-base, protolude }:
      mkDerivation {
@@ -72536,8 +72704,9 @@ self: {
 
   "gi-pangocairo" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
-     , gi-glib, gi-gobject, gi-pango, haskell-gi, haskell-gi-base, pango
-     , text, transformers
+     , gi-glib, gi-gobject, gi-pango, gobjectIntrospection, haskell-gi
+     , haskell-gi-base, pango, system-cairo, system-pango, text
+     , transformers
      }:
      mkDerivation {
        pname = "gi-pangocairo";
@@ -72548,13 +72717,22 @@ self: {
          base bytestring containers gi-cairo gi-glib gi-gobject gi-pango
          haskell-gi haskell-gi-base text transformers
        ];
-       libraryPkgconfigDepends = [ pango ];
+       libraryPkgconfigDepends = [
+         gobjectIntrospection pango system-cairo system-pango
+       ];
        doHaddock = false;
+       preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${system-pango.dev}/share/gir-1.0'';
+       preCompileBuildDriver = ''
+         PKG_CONFIG_PATH+=":${system-pango.dev}/lib/pkgconfig:${system-cairo.dev}/lib/pkgconfig"
+         setupCompileFlags+=" $(pkg-config --libs pangocairo cairo-gobject)"
+       '';
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "PangoCairo bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome2) pango;};
+     }) {inherit (pkgs) gobjectIntrospection; 
+         inherit (pkgs.gnome2) pango; system-cairo = pkgs.cairo; 
+         system-pango = pkgs.pango;};
 
   "gi-poppler" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
@@ -74062,8 +74240,8 @@ self: {
      }:
      mkDerivation {
        pname = "glazier";
-       version = "0.6.2.2";
-       sha256 = "c10d7626aaf6c431c97ce019f92f950df59d83ecb1b3d149ffdac3dafca3abd6";
+       version = "0.7.0.0";
+       sha256 = "13eb88a1df905d3ea2671803e8c4f456671223c490b0116779af28298e7ab428";
        libraryHaskellDepends = [
          base lens mmorph mtl profunctors semigroupoids transformers
        ];
@@ -74072,22 +74250,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "glazier-pipes" = callPackage
-    ({ mkDerivation, base, glazier, lens, mtl, pipes, pipes-misc
-     , transformers
-     }:
-     mkDerivation {
-       pname = "glazier-pipes";
-       version = "0.1.1.0";
-       sha256 = "8ef62edb1dadc2de9ba322dd3567887ab7dcb766b9c54b84ad140424e22344de";
-       libraryHaskellDepends = [
-         base glazier lens mtl pipes pipes-misc transformers
-       ];
-       homepage = "https://github.com/louispan/glazier-pipes#readme";
-       description = "Converts Glazier widgets into a Pipe";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
   "gli" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , friendly-time, http-client, http-client-tls, http-conduit
@@ -77724,6 +77886,7 @@ self: {
        homepage = "https://github.com/ishiy1993/google-oauth2-for-cli#readme";
        description = "Get Google OAuth2 token for CLI tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "google-oauth2-jwt" = callPackage
@@ -78203,8 +78366,8 @@ self: {
      }:
      mkDerivation {
        pname = "graflog";
-       version = "6.1.3";
-       sha256 = "b0af2e3becca91475a1ec8737d3bf27a3f68bc106ac46cce0f4264408b0a8bda";
+       version = "6.1.4";
+       sha256 = "d798087880663d3edd16f4ff6f9503b6f40917178aa86e19613dfba9811ed824";
        libraryHaskellDepends = [
          aeson base bytestring containers mtl text text-conversions
        ];
@@ -78766,6 +78929,7 @@ self: {
        homepage = "https://github.com/jml/graphql-api#readme";
        description = "Write type-safe GraphQL services in Haskell";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graphs" = callPackage
@@ -79130,19 +79294,17 @@ self: {
 
   "groundhog" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
-     , blaze-builder, bytestring, containers, monad-control
-     , monad-logger, mtl, scientific, text, time, transformers
+     , blaze-builder, bytestring, containers, monad-control, mtl
+     , resourcet, scientific, text, time, transformers
      , transformers-base
      }:
      mkDerivation {
        pname = "groundhog";
-       version = "0.7.0.3";
-       sha256 = "39713e7b3423ea34a5ac803d4a563d7f9674bbf72700e263a00c7bc70328ac58";
-       revision = "2";
-       editedCabalFile = "b4a2f7876feaaf6ad8d4589989902d4452468910c0f3f01a04827a001036f3ff";
+       version = "0.8";
+       sha256 = "16955dfe46737481400b1accd9e2b4ef3e7318e296c8b4838ba0651f7d51af1c";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-builder bytestring
-         containers monad-control monad-logger mtl scientific text time
+         containers monad-control mtl resourcet scientific text time
          transformers transformers-base
        ];
        homepage = "http://github.com/lykahb/groundhog";
@@ -79177,8 +79339,8 @@ self: {
      }:
      mkDerivation {
        pname = "groundhog-inspector";
-       version = "0.7.1.2";
-       sha256 = "909e4c47c8c58d57bd286b71db86526dfdf3eba12dfba9e61602908f82ad9d93";
+       version = "0.8";
+       sha256 = "d43df51f3feb32a8981df6850f35e55d3eed7ec2a5ac28ead4093947740b076e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -79198,15 +79360,15 @@ self: {
   "groundhog-mysql" = callPackage
     ({ mkDerivation, base, bytestring, containers, groundhog
      , monad-control, monad-logger, mysql, mysql-simple, resource-pool
-     , text, time, transformers
+     , resourcet, text, time, transformers
      }:
      mkDerivation {
        pname = "groundhog-mysql";
-       version = "0.7.0.1";
-       sha256 = "ee884137d44cb3f391d402f524d149825477a898b29e99e8056a03b56db4f606";
+       version = "0.8";
+       sha256 = "51ad8be513110081fff4333ae532b35e7ac5b35c4673e4c982bc0eca6c485666";
        libraryHaskellDepends = [
          base bytestring containers groundhog monad-control monad-logger
-         mysql mysql-simple resource-pool text time transformers
+         mysql mysql-simple resource-pool resourcet text time transformers
        ];
        description = "MySQL backend for the groundhog library";
        license = stdenv.lib.licenses.bsd3;
@@ -79214,21 +79376,19 @@ self: {
      }) {};
 
   "groundhog-postgresql" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
-     , containers, groundhog, monad-control, monad-logger
-     , postgresql-libpq, postgresql-simple, resource-pool, text, time
-     , transformers
+    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
+     , containers, groundhog, monad-control, postgresql-libpq
+     , postgresql-simple, resource-pool, resourcet, text, time
+     , transformers, vector
      }:
      mkDerivation {
        pname = "groundhog-postgresql";
-       version = "0.7.0.2";
-       sha256 = "312045c39c973596e8e92b8001776bb86898e3c8766e0a42c71e63b343918da3";
-       revision = "1";
-       editedCabalFile = "014cf49927d870d99d906064fc27ee219f7145e71a409cc69ae3ed0cdc0699ca";
+       version = "0.8";
+       sha256 = "78a5acb35b9b1dae9a9076e41db2dde46198b8e8494baaac98c6fdfc64b77f8d";
        libraryHaskellDepends = [
-         attoparsec base blaze-builder bytestring containers groundhog
-         monad-control monad-logger postgresql-libpq postgresql-simple
-         resource-pool text time transformers
+         aeson attoparsec base blaze-builder bytestring containers groundhog
+         monad-control postgresql-libpq postgresql-simple resource-pool
+         resourcet text time transformers vector
        ];
        description = "PostgreSQL backend for the groundhog library";
        license = stdenv.lib.licenses.bsd3;
@@ -79237,16 +79397,16 @@ self: {
 
   "groundhog-sqlite" = callPackage
     ({ mkDerivation, base, bytestring, containers, direct-sqlite
-     , groundhog, monad-control, monad-logger, resource-pool, text
+     , groundhog, monad-control, resource-pool, resourcet, text
      , transformers, unordered-containers
      }:
      mkDerivation {
        pname = "groundhog-sqlite";
-       version = "0.7.0.1";
-       sha256 = "be89709d458bb03a688281fbeab0408cdbc4f7942bf7559c25feb6ab9c4f5553";
+       version = "0.8";
+       sha256 = "7dcbbd4bcf9b38408bc29608a514a2b535c85490e4649090c342603c91283092";
        libraryHaskellDepends = [
          base bytestring containers direct-sqlite groundhog monad-control
-         monad-logger resource-pool text transformers unordered-containers
+         resource-pool resourcet text transformers unordered-containers
        ];
        description = "Sqlite3 backend for the groundhog library";
        license = stdenv.lib.licenses.bsd3;
@@ -79259,8 +79419,8 @@ self: {
      }:
      mkDerivation {
        pname = "groundhog-th";
-       version = "0.7.0.1";
-       sha256 = "700cd109989bbf4dd8cff72249077035cb2ca8c1d4c9748bfecf4bc17f3ee095";
+       version = "0.8";
+       sha256 = "cef719b550e0c411fabf177e53466db7734d06ad6494d0548fa8b9aad7a72ec3";
        libraryHaskellDepends = [
          aeson base bytestring containers groundhog template-haskell text
          time unordered-containers yaml
@@ -80599,6 +80759,7 @@ self: {
        homepage = "https://github.com/airalab/habit#readme";
        description = "Haskell message bot framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hable" = callPackage
@@ -83921,8 +84082,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasbolt";
-       version = "0.1.0.8";
-       sha256 = "ab3fde6c246636bf06d6a1a3a64261469d3f146a862a15db83fca86b02ade250";
+       version = "0.1.0.9";
+       sha256 = "8b013b4fc84019eff89ba9d9e1cba86e84cd5570c8acb51aba9b68a958002097";
        libraryHaskellDepends = [
          base binary bytestring containers data-binary-ieee754 data-default
          hex network network-simple text transformers
@@ -84582,18 +84743,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskeline_0_7_3_0" = callPackage
+  "haskeline_0_7_3_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , terminfo, transformers, unix
+     , process, terminfo, transformers, unix
      }:
      mkDerivation {
        pname = "haskeline";
-       version = "0.7.3.0";
-       sha256 = "566f625ef50877631d72ab2a8335c92c2b03a8c84a1473d915b40e69c9bb4d8a";
+       version = "0.7.3.1";
+       sha256 = "7bec719c44d03cc78eb343f7927b1fc0482380384eed506ecb1644b86c62db22";
        configureFlags = [ "-fterminfo" ];
        libraryHaskellDepends = [
-         base bytestring containers directory filepath terminfo transformers
-         unix
+         base bytestring containers directory filepath process terminfo
+         transformers unix
        ];
        homepage = "http://trac.haskell.org/haskeline";
        description = "A command-line interface for user input, written in Haskell";
@@ -87149,35 +87310,6 @@ self: {
      }) {inherit (pkgs) aspell;};
 
   "hasql" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
-     , bytestring-tree-builder, contravariant, contravariant-extras
-     , data-default-class, dlist, either, hashable, hashtables, loch-th
-     , mtl, placeholders, postgresql-binary, postgresql-libpq
-     , profunctors, QuickCheck, quickcheck-instances, rebase, scientific
-     , semigroups, tasty, tasty-hunit, tasty-quickcheck
-     , tasty-smallcheck, text, time, transformers, uuid, vector
-     }:
-     mkDerivation {
-       pname = "hasql";
-       version = "0.19.15.2";
-       sha256 = "b025bd613d23444f18f1196ca51fb2bdbb4b10bf779c1db85685eeb755c8bb34";
-       libraryHaskellDepends = [
-         aeson attoparsec base base-prelude bytestring
-         bytestring-tree-builder contravariant contravariant-extras
-         data-default-class dlist either hashable hashtables loch-th mtl
-         placeholders postgresql-binary postgresql-libpq profunctors
-         scientific semigroups text time transformers uuid vector
-       ];
-       testHaskellDepends = [
-         data-default-class QuickCheck quickcheck-instances rebase tasty
-         tasty-hunit tasty-quickcheck tasty-smallcheck
-       ];
-       homepage = "https://github.com/nikita-volkov/hasql";
-       description = "An efficient PostgreSQL driver and a flexible mapping API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hasql_0_19_16" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
      , bytestring-tree-builder, contravariant, contravariant-extras
      , data-default-class, dlist, either, hashable, hashtables, loch-th
@@ -87204,7 +87336,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/hasql";
        description = "An efficient PostgreSQL driver and a flexible mapping API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-backend" = callPackage
@@ -90955,6 +91086,7 @@ self: {
        homepage = "https://gitlab.com/gonz/hifi";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "highWaterMark" = callPackage
@@ -91011,25 +91143,39 @@ self: {
      }) {};
 
   "highjson" = callPackage
-    ({ mkDerivation, attoparsec, base, buffer-builder, bytestring
-     , containers, hashable, hspec, hvect, QuickCheck, scientific, text
-     , unordered-containers, vector
+    ({ mkDerivation, aeson, base, hspec, hvect, lens, QuickCheck, text
      }:
      mkDerivation {
        pname = "highjson";
-       version = "0.2.0.2";
-       sha256 = "7fd64bb5206b6d16d420e34eb7f3fefc6d888be518f0dc635a77ed51d63f1f1f";
-       libraryHaskellDepends = [
-         attoparsec base buffer-builder bytestring containers hashable hvect
-         scientific text unordered-containers vector
-       ];
-       testHaskellDepends = [ base hspec QuickCheck text ];
+       version = "0.3.0.0";
+       sha256 = "4d1d518ca40891e76e67dc6616d8ec94351efa70715098a745b596c987ddc5f7";
+       libraryHaskellDepends = [ aeson base hvect lens text ];
+       testHaskellDepends = [ aeson base hspec lens QuickCheck text ];
        homepage = "https://github.com/agrafix/highjson";
-       description = "Very fast JSON serialisation and parsing library";
+       description = "Spec based JSON parsing/serialisation";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "highjson-swagger" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, highjson, hspec, hvect
+     , insert-ordered-containers, lens, QuickCheck, swagger2, text
+     }:
+     mkDerivation {
+       pname = "highjson-swagger";
+       version = "0.3.0.0";
+       sha256 = "d03b13a9fdd2fa9ef3c68cbecd2b1a875242fd68787c667d19e3d592796d992f";
+       libraryHaskellDepends = [
+         base highjson hvect insert-ordered-containers lens swagger2 text
+       ];
+       testHaskellDepends = [
+         aeson base bytestring highjson hspec lens QuickCheck swagger2 text
+       ];
+       homepage = "https://github.com/agrafix/highjson";
+       description = "Derive swagger instances from highjson specs";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "highlight-versions" = callPackage
     ({ mkDerivation, ansi-terminal, base, Cabal, containers, hackage-db
      }:
@@ -91077,28 +91223,6 @@ self: {
      }) {};
 
   "highlighting-kate" = callPackage
-    ({ mkDerivation, base, blaze-html, bytestring, containers, Diff
-     , directory, filepath, mtl, parsec, pcre-light, process
-     , utf8-string
-     }:
-     mkDerivation {
-       pname = "highlighting-kate";
-       version = "0.6.3";
-       sha256 = "71dab85c49b038053b90062ed882e486233cbaa2b762d017224d06482075840d";
-       configureFlags = [ "-fpcre-light" ];
-       libraryHaskellDepends = [
-         base blaze-html bytestring containers mtl parsec pcre-light
-         utf8-string
-       ];
-       testHaskellDepends = [
-         base blaze-html containers Diff directory filepath process
-       ];
-       homepage = "http://github.com/jgm/highlighting-kate";
-       description = "Syntax highlighting";
-       license = "GPL";
-     }) {};
-
-  "highlighting-kate_0_6_4" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, containers, Diff
      , directory, filepath, mtl, parsec, pcre-light, process
      , utf8-string
@@ -91118,7 +91242,6 @@ self: {
        homepage = "http://github.com/jgm/highlighting-kate";
        description = "Syntax highlighting";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hills" = callPackage
@@ -91453,6 +91576,7 @@ self: {
        homepage = "https://github.com/LTI2000/hinterface";
        description = "Haskell / Erlang interoperability library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hinvaders" = callPackage
@@ -91503,15 +91627,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hip_1_5_1_0" = callPackage
+  "hip_1_5_2_0" = callPackage
     ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, colour
      , deepseq, directory, filepath, hspec, JuicyPixels, netpbm
      , primitive, process, QuickCheck, repa, temporary, vector
      }:
      mkDerivation {
        pname = "hip";
-       version = "1.5.1.0";
-       sha256 = "6b779b4befbfcae4cf2e5b232481b337f51730c83423771397c8332d93832a3f";
+       version = "1.5.2.0";
+       sha256 = "4f5eecf455df1d5a0a577abfefd48e519be8f57f9c47ca2edf31dc0982b7dc46";
        libraryHaskellDepends = [
          base bytestring Chart Chart-diagrams colour deepseq directory
          filepath JuicyPixels netpbm primitive process repa temporary vector
@@ -92168,6 +92292,8 @@ self: {
        pname = "hledger";
        version = "1.1";
        sha256 = "b254b2a3918e047ca031f6dfafc42dd5fcb4b859157fae2d019dcd95262408e5";
+       revision = "1";
+       editedCabalFile = "d33edead74698ee1e7f3e5f167bfd8e32664d520df69092f5ac48f0816939aaf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92264,8 +92390,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-iadd";
-       version = "1.1.4";
-       sha256 = "a2f52abe59637dc63c5b08f79311a8ea4543df18661fdd46b519c8746af90b6c";
+       version = "1.2";
+       sha256 = "7ec0817c2c9c20c05c6496eca6264124139e7575e452ada5b1fd225c97533083";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92336,6 +92462,8 @@ self: {
        pname = "hledger-lib";
        version = "1.1";
        sha256 = "4142142fb92e6c1affc1420e3478449cf0d9d696ab05cc801338a562a5560556";
+       revision = "1";
+       editedCabalFile = "cf72c68e9c71bc059e7ea98e764837e649ec9ecda073ac936e5fb71e06115724";
        libraryHaskellDepends = [
          array base base-compat blaze-markup bytestring cmdargs containers
          csv data-default Decimal deepseq directory filepath hashtables
@@ -92367,6 +92495,8 @@ self: {
        pname = "hledger-ui";
        version = "1.1.2";
        sha256 = "5cc85502297f3ccf31990ebbe60178ee9f90ea434e86756f39e2848f0ae788d1";
+       revision = "2";
+       editedCabalFile = "b8f09f1a5411bec106f6f507a5d71eea67685f6271c716e390b4f6513c7acddd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -92413,6 +92543,8 @@ self: {
        pname = "hledger-web";
        version = "1.1";
        sha256 = "da0c0c1096497737540efdc85cbb95cd01cbd48410491d8b2c26529b4151a2ca";
+       revision = "1";
+       editedCabalFile = "fbc15617f161701111b55e6d19f2fa0b4bac297c0db23194ca5c5d9d87a8301d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -93308,14 +93440,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hoauth2_0_5_7" = callPackage
+  "hoauth2_0_5_8" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types
      , text, unordered-containers
      }:
      mkDerivation {
        pname = "hoauth2";
-       version = "0.5.7";
-       sha256 = "7b196e4b70b8207c4beb3479f5ab4476c17d9c0ec7d8f1fcb658590641e9b9ec";
+       version = "0.5.8";
+       sha256 = "caacec1259455de9d1cb78c38fe8ca4dabc901e5b9fd8a9e7d17eaca0a820e60";
        libraryHaskellDepends = [
          aeson base bytestring http-conduit http-types text
          unordered-containers
@@ -94577,6 +94709,7 @@ self: {
        homepage = "http://github.com/luqui/hothasktags";
        description = "Generates ctags for Haskell, incorporating import lists and qualified imports";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hotswap" = callPackage
@@ -97537,6 +97670,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) lua5_1;};
 
+  "hslua-aeson" = callPackage
+    ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit
+     , ieee754, QuickCheck, quickcheck-instances, scientific, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hslua-aeson";
+       version = "0.1.0.0";
+       sha256 = "62564714c0952da7f631f60ad502863376aad1963aa80d2365d5765f93872ff7";
+       libraryHaskellDepends = [
+         aeson base hashable hslua scientific text unordered-containers
+         vector
+       ];
+       testHaskellDepends = [
+         aeson base hashable hslua hspec HUnit ieee754 QuickCheck
+         quickcheck-instances scientific text unordered-containers vector
+       ];
+       homepage = "https://github.com/tarleb/hslua-aeson#readme";
+       description = "Glue between aeson and hslua";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hsmagick" = callPackage
     ({ mkDerivation, base, bytestring, bzip2, directory, filepath
      , freetype2, GraphicsMagick, jasper, lcms, libjpeg, libpng, libxml2
@@ -97747,29 +97902,33 @@ self: {
   "hsoz" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , base64-bytestring, byteable, bytestring, case-insensitive
-     , containers, cryptonite, data-default, either, errors, http-client
-     , http-conduit, http-types, HUnit, lens, lucid, memory, mtl
-     , network, QuickCheck, scientific, scotty, securemem, tasty
-     , tasty-golden, tasty-hunit, tasty-quickcheck, text, time
-     , transformers, uri-bytestring, vault, wai, warp, wreq
+     , containers, cryptonite, data-default, either, errors, exceptions
+     , hashable, http-client, http-conduit, http-types, HUnit, lens
+     , lucid, memory, mtl, network, optparse-applicative, QuickCheck
+     , scientific, scotty, securemem, tasty, tasty-golden, tasty-hunit
+     , tasty-quickcheck, text, time, transformers, unordered-containers
+     , uri-bytestring, vault, wai, warp
      }:
      mkDerivation {
        pname = "hsoz";
-       version = "0.0.0.3";
-       sha256 = "5aa1d06f0fe3f2f38354d12af1f6205c15894d74e5a32ed743a4ce6602573781";
+       version = "0.0.0.4";
+       sha256 = "a007f1ed9937208c613cbd854d103b09c54bdc35f972186d43adf0e3795dd058";
+       revision = "1";
+       editedCabalFile = "00802583e500dd540bb78ae2e03802dcb5965e3bc9338616d72149cbeea12073";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring byteable
          bytestring case-insensitive containers cryptonite data-default
-         either errors http-client http-types lens memory mtl network
-         scientific scotty securemem text time transformers uri-bytestring
-         vault wai warp
+         either errors exceptions hashable http-client http-types lens
+         memory mtl network scientific scotty securemem text time
+         transformers unordered-containers uri-bytestring vault wai warp
        ];
        executableHaskellDepends = [
          aeson base bytestring case-insensitive containers cryptonite
-         data-default http-client http-conduit http-types lens lucid scotty
-         text transformers uri-bytestring wai warp wreq
+         data-default http-client http-conduit http-types lens lucid
+         optparse-applicative scotty text time transformers uri-bytestring
+         wai warp
        ];
        testHaskellDepends = [
          aeson base bytestring data-default http-client http-types HUnit
@@ -98211,8 +98370,8 @@ self: {
        pname = "hspec-megaparsec";
        version = "0.2.1";
        sha256 = "6474bc9a4d77cf68c4415bfa2d76da77ece418d6570429ca6c8b68eb7463de6b";
-       revision = "1";
-       editedCabalFile = "8d7144767ad65f8686ebcf3f6181e870a832dbc7613b53b13069ddf677ba86c9";
+       revision = "2";
+       editedCabalFile = "6da45ba059597259f057ddbfeb7b852beccd3476a21f7e0e2e68ced36a5668c8";
        libraryHaskellDepends = [
          base containers hspec-expectations megaparsec
        ];
@@ -98224,16 +98383,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hspec-megaparsec_0_3_0" = callPackage
+  "hspec-megaparsec_0_3_1" = callPackage
     ({ mkDerivation, base, containers, hspec, hspec-expectations
      , megaparsec
      }:
      mkDerivation {
        pname = "hspec-megaparsec";
-       version = "0.3.0";
-       sha256 = "00baf799a21404108f2861ad42649a014c283dafcbc454875e1f50eb9af3d2ed";
-       revision = "1";
-       editedCabalFile = "2f5da90f1a6d9efbbcbec8e8570bcbf30749d620b911e6b1fe6f466653203768";
+       version = "0.3.1";
+       sha256 = "826f8169bc2ce9f056be8f2b1bb00039eb1a0114015b3db71509e3e0c871514d";
        libraryHaskellDepends = [
          base containers hspec-expectations megaparsec
        ];
@@ -99089,6 +99246,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hstatistics_0_3" = callPackage
+    ({ mkDerivation, array, base, hmatrix, hmatrix-gsl-stats, random
+     , vector
+     }:
+     mkDerivation {
+       pname = "hstatistics";
+       version = "0.3";
+       sha256 = "7af3f698d1bded8690b1ec05017ae05310fad1f2d25ec138fb72994b0812eeec";
+       libraryHaskellDepends = [
+         array base hmatrix hmatrix-gsl-stats random vector
+       ];
+       homepage = "http://code.haskell.org/hstatistics";
+       description = "Statistics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hstats" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -100846,6 +101020,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "http2_1_6_3" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
+     , bytestring-builder, case-insensitive, containers, directory
+     , doctest, filepath, Glob, hex, hspec, psqueues, stm, text
+     , unordered-containers, vector, word8
+     }:
+     mkDerivation {
+       pname = "http2";
+       version = "1.6.3";
+       sha256 = "61620eca0f57875a6a9bd24f9cc04c301b5c3c668bf98f85e9989aad5d069c43";
+       libraryHaskellDepends = [
+         array base bytestring bytestring-builder case-insensitive
+         containers psqueues stm
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty array base bytestring bytestring-builder
+         case-insensitive containers directory doctest filepath Glob hex
+         hspec psqueues stm text unordered-containers vector word8
+       ];
+       homepage = "https://github.com/kazu-yamamoto/http2";
+       description = "HTTP/2 library including frames, priority queues and HPACK";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "httpd-shed" = callPackage
     ({ mkDerivation, base, network, network-uri }:
      mkDerivation {
@@ -101369,6 +101568,7 @@ self: {
        homepage = "https://github.com/yigitozkavci/hurriyet-haskell";
        description = "Haskell bindings for Hurriyet API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "husk-scheme" = callPackage
@@ -101491,6 +101691,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hvect_0_4_0_0" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "hvect";
+       version = "0.4.0.0";
+       sha256 = "cb50ef1a7f189f8c217a7d0d55b5568b2fa9bbe415b14ce114a93d2e1d5e30b6";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/agrafix/hvect";
+       description = "Simple strict heterogeneous lists";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-balancedparens" = callPackage
     ({ mkDerivation, base, hspec, hw-bits, hw-excess, hw-prim
      , hw-rankselect-base, QuickCheck, vector
@@ -103258,6 +103472,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "icon-fonts" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "icon-fonts";
+       version = "0.2.1.0";
+       sha256 = "74fb7d6c38d772b2288a43c3418e46ff35759394ea397072d374d25d77ee0f44";
+       libraryHaskellDepends = [ base ];
+       description = "Package for handling icon fonts in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "iconv" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -105619,6 +105844,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "instapaper-sender" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, data-default-class
+     , HaskellNet, HaskellNet-SSL, http-types, network, scotty, text
+     , wai, wai-extra
+     }:
+     mkDerivation {
+       pname = "instapaper-sender";
+       version = "0.1.0.2";
+       sha256 = "c14b27275628ae15c4d9c4f617a65cd5ff6be2a8e59a8e8d30da79e4ecb1c199";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base bytestring data-default-class HaskellNet HaskellNet-SSL
+         http-types network scotty text wai wai-extra
+       ];
+       homepage = "https://github.com/spinda/instapaper-sender#readme";
+       description = "Basic HTTP gateway to save articles to Instapaper";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "instinct" = callPackage
     ({ mkDerivation, base, containers, mersenne-random, vector }:
      mkDerivation {
@@ -106078,8 +106323,8 @@ self: {
      }:
      mkDerivation {
        pname = "intro";
-       version = "0.1.0.5";
-       sha256 = "0803d38f425d8f338d7ce5ae5e0755b59f39ae54a7ccc44a381a2840f3d48cb0";
+       version = "0.1.0.6";
+       sha256 = "a3ebf5474aa99626287859c27669ffb2bcd0873204e1d9a6994f628742180bcd";
        libraryHaskellDepends = [
          base bifunctors binary bytestring containers deepseq dlist extra
          hashable mtl safe string-conversions tagged text transformers
@@ -106152,6 +106397,7 @@ self: {
        homepage = "https://github.com/NorfairKing/introduction";
        description = "A prelude for the tests of safe new projects";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "intset" = callPackage
@@ -106195,10 +106441,8 @@ self: {
      }:
      mkDerivation {
        pname = "invertible";
-       version = "0.1.2";
-       sha256 = "3ee47b2ba98ff687c4988a1b065be8791523f169a57c006c719c58bd368bd344";
-       revision = "1";
-       editedCabalFile = "26bd0b94b44b28ce135b2520c82cadba5934a9eadf09229608a2e3eb439078a9";
+       version = "0.2.0";
+       sha256 = "3da08f518924925a547e954821eb96f15b4ecf47d541fa5770d38180963db19e";
        libraryHaskellDepends = [
          arrows base haskell-src-meta HList invariant lens
          partial-isomorphisms Piso semigroupoids template-haskell
@@ -107282,8 +107526,8 @@ self: {
      }:
      mkDerivation {
        pname = "itemfield";
-       version = "1.2.4.2";
-       sha256 = "29b27d36d332e847c3a3744e19fcbbfcf4231ab3a81aa66839ee6916880bd8a2";
+       version = "1.2.5.0";
+       sha256 = "161eaf7aba4d4b25db8e3095e579cbc486f39a5c335c5bd9711e996f58912f11";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -111504,8 +111748,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "labels";
-       version = "0.1.2";
-       sha256 = "d124f63d08ef1f80bff8094ce89261b84afada48bc1e851ed007ae4e257d2486";
+       version = "0.3.0";
+       sha256 = "2e7fa244c88e4de017440a617bc10c4899e3ade4422e435698923b24d84a1afb";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/chrisdone/labels#readme";
        description = "Anonymous records via named tuples";
@@ -111596,21 +111840,6 @@ self: {
      }) {};
 
   "lackey" = callPackage
-    ({ mkDerivation, base, servant, servant-foreign, tasty, tasty-hspec
-     , text
-     }:
-     mkDerivation {
-       pname = "lackey";
-       version = "0.4.1";
-       sha256 = "940dcc73673241ea92044bc8f0af1c1b7004e4c09a8e0e018d018c521ae71347";
-       libraryHaskellDepends = [ base servant servant-foreign text ];
-       testHaskellDepends = [ base servant tasty tasty-hspec text ];
-       homepage = "https://github.com/tfausak/lackey#readme";
-       description = "Generate Ruby clients from Servant APIs";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "lackey_0_4_2" = callPackage
     ({ mkDerivation, base, servant, servant-foreign, tasty, tasty-hspec
      , text
      }:
@@ -111623,7 +111852,6 @@ self: {
        homepage = "https://github.com/tfausak/lackey#readme";
        description = "Generate Ruby clients from Servant APIs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lagrangian" = callPackage
@@ -113093,7 +113321,7 @@ self: {
        hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
-  "language-puppet_1_3_5" = callPackage
+  "language-puppet_1_3_5_1" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
      , base16-bytestring, bytestring, case-insensitive, containers
      , cryptonite, directory, either, exceptions, filecache, formatting
@@ -113107,8 +113335,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-puppet";
-       version = "1.3.5";
-       sha256 = "23c86afa89085f33bfcce1c7290b1f3b302f675578c0625237773211d76d8590";
+       version = "1.3.5.1";
+       sha256 = "4c33feba8e2b3654d25d7cb3d7a881b1f1228196db2d0335a0a83c995b5f19d4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -118042,20 +118270,20 @@ self: {
      }:
      mkDerivation {
        pname = "log-warper";
-       version = "0.3.1";
-       sha256 = "ff1c2e2fac08b44e180f8d9359eac8ad3df1967dea53b9f29aa78da12d5c7678";
+       version = "0.4.2";
+       sha256 = "78f497120d94dd64f85846e2f4c805c4f1dcbcedb655771678441e28bbe8d393";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson ansi-terminal base bytestring data-default directory dlist
-         errors exceptions extra filepath formatting hashable hslogger lens
+         aeson ansi-terminal base bytestring directory dlist errors
+         exceptions extra filepath formatting hashable hslogger lens
          monad-control mtl safecopy text text-format time transformers
          transformers-base universum unordered-containers yaml
        ];
        executableHaskellDepends = [ base exceptions hslogger text ];
        testHaskellDepends = [
-         async base data-default directory filepath hspec HUnit QuickCheck
-         universum unordered-containers
+         async base data-default directory filepath hspec HUnit lens
+         QuickCheck universum unordered-containers
        ];
        homepage = "https://github.com/serokell/log-warper";
        description = "Flexible, configurable, monadic and pretty logging";
@@ -119772,6 +120000,7 @@ self: {
        homepage = "https://github.com/vmchale/madlang#readme";
        description = "Randomized templating language DSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mage" = callPackage
@@ -120972,8 +121201,8 @@ self: {
      }:
      mkDerivation {
        pname = "marvin-interpolate";
-       version = "0.4.0";
-       sha256 = "cc7a97fe7e9d43065d59d21827e40e127b9adaf250715cd7dbfe0e8480bfa766";
+       version = "1.0";
+       sha256 = "bb80ab05ba25400c688af5f1ca1f0a02e07aa3a99115b1cf2d4f684caaa339ae";
        libraryHaskellDepends = [
          base haskell-src-meta mtl parsec template-haskell text
        ];
@@ -122042,6 +122271,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "memis" = callPackage
+    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
+     , containers, directory, filemanip, filepath, http-types
+     , mime-types, process, process-extras, regex-compat
+     , regex-pcre-builtin, regex-tdfa, safe, simple, split, text
+     , transformers, unordered-containers, utf8-string, wai, wai-extra
+     , wai-middleware-static, warp
+     }:
+     mkDerivation {
+       pname = "memis";
+       version = "0.1.1";
+       sha256 = "c99e4caceadd34ccc8e7101a449f0744a1fc395cf3a547fa333564f632056602";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring containers directory
+         filemanip filepath http-types mime-types process process-extras
+         regex-compat regex-pcre-builtin regex-tdfa safe simple split text
+         transformers unordered-containers utf8-string wai wai-extra
+         wai-middleware-static warp
+       ];
+       homepage = "http://johannesgerer.com/memis";
+       description = "Memis Efficient Manual Image Sorting";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "memo-ptr" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -124624,6 +124879,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "monad-metrics" = callPackage
+    ({ mkDerivation, base, clock, containers, ekg-core, microlens, mtl
+     , text, transformers
+     }:
+     mkDerivation {
+       pname = "monad-metrics";
+       version = "0.1.0.1";
+       sha256 = "f34fd76689245c12d694de7db877ea9ab20c259aafc57489f1fa6baecb1f2d61";
+       revision = "1";
+       editedCabalFile = "265f5c26b239a08c4c003eda08a9863928f2a3ac6530d24566cf3ecad4522dcd";
+       libraryHaskellDepends = [
+         base clock containers ekg-core microlens mtl text transformers
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/sellerlabs/monad-metrics#readme";
+       description = "A convenient wrapper around EKG metrics";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "monad-open" = callPackage
     ({ mkDerivation, base, exceptions, mtl, transformers }:
      mkDerivation {
@@ -125102,15 +125376,16 @@ self: {
      }) {};
 
   "monadcryptorandom" = callPackage
-    ({ mkDerivation, base, bytestring, crypto-api, mtl, tagged
-     , transformers
+    ({ mkDerivation, base, bytestring, crypto-api, exceptions, mtl
+     , tagged, transformers, transformers-compat
      }:
      mkDerivation {
        pname = "monadcryptorandom";
-       version = "0.7.0";
-       sha256 = "67011973932bc58d5f1d0eedbbe8dca3c3160ea1dac04e82cf96bd6687515623";
+       version = "0.7.1";
+       sha256 = "85c37875743cd2357fba28d0bde3b06cd90f4f2d9770b8e0221e15258ac6b9e7";
        libraryHaskellDepends = [
-         base bytestring crypto-api mtl tagged transformers
+         base bytestring crypto-api exceptions mtl tagged transformers
+         transformers-compat
        ];
        homepage = "https://github.com/TomMD/monadcryptorandom";
        description = "A monad for using CryptoRandomGen";
@@ -127047,6 +127322,7 @@ self: {
        homepage = "https://bitbucket.org/gltronred/multivariant#readme";
        description = "Multivariant assignments generation language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "muon" = callPackage
@@ -128374,6 +128650,7 @@ self: {
        homepage = "https://github.com/oisdk/nat-sized-numbers#readme";
        description = "Variable-sized numbers from type-level nats";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nationstates" = callPackage
@@ -131367,8 +131644,8 @@ self: {
      }:
      mkDerivation {
        pname = "ntrip-client";
-       version = "0.1.4";
-       sha256 = "e1c1dda1e00e2b195d0c326ccf0bc23f122c4337d68056a6fc66646ee05aec2f";
+       version = "0.1.5";
+       sha256 = "eb93158c19610209c4d5e89de75afe7aa70bf3871e0e0b3ee70418d1f0d1aee8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -132876,19 +133153,22 @@ self: {
      }) {};
 
   "open-witness" = callPackage
-    ({ mkDerivation, base, hashable, random, template-haskell
-     , transformers, witness
+    ({ mkDerivation, base, constraints, hashable, mtl, random, tasty
+     , tasty-hunit, template-haskell, transformers, witness
      }:
      mkDerivation {
        pname = "open-witness";
-       version = "0.3.1";
-       sha256 = "f217e4585e706cef7ab7aa3419f56205a929c350dbeb6c868972d7c25e7b82cb";
+       version = "0.4";
+       sha256 = "5b5b934213b9a795bfed829613fbcb11faa20e12f403319c300921ed094acb20";
        libraryHaskellDepends = [
-         base hashable random template-haskell transformers witness
+         base constraints hashable random template-haskell transformers
+         witness
        ];
+       testHaskellDepends = [ base mtl tasty tasty-hunit witness ];
        homepage = "https://github.com/AshleyYakeley/open-witness";
        description = "open witnesses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opencog-atomspace" = callPackage
@@ -134129,6 +134409,41 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "orgstat" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, colour
+     , containers, data-default, diagrams-lib, diagrams-svg, directory
+     , exceptions, filepath, formatting, hashable, hspec, HUnit, lens
+     , linear, log-warper, mtl, optparse-simple, orgmode-parse
+     , QuickCheck, quickcheck-text, text, time, transformers, turtle
+     , universum, yaml
+     }:
+     mkDerivation {
+       pname = "orgstat";
+       version = "0.0.1";
+       sha256 = "573cf350998a5625162d997290d932ab962f3ed594e20e81c810c962892635c8";
+       revision = "1";
+       editedCabalFile = "ccd6a9c2b4f92b27c55e90af11ecd4841bb757e48f066a0407b37af49240238b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring colour containers data-default
+         diagrams-lib diagrams-svg directory exceptions filepath formatting
+         hashable lens linear log-warper mtl optparse-simple orgmode-parse
+         text time turtle universum yaml
+       ];
+       executableHaskellDepends = [
+         base bytestring directory exceptions filepath formatting log-warper
+         optparse-simple universum
+       ];
+       testHaskellDepends = [
+         base colour hspec HUnit lens QuickCheck quickcheck-text text time
+         transformers universum
+       ];
+       homepage = "https://github.com/volhovM/orgstat";
+       description = "Statistics visualizer for org-mode";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "origami" = callPackage
     ({ mkDerivation, base, bifunctors, containers, HUnit, lens, mtl
      , pretty, template-haskell, test-framework, test-framework-hunit
@@ -134904,8 +135219,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-citeproc-preamble";
-       version = "1.2.2";
-       sha256 = "ee496f052eea0ad9a881d8056025f04cd83ec9773d695e15220151c33890579c";
+       version = "1.2.3";
+       sha256 = "82c2d2c4af43dfa8e3eb71fceb20688e7f6a8f89956785207105b2e8bff8e5c6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -134926,6 +135241,8 @@ self: {
        pname = "pandoc-crossref";
        version = "0.2.4.2";
        sha256 = "fe1121698b9b9804f8ccc43cbbb2e77e40948caa543b42e129bf4ce872a7cd3f";
+       revision = "1";
+       editedCabalFile = "32a7466f513eaacbe70d359813e5f9fbb6f3492f23019e6588d48bd58ed994c2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -136496,8 +136813,8 @@ self: {
      }:
      mkDerivation {
        pname = "patat";
-       version = "0.4.7.1";
-       sha256 = "9e05e5510afd0b2c031e6115ee68749d0075c7357d536c67e34e60f1ea71da13";
+       version = "0.5.0.0";
+       sha256 = "74fe32c9b9dec0b57895f92037027093f6928b482bd147534f87fcb4c24cec3c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -136565,28 +136882,6 @@ self: {
      }) {};
 
   "path" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions
-     , filepath, genvalidity, genvalidity-hspec, hspec, HUnit, mtl
-     , QuickCheck, template-haskell, validity
-     }:
-     mkDerivation {
-       pname = "path";
-       version = "0.5.11";
-       sha256 = "bf0d9ea00271017893f59d5e136cb22116278220899609104d7906635286ac14";
-       revision = "1";
-       editedCabalFile = "a7cad89b8049cd067990a13713c27513b7c473182accfebae5eb2aa0a1d2c197";
-       libraryHaskellDepends = [
-         aeson base deepseq exceptions filepath template-haskell
-       ];
-       testHaskellDepends = [
-         aeson base bytestring filepath genvalidity genvalidity-hspec hspec
-         HUnit mtl QuickCheck validity
-       ];
-       description = "Support for well-typed paths";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "path_0_5_12" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions
      , filepath, hashable, hspec, HUnit, mtl, QuickCheck
      , template-haskell
@@ -136603,7 +136898,6 @@ self: {
        ];
        description = "Support for well-typed paths";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "path-extra" = callPackage
@@ -138590,8 +138884,8 @@ self: {
      }:
      mkDerivation {
        pname = "phoityne";
-       version = "0.0.4.0";
-       sha256 = "ce5ff314971995fd37318a0858ce5fd8276a5f0b5f43f5110f80ae2f0e31b957";
+       version = "0.0.5.0";
+       sha256 = "c3b53f08c00ded7a382b752ffdf9c6cae6472f69e51f527e4b4180f58f4f5568";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -138600,7 +138894,7 @@ self: {
          MissingH mtl parsec process resourcet safe text transformers
        ];
        testHaskellDepends = [ base hspec ];
-       description = "ghci debug viewer with simple editor";
+       description = "Deprecated - ghci debug viewer with simple editor";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -138612,8 +138906,8 @@ self: {
      }:
      mkDerivation {
        pname = "phoityne-vscode";
-       version = "0.0.11.0";
-       sha256 = "d9d5e2b94ac48b2a7aaa50526b66dfe47de9c368147b64865c3dc2d65c17defb";
+       version = "0.0.12.0";
+       sha256 = "db6c64e67759c9133f12a70fa82df22c8f7d4ba4450b5317aa57f35a177976fb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -138869,12 +139163,12 @@ self: {
     ({ mkDerivation, base, cli, hmatrix, JuicyPixels, vector }:
      mkDerivation {
        pname = "picedit";
-       version = "0.1.1.2";
-       sha256 = "e56601b9a206f1d51de3d16abb20fe94a3fc1e5a775662108dd2d0d0d09dab58";
+       version = "0.2.3.0";
+       sha256 = "e8525d8ca1d4ab0995293948a05dda3eb57f2456603ba5467fef982d0296c12d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base hmatrix JuicyPixels vector ];
-       executableHaskellDepends = [ base cli ];
+       executableHaskellDepends = [ base cli hmatrix ];
        homepage = "https://github.com/mdibaiee/picedit#readme";
        description = "simple image manipulation functions";
        license = stdenv.lib.licenses.gpl3;
@@ -139077,6 +139371,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pinchot_0_24_0_0" = callPackage
+    ({ mkDerivation, base, containers, Earley, lens, pretty-show
+     , semigroups, template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "pinchot";
+       version = "0.24.0.0";
+       sha256 = "b9769cdecb718c834d6fb04b62c08482f98cbb2a48c8a810ce83db96eff997e5";
+       libraryHaskellDepends = [
+         base containers Earley lens pretty-show semigroups template-haskell
+         transformers
+       ];
+       homepage = "http://www.github.com/massysett/pinchot";
+       description = "Write grammars, not parsers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipe-enumerator" = callPackage
     ({ mkDerivation, base, enumerator, pipes, transformers }:
      mkDerivation {
@@ -139336,8 +139648,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-category";
-       version = "0.2.0.0";
-       sha256 = "bc8d268cc35a14ec5ef317e2dfd6551d76269e706477bccc03b7d884be779bf7";
+       version = "0.2.0.1";
+       sha256 = "9da046ca3b30115bad0d3ab447250675543c159c9a6e865d2ae863c61ead6679";
        libraryHaskellDepends = [ base lens mtl pipes pipes-extras ];
        testHaskellDepends = [ base hspec pipes transformers ];
        homepage = "https://github.com/louispan/pipes-category#readme";
@@ -139595,15 +139907,15 @@ self: {
   "pipes-fluid" = callPackage
     ({ mkDerivation, async, base, constraints, hspec, lens
      , lifted-async, mmorph, monad-control, mtl, pipes
-     , pipes-concurrency, pipes-misc, stm, transformers
+     , pipes-concurrency, pipes-misc, stm, these, transformers
      , transformers-base
      }:
      mkDerivation {
        pname = "pipes-fluid";
-       version = "0.3.0.0";
-       sha256 = "6a7a26c90797f3e7b14686b7f16be6ecc2f54b0ee752e268bab77533e6f19e1c";
+       version = "0.4.0.0";
+       sha256 = "c82a04b5799e9c94a1989fc6f940ad4fb624259e6c8eda98515fe43d7b67131d";
        libraryHaskellDepends = [
-         base constraints lens lifted-async monad-control pipes stm
+         base constraints lens lifted-async monad-control pipes stm these
          transformers transformers-base
        ];
        testHaskellDepends = [
@@ -139735,18 +140047,21 @@ self: {
      }) {};
 
   "pipes-misc" = callPackage
-    ({ mkDerivation, base, hspec, lens, mtl, pipes, pipes-category
-     , pipes-concurrency, semigroups, stm, transformers
+    ({ mkDerivation, base, clock, Decimal, hspec, lens, mmorph, mtl
+     , pipes, pipes-category, pipes-concurrency, semigroups, stm
+     , transformers
      }:
      mkDerivation {
        pname = "pipes-misc";
-       version = "0.2.2.1";
-       sha256 = "9ff15e0ebcae6732eeff413a2fe9dfb33b07073eda54cfa1513a0ee0e2603c5f";
+       version = "0.2.3.0";
+       sha256 = "15a45dcef5c4893c517632772991602b34dd128d59b9eb4fa9d37a6aa7d62d66";
        libraryHaskellDepends = [
-         base lens mtl pipes pipes-category pipes-concurrency semigroups stm
-         transformers
+         base clock Decimal lens mtl pipes pipes-category pipes-concurrency
+         semigroups stm transformers
+       ];
+       testHaskellDepends = [
+         base hspec lens mmorph pipes pipes-concurrency stm transformers
        ];
-       testHaskellDepends = [ base hspec lens pipes transformers ];
        homepage = "https://github.com/louispan/pipes-misc#readme";
        description = "Miscellaneous utilities for pipes, required by glazier-tutorial";
        license = stdenv.lib.licenses.bsd3;
@@ -140441,8 +140756,8 @@ self: {
      }:
      mkDerivation {
        pname = "playlists";
-       version = "0.4.0.0";
-       sha256 = "38a4cb8370ced24a7ac198f16b509799993e9798ccfb9fc3448ee8e14bd71688";
+       version = "0.4.1.0";
+       sha256 = "707fca5b28fae465b30300d4a52c6e89a1e39ae886f9737121604b7c2f7b8c3a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -140466,8 +140781,8 @@ self: {
      }:
      mkDerivation {
        pname = "playlists-http";
-       version = "0.1.0.0";
-       sha256 = "9f3360bd4adcf45c0bd85eecc717c8093f8d8c71adcf8cff5d961c6cea1c15e3";
+       version = "0.1.1.0";
+       sha256 = "2f5eaeba301115124529aeb72c8608838911209ab9a5830f705214c32dbb26cb";
        libraryHaskellDepends = [
          attoparsec base bytestring either exceptions http-client mtl
          playlists text
@@ -141889,34 +142204,6 @@ self: {
      }) {};
 
   "postgresql-binary" = callPackage
-    ({ mkDerivation, aeson, base, base-prelude, binary-parser
-     , bytestring, conversion, conversion-bytestring, conversion-text
-     , either, foldl, json-ast, loch-th, placeholders, postgresql-libpq
-     , QuickCheck, quickcheck-instances, rebase, scientific, tasty
-     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text, time
-     , transformers, uuid, vector
-     }:
-     mkDerivation {
-       pname = "postgresql-binary";
-       version = "0.9.1.1";
-       sha256 = "e9aeb3abc2e191ecde5f6112221fe0957364c72779dbcbe8eba6bc5c830ddac2";
-       libraryHaskellDepends = [
-         aeson base base-prelude binary-parser bytestring foldl loch-th
-         placeholders scientific text time transformers uuid vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring conversion conversion-bytestring
-         conversion-text either json-ast loch-th placeholders
-         postgresql-libpq QuickCheck quickcheck-instances rebase scientific
-         tasty tasty-hunit tasty-quickcheck tasty-smallcheck text time
-         transformers uuid vector
-       ];
-       homepage = "https://github.com/nikita-volkov/postgresql-binary";
-       description = "Encoders and decoders for the PostgreSQL's binary format";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "postgresql-binary_0_9_2" = callPackage
     ({ mkDerivation, aeson, base, base-prelude, binary-parser
      , bytestring, conversion, conversion-bytestring, conversion-text
      , foldl, json-ast, loch-th, placeholders, postgresql-libpq
@@ -141941,7 +142228,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/postgresql-binary";
        description = "Encoders and decoders for the PostgreSQL's binary format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-config" = callPackage
@@ -142161,8 +142447,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-simple-migration";
-       version = "0.1.7.0";
-       sha256 = "10347cc4c34cf0d98b08234ee0c1e05f9064be08769326147eccb1bd135bce93";
+       version = "0.1.8.0";
+       sha256 = "69d24f8f9dce302206562edc76afa2653d977770d6b223583da9126f2f6635fa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -142861,8 +143147,8 @@ self: {
      }:
      mkDerivation {
        pname = "preliminaries";
-       version = "0.1.5.0";
-       sha256 = "c4a861eeeb4695797efcdfa591de3f8304976ebe73a0ea8df448298bb9c44949";
+       version = "0.1.6.0";
+       sha256 = "fdb3e581040b08a2af9ddbbccb613dad0a3fdbc70367db7859dee130cc96636d";
        libraryHaskellDepends = [
          abstract-par base bifunctors classy-prelude-conduit data-default
          microlens-contra microlens-platform monad-par monad-parallel
@@ -143094,12 +143380,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pretty_1_1_3_4" = callPackage
+  "pretty_1_1_3_5" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, QuickCheck }:
      mkDerivation {
        pname = "pretty";
-       version = "1.1.3.4";
-       sha256 = "a7a4af750533c563d2d422b8424849c11a834fefd1172a1b2ca0cbd4763be25d";
+       version = "1.1.3.5";
+       sha256 = "b0009d4d7915a7951ebf8519411319d65b110c2f68da7f176ec8fd98217a6f45";
        libraryHaskellDepends = [ base deepseq ghc-prim ];
        testHaskellDepends = [ base deepseq ghc-prim QuickCheck ];
        homepage = "http://github.com/haskell/pretty";
@@ -143624,14 +143910,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "process_1_4_3_0" = callPackage
+  "process_1_5_0_0" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, directory, filepath
      , unix
      }:
      mkDerivation {
        pname = "process";
-       version = "1.4.3.0";
-       sha256 = "5473f4d20a19c3ba448ace7d4d01ec821ad531574c23934fd3c55627f5a7f0eb";
+       version = "1.5.0.0";
+       sha256 = "a87b228f52272ef20dd15260e40b3b4550205bac7d42ef0f0c0ad31d1f475c77";
        libraryHaskellDepends = [ base deepseq directory filepath unix ];
        testHaskellDepends = [ base bytestring directory ];
        description = "Process libraries";
@@ -144745,6 +145031,7 @@ self: {
        homepage = "https://github.com/pbogdan/protolude-lifted";
        description = "Protolude with lifted-base and lifted-async";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proton-haskell" = callPackage
@@ -146095,6 +146382,7 @@ self: {
        homepage = "https://github.com/acw/qif";
        description = "A simple QIF file format parser / printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "qr-imager" = callPackage
@@ -146792,6 +147080,7 @@ self: {
        homepage = "https://github.com/minad/quickcheck-special#readme";
        description = "Edge cases and special values for QuickCheck Arbitrary instances";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-string-random" = callPackage
@@ -147599,6 +147888,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ramus" = callPackage
+    ({ mkDerivation, base, hspec, QuickCheck, quickcheck-io }:
+     mkDerivation {
+       pname = "ramus";
+       version = "0.1.0";
+       sha256 = "8acc90e5aec53ea31b8da0a1dd0164c4e2aa6e3226c5b69da0882b5c47255537";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec QuickCheck quickcheck-io ];
+       homepage = "https://github.com/NickSeagull/ramus#readme";
+       description = "Elm signal system for Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "rand-vars" = callPackage
     ({ mkDerivation, array, base, IntervalMap, mtl, random }:
      mkDerivation {
@@ -148577,6 +148879,7 @@ self: {
        homepage = "http://paychandoc.runeks.me/";
        description = "RESTful Bitcoin Payment Channel Protocol Servant API description";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rbr" = callPackage
@@ -149278,28 +149581,6 @@ self: {
      }) {};
 
   "rebase" = callPackage
-    ({ mkDerivation, base, base-prelude, bifunctors, bytestring
-     , containers, contravariant, contravariant-extras, deepseq, dlist
-     , either, fail, hashable, mtl, profunctors, scientific
-     , semigroupoids, semigroups, stm, text, time, transformers
-     , unordered-containers, uuid, vector, void
-     }:
-     mkDerivation {
-       pname = "rebase";
-       version = "1.0.6";
-       sha256 = "dcf4217ab3f089a8934808af88d95e6d8e57bd57fac3cce54d8b048232abfa01";
-       libraryHaskellDepends = [
-         base base-prelude bifunctors bytestring containers contravariant
-         contravariant-extras deepseq dlist either fail hashable mtl
-         profunctors scientific semigroupoids semigroups stm text time
-         transformers unordered-containers uuid vector void
-       ];
-       homepage = "https://github.com/nikita-volkov/rebase";
-       description = "A more progressive alternative to the \"base\" package";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "rebase_1_0_8" = callPackage
     ({ mkDerivation, base, base-prelude, bifunctors, bytestring
      , containers, contravariant, contravariant-extras, deepseq, dlist
      , either, fail, hashable, mtl, profunctors, scientific
@@ -149319,7 +149600,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/rebase";
        description = "A more progressive alternative to the \"base\" package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rebindable" = callPackage
@@ -150321,6 +150601,7 @@ self: {
        homepage = "https://iconnect.github.io/regex";
        description = "A Regular Expression Toolkit for regex-base";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-applicative" = callPackage
@@ -151105,6 +151386,7 @@ self: {
        homepage = "https://github.com/iostat/relapse#readme";
        description = "Sensible RLP encoding";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relation" = callPackage
@@ -151146,8 +151428,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query";
-       version = "0.8.3.2";
-       sha256 = "20899f2fcf142e11036e6e6b7360c873e17ded7bb856616e9d40f92d0298d09b";
+       version = "0.8.3.4";
+       sha256 = "5c31665bf5cae82c06090e2d9b539f8001434db2888ab891755584b74b9560c2";
        libraryHaskellDepends = [
          array base bytestring containers dlist names-th persistable-record
          sql-words template-haskell text th-reify-compat time
@@ -152119,6 +152401,7 @@ self: {
        homepage = "https://github.com/nikita-volkov/rerebase";
        description = "Reexports from \"base\" with a bunch of other standard libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reroute" = callPackage
@@ -152141,6 +152424,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "reroute_0_4_1_0" = callPackage
+    ({ mkDerivation, base, deepseq, hashable, hspec, http-api-data
+     , hvect, mtl, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "reroute";
+       version = "0.4.1.0";
+       sha256 = "34a83f0d0240610b3e6867f02859d77a8255783e2225389bf025865d5d4c2508";
+       libraryHaskellDepends = [
+         base deepseq hashable http-api-data hvect mtl text
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         base hspec hvect mtl text unordered-containers vector
+       ];
+       homepage = "http://github.com/agrafix/Spock";
+       description = "abstract implementation of typed and untyped web routing";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "reserve" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, directory, hspec
      , http-conduit, http-kit, http-types, network, process, QuickCheck
@@ -154724,6 +155028,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "safe_0_3_12" = callPackage
+    ({ mkDerivation, base, deepseq, QuickCheck }:
+     mkDerivation {
+       pname = "safe";
+       version = "0.3.12";
+       sha256 = "738c849bdc619f9bbcd23f7fc956af2b87a182a9887ac88c1a80895ae931e29e";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base deepseq QuickCheck ];
+       homepage = "https://github.com/ndmitchell/safe#readme";
+       description = "Library of safe (exception free) functions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "safe-access" = callPackage
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
@@ -155806,23 +156124,39 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
-  "scalpel_0_4_1" = callPackage
-    ({ mkDerivation, base, bytestring, containers, curl, data-default
-     , fail, HUnit, regex-base, regex-tdfa, tagsoup, text, vector
+  "scalpel_0_5_0" = callPackage
+    ({ mkDerivation, base, bytestring, curl, data-default, scalpel-core
+     , tagsoup, text
      }:
      mkDerivation {
        pname = "scalpel";
-       version = "0.4.1";
-       sha256 = "463028b6f62fd02f07591433b842552f7e68a650dbe3869f96e5abbbf0c6a534";
+       version = "0.5.0";
+       sha256 = "1635b45543cac398a5c0a54cb3bd6fffb7d11150ddbc55b3fbd92b7a6736632f";
        libraryHaskellDepends = [
-         base bytestring containers curl data-default fail regex-base
-         regex-tdfa tagsoup text vector
+         base bytestring curl data-default scalpel-core tagsoup text
+       ];
+       homepage = "https://github.com/fimad/scalpel";
+       description = "A high level web scraping library for Haskell";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "scalpel-core" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-default, fail
+     , HUnit, regex-base, regex-tdfa, tagsoup, text, vector
+     }:
+     mkDerivation {
+       pname = "scalpel-core";
+       version = "0.5.0";
+       sha256 = "b24a0dbfa4ebfba9e20b08e2b2f9f39c27bd575e1652d1bab944ae2784e00dda";
+       libraryHaskellDepends = [
+         base bytestring containers data-default fail regex-base regex-tdfa
+         tagsoup text vector
        ];
        testHaskellDepends = [ base HUnit regex-base regex-tdfa tagsoup ];
        homepage = "https://github.com/fimad/scalpel";
        description = "A high level web scraping library for Haskell";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scan" = callPackage
@@ -156851,8 +157185,8 @@ self: {
      }:
      mkDerivation {
        pname = "sdl2";
-       version = "2.1.3";
-       sha256 = "ce18963594fa21d658deb90d22e48cd17e499b2300db265a679bb2724cb28082";
+       version = "2.1.3.1";
+       sha256 = "788a7f1e2bb08e393b806d9f700f62234703ec85b772e0e25ff740b4aafaae14";
        libraryHaskellDepends = [
          base bytestring exceptions linear StateVar text transformers vector
        ];
@@ -156862,20 +157196,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) SDL2;};
 
-  "sdl2_2_1_3_1" = callPackage
+  "sdl2_2_2_0" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, linear, SDL2
      , StateVar, text, transformers, vector
      }:
      mkDerivation {
        pname = "sdl2";
-       version = "2.1.3.1";
-       sha256 = "788a7f1e2bb08e393b806d9f700f62234703ec85b772e0e25ff740b4aafaae14";
+       version = "2.2.0";
+       sha256 = "5a3a83fad8936539a4ff1a4a845f2a30b859d2d62e1cda7ab1f39cb59378c484";
        libraryHaskellDepends = [
          base bytestring exceptions linear StateVar text transformers vector
        ];
        librarySystemDepends = [ SDL2 ];
        libraryPkgconfigDepends = [ SDL2 ];
-       description = "Both high- and low-level bindings to the SDL library (version 2.0.2+).";
+       description = "Both high- and low-level bindings to the SDL library (version 2.0.4+).";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL2;};
@@ -157608,16 +157942,21 @@ self: {
      }) {};
 
   "semiring-num" = callPackage
-    ({ mkDerivation, base, containers, doctest, smallcheck }:
+    ({ mkDerivation, base, containers, doctest, nat-sized-numbers
+     , QuickCheck, smallcheck, template-haskell
+     }:
      mkDerivation {
        pname = "semiring-num";
-       version = "0.6.0.0";
-       sha256 = "08011a1b89aa4ce9ba643add8af48dcaf9304db9d22807a4257b0a5f87c16126";
-       libraryHaskellDepends = [ base containers ];
-       testHaskellDepends = [ base containers doctest smallcheck ];
+       version = "0.8.0.0";
+       sha256 = "13b47bc891b8b2bcfe648409554e4b811ce964d86febd1403584beb5f3b21a4e";
+       libraryHaskellDepends = [ base containers template-haskell ];
+       testHaskellDepends = [
+         base containers doctest nat-sized-numbers QuickCheck smallcheck
+       ];
        homepage = "https://github.com/oisdk/semiring-num";
        description = "Basic semiring class and instances";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "semiring-simple" = callPackage
@@ -158341,8 +158680,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-cookie";
-       version = "0.4.3.1";
-       sha256 = "c4ea750d6f7ab768e16f212ae7b0f76b98db43021d62736ebd2996b4d92809c1";
+       version = "0.4.3.2";
+       sha256 = "faf62ad020d449638c3059847f16af7d72bfa623d9f5a8ad375e2add9f2c2e3c";
        libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring cereal cookie
          cryptonite data-default exceptions http-api-data http-types memory
@@ -158751,8 +159090,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-elm";
-       version = "0.3.0.1";
-       sha256 = "03206698142a40574d1fee4e023cafb91755301e8aaf6d12bb53ca6b78813bb2";
+       version = "0.4.0.0";
+       sha256 = "2421e8eb140d3848ba4713bc4fb0b8c0c804aef8ef361c0cba08d4df3f50c24b";
        libraryHaskellDepends = [
          base elm-export lens servant servant-foreign text wl-pprint-text
        ];
@@ -158801,14 +159140,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-foreign_0_9_1_1" = callPackage
+  "servant-foreign_0_10" = callPackage
     ({ mkDerivation, base, hspec, http-types, lens, servant, text }:
      mkDerivation {
        pname = "servant-foreign";
-       version = "0.9.1.1";
-       sha256 = "da9baf46c97b3ef3009a69c8d1ca40e188409c0027490c9e173b9ebd3da7c9ca";
+       version = "0.10";
+       sha256 = "14a589afcc36aac7023a552c07862fe72d35d04571a704d51fc7db17ae0c2f25";
        libraryHaskellDepends = [ base http-types lens servant text ];
-       testHaskellDepends = [ base hspec ];
+       testHaskellDepends = [ base hspec servant ];
        description = "Helpers for generating clients for servant APIs in any programming language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -159042,6 +159381,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-named" = callPackage
+    ({ mkDerivation, base, hspec, hspec-wai, http-types, servant
+     , servant-server
+     }:
+     mkDerivation {
+       pname = "servant-named";
+       version = "0.1.0.0";
+       sha256 = "6bdcc503ca1603d7a2ad787fd57dc5e25a06bbf05530f89718ca1be832660436";
+       revision = "2";
+       editedCabalFile = "5a05b717a5676672ec5ce3815b1a702165b6828bd421605920a5a8b02ad3211b";
+       libraryHaskellDepends = [ base servant ];
+       testHaskellDepends = [
+         base hspec hspec-wai http-types servant servant-server
+       ];
+       homepage = "https://github.com/bemweitzman/servant-named#readme";
+       description = "Add named endpoints to servant";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-pandoc" = callPackage
     ({ mkDerivation, base, bytestring, http-media, lens, pandoc-types
      , servant-docs, text, unordered-containers
@@ -159424,7 +159782,11 @@ self: {
        pname = "servant-swagger";
        version = "1.1.2.1";
        sha256 = "302ab03af773ddb3b0a4949b62ca79b81c206a3838864c9ed35cb4e40360f961";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       revision = "1";
+       editedCabalFile = "c0e7cf887989105cb5d7dea343a8f0586999680bd6272516a745e1cc01a017de";
+       setupHaskellDepends = [
+         base Cabal cabal-doctest directory filepath
+       ];
        libraryHaskellDepends = [
          aeson base bytestring hspec http-media insert-ordered-containers
          lens QuickCheck servant swagger2 text unordered-containers
@@ -159448,10 +159810,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-swagger-ui";
-       version = "0.2.1.2.2.8";
-       sha256 = "21a25df5c3527a859a14ae2edf12116d8634e7be1587357f4545f31fc5acb3a4";
-       revision = "1";
-       editedCabalFile = "3ad40d23f60d1d80d877914691e7e4adbbd129cc62f411494f144f19b9d82ac8";
+       version = "0.2.2.2.2.8";
+       sha256 = "7dcfbc55eb6aab3ebb739e7a056107cbe0d0720c3e2e6f820afe52e7e84084fb";
        libraryHaskellDepends = [
          base blaze-markup bytestring directory file-embed filepath
          http-media servant servant-blaze servant-server servant-swagger
@@ -159459,10 +159819,8 @@ self: {
          wai-app-static
        ];
        testHaskellDepends = [
-         aeson base base-compat blaze-markup bytestring directory file-embed
-         filepath http-media lens servant servant-blaze servant-server
-         servant-swagger swagger2 template-haskell text transformers
-         transformers-compat wai wai-app-static warp
+         aeson base base-compat lens servant servant-server servant-swagger
+         swagger2 text transformers transformers-compat wai warp
        ];
        homepage = "https://github.com/phadej/servant-swagger-ui#readme";
        description = "Servant swagger ui";
@@ -159940,8 +160298,8 @@ self: {
      }:
      mkDerivation {
        pname = "sexp-grammar";
-       version = "1.2.2";
-       sha256 = "250ea8894b7232e074040e50de1fa8e2e26183aeffa21c206ece5767dc725492";
+       version = "1.2.3";
+       sha256 = "6914a7ae01b736f1b32e2847d91a2accbe2be195cbb5c69d56668ef08872f580";
        libraryHaskellDepends = [
          array base bytestring containers mtl profunctors scientific
          semigroups split tagged template-haskell text transformers
@@ -162665,8 +163023,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting";
-       version = "0.1.1.4";
-       sha256 = "59323288062233fcd38fb6409b3565dd6ee1b2f676d21d56695bca5b35f3b2db";
+       version = "0.1.1.5";
+       sha256 = "0a4b666b2ccfeed35386bd364d663e919adc1815547e6360e83487253e33b13c";
        libraryHaskellDepends = [
          aeson base blaze-html bytestring case-insensitive containers
          directory filepath hxt mtl regex-pcre-builtin safe text utf8-string
@@ -163496,12 +163854,16 @@ self: {
      }) {};
 
   "snap-accept" = callPackage
-    ({ mkDerivation, base, http-media, snap-core }:
+    ({ mkDerivation, base, bytestring, case-insensitive, http-media
+     , snap-core
+     }:
      mkDerivation {
        pname = "snap-accept";
-       version = "0.1.0";
-       sha256 = "35387bd97314e8c24219cb2a9d4c6dece133847af14c67884cfeacad123e56a7";
-       libraryHaskellDepends = [ base http-media snap-core ];
+       version = "0.2.0";
+       sha256 = "4e65ad212f3bfc867399fcf35dff4444fe47b014d01b4cd01cffc9163045c928";
+       libraryHaskellDepends = [
+         base bytestring case-insensitive http-media snap-core
+       ];
        homepage = "http://github.com/zimothy/snap-accept";
        description = "Accept header branching for the Snap web framework";
        license = stdenv.lib.licenses.mit;
@@ -164149,20 +164511,21 @@ self: {
 
   "snaplet-i18n" = callPackage
     ({ mkDerivation, base, bytestring, configurator, filepath, heist
-     , lens, mtl, snap, snap-loader-static, text, transformers, xmlhtml
+     , lens, map-syntax, mtl, snap, snap-loader-static, text
+     , transformers, xmlhtml
      }:
      mkDerivation {
        pname = "snaplet-i18n";
-       version = "0.1.0";
-       sha256 = "8933941904b222dd880b46a34af7c6612f47182e38b24022dbed6c6e505c4e3a";
+       version = "0.2.0";
+       sha256 = "811a12a9db93c5df0ab2d33a160eb49595cd25afd53b1ca553498d407bec55c3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base configurator filepath heist lens mtl snap snap-loader-static
-         text transformers xmlhtml
+         base configurator filepath heist lens map-syntax mtl snap
+         snap-loader-static text transformers xmlhtml
        ];
        executableHaskellDepends = [
-         base bytestring configurator filepath heist lens snap
+         base bytestring configurator filepath heist lens map-syntax snap
          snap-loader-static text transformers xmlhtml
        ];
        homepage = "https://github.com/HaskellCNOrg/snaplet-i18n";
@@ -165668,23 +166031,24 @@ self: {
      }) {};
 
   "sparkle" = callPackage
-    ({ mkDerivation, base, binary, bytestring, distributed-closure
-     , filepath, jni, jvm, process, regex-tdfa, singletons, text, vector
-     , zip-archive
+    ({ mkDerivation, base, binary, bytestring, choice
+     , distributed-closure, filepath, jni, jvm, process, regex-tdfa
+     , singletons, streaming, text, vector, zip-archive
      }:
      mkDerivation {
        pname = "sparkle";
-       version = "0.3";
-       sha256 = "72b97e6fe8867bbaa797bb1416df14bbfd61e7bd1e1b0c9b9b2c97cc0e37b7d5";
+       version = "0.4.0.2";
+       sha256 = "778c4858a51480f685b7f48c3ffea76535dd690119414de1a5d03535c3e3cfaf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base binary bytestring distributed-closure jni jvm singletons text
-         vector
+         base binary bytestring choice distributed-closure jni jvm
+         singletons streaming text vector
        ];
        executableHaskellDepends = [
          base bytestring filepath process regex-tdfa text zip-archive
        ];
+       homepage = "http://github.com/tweag/sparkle#readme";
        description = "Distributed Apache Spark applications in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -168217,6 +168581,8 @@ self: {
        pname = "stb-image-redux";
        version = "0.2.1.0";
        sha256 = "c0e4a5d2bf6d99934430ffd068cb3d28003554c5c8beb84ce76dd487f191eb1d";
+       revision = "1";
+       editedCabalFile = "cc40e775afe473f06ae9f2c9864fdeee7fa4830b2f4b7ee5a8bed504baa4007b";
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base hspec vector ];
        homepage = "https://github.com/sasinestro/stb-image-redux#readme";
@@ -168289,25 +168655,30 @@ self: {
 
   "steeloverseer" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring
-     , containers, directory, filepath, fsnotify, megaparsec, microlens
-     , mtl, optparse-applicative, process, regex-tdfa, semigroups, stm
-     , text, yaml
+     , containers, directory, filepath, fsnotify, hspec, mtl
+     , optparse-applicative, process, regex-tdfa, resourcet, semigroups
+     , stm, streaming, text, yaml
      }:
      mkDerivation {
        pname = "steeloverseer";
-       version = "2.0.0.1";
-       sha256 = "376994767ee8afacebf05f18ad0517bf1fa7557f5c44697c3f476a575d6ea334";
+       version = "2.0.1.0";
+       sha256 = "ddc06191f2273a0c0c684d54d5f2ece54748b91ec97b11c99c9b38efe7915a5a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson ansi-terminal async base bytestring containers megaparsec
-         microlens mtl process regex-tdfa semigroups stm text yaml
+         aeson ansi-terminal async base bytestring containers fsnotify mtl
+         process regex-tdfa resourcet semigroups stm streaming text yaml
        ];
        executableHaskellDepends = [
-         base bytestring directory filepath fsnotify optparse-applicative
-         regex-tdfa semigroups yaml
+         async base bytestring directory filepath fsnotify mtl
+         optparse-applicative regex-tdfa resourcet semigroups stm streaming
+         text yaml
        ];
-       homepage = "https://github.com/schell/steeloverseer";
+       testHaskellDepends = [
+         async base bytestring fsnotify hspec mtl regex-tdfa resourcet
+         semigroups stm streaming text yaml
+       ];
+       homepage = "https://github.com/schell/steeloverseer#readme";
        description = "A file watcher and development tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -168520,8 +168891,8 @@ self: {
     ({ mkDerivation, base, stm }:
      mkDerivation {
        pname = "stm-extras";
-       version = "0.1.0.0";
-       sha256 = "ee0887d762a3d541ef74038b3f23f61b6081933da024d3309c9fa5faf0bf1a5f";
+       version = "0.1.0.1";
+       sha256 = "ffa81349733b1631c1bad5ce3e5d4bcd35eb76dee10e4790fa050d40cb98e9cd";
        libraryHaskellDepends = [ base stm ];
        homepage = "https://github.com/louispan/stm-extras#readme";
        description = "Extra STM functions";
@@ -169384,6 +169755,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "streaming-postgresql-simple" = callPackage
+    ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq
+     , postgresql-simple, resourcet, safe-exceptions, streaming
+     , transformers
+     }:
+     mkDerivation {
+       pname = "streaming-postgresql-simple";
+       version = "0.2.0.0";
+       sha256 = "2e00588e1cf3c971972bfd009ba8976177e78b381ea8436a78d3e7127d6b5195";
+       libraryHaskellDepends = [
+         base bytestring exceptions postgresql-libpq postgresql-simple
+         resourcet safe-exceptions streaming transformers
+       ];
+       description = "Stream postgresql-query results using the streaming library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "streaming-utils" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, http-client
      , http-client-tls, json-stream, mtl, network, network-simple, pipes
@@ -170075,7 +170463,7 @@ self: {
        homepage = "https://github.com/chrisdone/structured-haskell-mode";
        description = "Structured editing Emacs mode for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "structured-mongoDB" = callPackage
@@ -170263,8 +170651,8 @@ self: {
      }:
      mkDerivation {
        pname = "styx";
-       version = "1.1";
-       sha256 = "b11402bde5b548b3f5cd2e1f501940e94c85628709aa0609e334bdf53e065144";
+       version = "1.2";
+       sha256 = "6b8d91a85a65e64758f3eb13c863253318b5477fc12644bb796533b8b0ed3131";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -170407,6 +170795,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "successors" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "successors";
+       version = "0.1";
+       sha256 = "636ec946d4622860363ff2480dcbf5148adb1d70bd044a716a068756354f6b56";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/nomeata/haskell-successors";
+       description = "An applicative functor to manage successors";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "suffix-array" = callPackage
     ({ mkDerivation, array, base, containers, tasty, tasty-hunit
      , tasty-quickcheck
@@ -170996,7 +171396,6 @@ self: {
        homepage = "https://github.com/GetShopTV/swagger2";
        description = "Swagger 2.0 data model";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "swapper" = callPackage
@@ -173252,6 +173651,7 @@ self: {
        homepage = "https://github.com/minad/tasty-auto#readme";
        description = "Simple auto discovery for Tasty";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-dejafu" = callPackage
@@ -175123,15 +175523,15 @@ self: {
        license = "GPL";
      }) {};
 
-  "texmath_0_9" = callPackage
+  "texmath_0_9_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , mtl, pandoc-types, parsec, process, split, syb, temporary, text
      , utf8-string, xml
      }:
      mkDerivation {
        pname = "texmath";
-       version = "0.9";
-       sha256 = "6ee9cda09fd38b27309abf50216ae2081543c0edf939f71cc3856feca24c5f2c";
+       version = "0.9.1";
+       sha256 = "cafb98d25da63bdd76f75b29bf395c9e023cf46d753db9a1534e84879cb8697e";
        libraryHaskellDepends = [
          base containers mtl pandoc-types parsec syb xml
        ];
@@ -175252,6 +175652,7 @@ self: {
        homepage = "https://github.com/nikita-volkov/text-builder";
        description = "An efficient strict text builder";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-conversions" = callPackage
@@ -175909,12 +176310,13 @@ self: {
      }) {};
 
   "text-zipper" = callPackage
-    ({ mkDerivation, base, deepseq, text, vector }:
+    ({ mkDerivation, base, deepseq, hspec, QuickCheck, text, vector }:
      mkDerivation {
        pname = "text-zipper";
-       version = "0.9";
-       sha256 = "4601bf9bc703a85a5053f507474b8d0227c3391b4ce95ef0d22f9affa0dfd9b6";
+       version = "0.10";
+       sha256 = "c59a649757b4e7026c204bdebc08bcfe234f2dbcd252467a6cd8d71c0f38176e";
        libraryHaskellDepends = [ base deepseq text vector ];
+       testHaskellDepends = [ base hspec QuickCheck text ];
        homepage = "https://github.com/jtdaugherty/text-zipper/";
        description = "A text editor zipper library";
        license = stdenv.lib.licenses.bsd3;
@@ -176908,6 +177310,7 @@ self: {
        homepage = "https://github.com/barischj/threepenny-gui-contextmenu#readme";
        description = "Write simple nested context menus for threepenny-gui";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "thrift" = callPackage
@@ -177056,8 +177459,8 @@ self: {
      }:
      mkDerivation {
        pname = "tianbar";
-       version = "1.2.4";
-       sha256 = "f0b09681dcdad8ba282d8572227401008175b326998b20a1391b720a3087db00";
+       version = "1.2.5";
+       sha256 = "c18c29594d5ca7762246a531b7da920d98f04e4432a9f46d788a0ecaf80e83c6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -178261,7 +178664,7 @@ self: {
        homepage = "https://github.com/peti/titlecase#readme";
        description = "Convert English words to title case";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "tkhs" = callPackage
@@ -178495,6 +178898,7 @@ self: {
        homepage = "https://github.com/vmchale/toboggan#readme";
        description = "Twitter bot generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "todos" = callPackage
@@ -179524,8 +179928,8 @@ self: {
      }:
      mkDerivation {
        pname = "treemap";
-       version = "1.20160814";
-       sha256 = "95aa1f68710aaff75bbd71317f61fe6e47c4f20bdaabfb4be05514f6f841f97f";
+       version = "2.0.0.20161218";
+       sha256 = "709fb2c5f6da414f7c4e6ec66682dea7a63b595ab08e29ff5475273c60d4b0a3";
        libraryHaskellDepends = [
          base containers deepseq semigroups strict transformers
        ];
@@ -179671,32 +180075,6 @@ self: {
      }) {};
 
   "trifecta" = callPackage
-    ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base
-     , blaze-builder, blaze-html, blaze-markup, bytestring, charset
-     , comonad, containers, deepseq, directory, doctest, filepath
-     , fingertree, ghc-prim, hashable, lens, mtl, parsers, profunctors
-     , QuickCheck, reducers, semigroups, transformers
-     , unordered-containers, utf8-string
-     }:
-     mkDerivation {
-       pname = "trifecta";
-       version = "1.6.1";
-       sha256 = "854c2892ffddfa5315206a1ff94b4814517933c496acf5b7ae09fdde72a28cf7";
-       libraryHaskellDepends = [
-         ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html
-         blaze-markup bytestring charset comonad containers deepseq
-         fingertree ghc-prim hashable lens mtl parsers profunctors reducers
-         semigroups transformers unordered-containers utf8-string
-       ];
-       testHaskellDepends = [
-         base directory doctest filepath parsers QuickCheck
-       ];
-       homepage = "http://github.com/ekmett/trifecta/";
-       description = "A modern parser combinator library with convenient diagnostics";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "trifecta_1_6_2_1" = callPackage
     ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base
      , blaze-builder, blaze-html, blaze-markup, bytestring, charset
      , comonad, containers, deepseq, directory, doctest, filepath
@@ -179720,7 +180098,6 @@ self: {
        homepage = "http://github.com/ekmett/trifecta/";
        description = "A modern parser combinator library with convenient diagnostics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "trimpolya" = callPackage
@@ -181367,8 +181744,8 @@ self: {
      }:
      mkDerivation {
        pname = "type-natural";
-       version = "0.7.1.2";
-       sha256 = "c278c2660616179e61641d1d5356549946560ef2de66416b20d868f5fe1082e6";
+       version = "0.7.1.3";
+       sha256 = "56d3962fb5c7a9e858f75603e1dc8d73c8a8adea65a0097bdf5ef033b0529ee2";
        libraryHaskellDepends = [
          base constraints equational-reasoning ghc-typelits-natnormalise
          ghc-typelits-presburger monomorphic singletons template-haskell
@@ -181886,27 +182263,6 @@ self: {
      }) {};
 
   "tzdata" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, HUnit
-     , test-framework, test-framework-hunit, test-framework-th, unix
-     , vector
-     }:
-     mkDerivation {
-       pname = "tzdata";
-       version = "0.1.20160614.0";
-       sha256 = "fb9b13398b66f05d863082f7c811fdd26d77e3a39a254abe8ea337a88a6fa27d";
-       libraryHaskellDepends = [
-         base bytestring containers deepseq vector
-       ];
-       testHaskellDepends = [
-         base bytestring HUnit test-framework test-framework-hunit
-         test-framework-th unix
-       ];
-       homepage = "https://github.com/nilcons/haskell-tzdata";
-       description = "Time zone database (as files and as a module)";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "tzdata_0_1_20161123_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, HUnit
      , test-framework, test-framework-hunit, test-framework-th, unix
      , vector
@@ -181925,7 +182281,6 @@ self: {
        homepage = "https://github.com/nilcons/haskell-tzdata";
        description = "Time zone database (as files and as a module)";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "u2f" = callPackage
@@ -188275,8 +188630,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.2.10";
-       sha256 = "d81fe27a416ed64555077246e500118dc7921455ae5bbdf117459c4e8e0b8b48";
+       version = "3.2.11";
+       sha256 = "193e6cd899c09850819c09ae4a4368f569ee65559eef3f440be83b6c2b2cffac";
        libraryHaskellDepends = [
          array async auto-update base blaze-builder bytestring
          bytestring-builder case-insensitive containers ghc-prim hashable
@@ -188487,6 +188842,8 @@ self: {
        pname = "wavefront-obj";
        version = "0.1.0.1";
        sha256 = "f73744ebc9dd035686f089c368434bf6940bd0c9928258aa00b7258677c0e258";
+       revision = "1";
+       editedCabalFile = "cc24c326de34450af4b05b7955448c43eac411d657cf52c37014031ce2ba6388";
        libraryHaskellDepends = [
          attoparsec base containers linear text transformers
        ];
@@ -189686,6 +190043,7 @@ self: {
        homepage = "https://github.com/erikd/wide-word";
        description = "Data types for large but fixed width signed and unsigned integers";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wigner-symbols" = callPackage
@@ -189718,6 +190076,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wikicfp-scraper_0_1_0_8" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec
+     , scalpel-core, text, time
+     }:
+     mkDerivation {
+       pname = "wikicfp-scraper";
+       version = "0.1.0.8";
+       sha256 = "645077540aadceb4de7b095462baa99967dd279203d7ed66a052562ac83b94a3";
+       libraryHaskellDepends = [
+         attoparsec base bytestring scalpel-core text time
+       ];
+       testHaskellDepends = [ base bytestring filepath hspec time ];
+       homepage = "https://github.com/debug-ito/wikicfp-scraper";
+       description = "Scrape WikiCFP web site";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wikipedia4epub" = callPackage
     ({ mkDerivation, base, bytestring, directory, epub, filepath
      , haskell98, HTTP, network, regex-base, regex-posix, tagsoup, url
@@ -191385,6 +191761,7 @@ self: {
        homepage = "http://github.com/tych0/xcffib";
        description = "A cffi-based python binding for X";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xchat-plugin" = callPackage
@@ -191974,7 +192351,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "xml-conduit_1_4_0_2" = callPackage
+  "xml-conduit_1_4_0_3" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, bytestring, conduit, conduit-extra, containers
      , data-default, deepseq, hspec, HUnit, monad-control, resourcet
@@ -191982,8 +192359,8 @@ self: {
      }:
      mkDerivation {
        pname = "xml-conduit";
-       version = "1.4.0.2";
-       sha256 = "55f77ce489fd04a2602733a55e8b7487a565f9bbb877a7ce606f2fd6c1fbe318";
+       version = "1.4.0.3";
+       sha256 = "b924632258a68fc31d5c14e00393f9c38bdfad8fb753010b8a6b5b417d99bbdf";
        libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-html blaze-markup bytestring
          conduit conduit-extra containers data-default deepseq monad-control
@@ -192389,6 +192766,40 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "xml-tydom-conduit" = callPackage
+    ({ mkDerivation, base, containers, QuickCheck, quickcheck-instances
+     , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text
+     , time, xml-conduit, xml-tydom-core
+     }:
+     mkDerivation {
+       pname = "xml-tydom-conduit";
+       version = "0.1.0.0";
+       sha256 = "e591994b28dc0aa6464167d1e28ae47fdb2350285064356ff4c528cd4b9b6a5d";
+       libraryHaskellDepends = [
+         base containers template-haskell text time xml-conduit
+         xml-tydom-core
+       ];
+       testHaskellDepends = [
+         base QuickCheck quickcheck-instances tasty tasty-hunit
+         tasty-quickcheck text time xml-conduit
+       ];
+       homepage = "https://github.com/lancelet/xml-tydom";
+       description = "Typed XML encoding for an xml-conduit backend";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "xml-tydom-core" = callPackage
+    ({ mkDerivation, base, containers, mtl, QuickCheck, text }:
+     mkDerivation {
+       pname = "xml-tydom-core";
+       version = "0.1.0.0";
+       sha256 = "7424a0f322d93acc08282e85ca0ec168d9868c53902c7cf467b957cc1ce35b27";
+       libraryHaskellDepends = [ base containers mtl QuickCheck text ];
+       homepage = "https://github.com/lancelet/xml-tydom";
+       description = "Typed XML encoding (core library)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "xml-types" = callPackage
     ({ mkDerivation, base, deepseq, text }:
      mkDerivation {
@@ -193208,15 +193619,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "yahoo-finance-api_0_2_0_0" = callPackage
+  "yahoo-finance-api_0_2_0_1" = callPackage
     ({ mkDerivation, aeson, base, doctest, either, Glob, hspec
      , http-api-data, http-client, http-client-tls, mtl, safe, servant
      , servant-client, text, time, transformers, vector
      }:
      mkDerivation {
        pname = "yahoo-finance-api";
-       version = "0.2.0.0";
-       sha256 = "a2d01a542ca627abe791d95d7e38234f731a356aa9f6e2d0f81c7df050bff3c7";
+       version = "0.2.0.1";
+       sha256 = "329eea56d8a285877164e82110a3376a6b604fff2198d387def727d06979e496";
        libraryHaskellDepends = [
          aeson base either http-api-data http-client mtl servant
          servant-client text time transformers vector
@@ -193855,8 +194266,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth";
-       version = "1.4.15";
-       sha256 = "a917b003c348aa4b3d8c673efb32e0ea0f9190affa86d435b9bea9f11ab85cfd";
+       version = "1.4.16";
+       sha256 = "a2c76409522ac276b92d31e13ffa94ae51194ffdb902a41f979d25181a5182d2";
        libraryHaskellDepends = [
          aeson authenticate base base16-bytestring base64-bytestring binary
          blaze-builder blaze-html blaze-markup byteable bytestring conduit
@@ -194231,39 +194642,6 @@ self: {
      }) {};
 
   "yesod-bin" = callPackage
-    ({ mkDerivation, async, attoparsec, base, base64-bytestring
-     , blaze-builder, bytestring, Cabal, conduit, conduit-extra
-     , containers, data-default-class, deepseq, directory, file-embed
-     , filepath, fsnotify, ghc, ghc-paths, http-client, http-conduit
-     , http-reverse-proxy, http-types, lifted-base, network
-     , optparse-applicative, parsec, process, project-template
-     , resourcet, shakespeare, split, streaming-commons, tar
-     , template-haskell, text, time, transformers, transformers-compat
-     , unix-compat, unordered-containers, wai, wai-extra, warp, warp-tls
-     , yaml, zlib
-     }:
-     mkDerivation {
-       pname = "yesod-bin";
-       version = "1.4.18.7";
-       sha256 = "ff75fc8bc7b37d6960436dab4a97697bc172d5092f5125b23791c8efdd01ed96";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         async attoparsec base base64-bytestring blaze-builder bytestring
-         Cabal conduit conduit-extra containers data-default-class deepseq
-         directory file-embed filepath fsnotify ghc ghc-paths http-client
-         http-conduit http-reverse-proxy http-types lifted-base network
-         optparse-applicative parsec process project-template resourcet
-         shakespeare split streaming-commons tar template-haskell text time
-         transformers transformers-compat unix-compat unordered-containers
-         wai wai-extra warp warp-tls yaml zlib
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "The yesod helper executable";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-bin_1_5_1" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring
      , blaze-builder, bytestring, Cabal, conduit, conduit-extra
      , containers, data-default-class, deepseq, directory, file-embed
@@ -194295,7 +194673,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "The yesod helper executable";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-bootstrap" = callPackage
@@ -194406,10 +194783,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-core";
-       version = "1.4.30";
-       sha256 = "1136dbf0beacbb7ea18b73616e059aa85ec5fbbf0ecae88e7ff3ac8eb685f654";
-       revision = "1";
-       editedCabalFile = "34f11a73eab3b105720ffa017f48217bc3dc383347e36b7584e137e0462bd181";
+       version = "1.4.31";
+       sha256 = "9a2e4c39c9ce66c2881d5da6c9a621c07492c950d935231aa7e12ed3a008d7af";
        libraryHaskellDepends = [
          aeson auto-update base blaze-builder blaze-html blaze-markup
          byteable bytestring case-insensitive cereal clientsession conduit
@@ -194657,8 +195032,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-form";
-       version = "1.4.9";
-       sha256 = "bd53f12d97a89e93b15fc6b06e63fbe041301635508f933203596f349a74110d";
+       version = "1.4.10";
+       sha256 = "ddeb72988e1dffb1c3766c35941520aa6ff6a8b09d6bdeb453d9c75d11ad8e43";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder blaze-html blaze-markup
          byteable bytestring containers data-default email-validate

From 57507f08e8f297d700c4c508b495490ad86263d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Thu, 2 Feb 2017 16:49:28 +0100
Subject: [PATCH 553/899] haskell-modules: split off nix-specific overrides and
 common ones

This allows the nix-specific overrides to be reused for other purposes,
with different haskell package sets, etc.
---
 .../haskell-modules/configuration-common.nix  | 346 +---------------
 .../haskell-modules/configuration-nix.nix     | 386 ++++++++++++++++++
 pkgs/development/haskell-modules/default.nix  |   4 +-
 3 files changed, 403 insertions(+), 333 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/configuration-nix.nix

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 047bfa33cbb..81eff1d4250 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1,3 +1,14 @@
+# COMMON OVERRIDES FOR THE HASKELL PACKAGE SET IN NIXPKGS
+#
+# This file contains haskell package overrides that are shared by all
+# haskell package sets provided by nixpkgs and distributed via the official
+# NixOS hydra instance.
+#
+# Overrides that would also make sense for custom haskell package sets not provided
+# as part of nixpkgs and that are specific to Nix should go in configuration-nix.nix
+#
+# See comment at the top of configuration-nix.nix for more information about this
+# distinction.
 { pkgs }:
 
 with import ./lib.nix { inherit pkgs; };
@@ -15,9 +26,6 @@ self: super: {
   # Link statically to avoid runtime dependency on GHC.
   jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = self.Cabal_1_20_0_4; };
 
-  # Apply NixOS-specific patches.
-  ghc-paths = appendPatch super.ghc-paths ./patches/ghc-paths-nix.patch;
-
   # enable using a local hoogle with extra packagages in the database
   # nix-shell -p "haskellPackages.hoogleLocal (with haskellPackages; [ mtl lens ])"
   # $ hoogle server
@@ -35,9 +43,6 @@ self: super: {
   statistics = dontCheck super.statistics;
   c2hs = dontCheck super.c2hs;
 
-  # fix errors caused by hardening flags
-  epanet-haskell = disableHardening super.epanet-haskell ["format"];
-
   # This test keeps being aborted because it runs too quietly for too long
   Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2;
 
@@ -66,49 +71,11 @@ self: super: {
     hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
   };
 
-  # CUDA needs help finding the SDK headers and libraries.
-  cuda = overrideCabal super.cuda (drv: {
-    extraLibraries = (drv.extraLibraries or []) ++ [pkgs.linuxPackages.nvidia_x11];
-    configureFlags = (drv.configureFlags or []) ++
-      pkgs.lib.optional pkgs.stdenv.is64bit "--extra-lib-dirs=${pkgs.cudatoolkit}/lib64" ++ [
-      "--extra-lib-dirs=${pkgs.cudatoolkit}/lib"
-      "--extra-include-dirs=${pkgs.cudatoolkit}/include"
-    ];
-    preConfigure = ''
-      unset CC          # unconfuse the haskell-cuda configure script
-      sed -i -e 's|/usr/local/cuda|${pkgs.cudatoolkit}|g' configure
-    '';
-  });
-
-  # jni needs help finding libjvm.so because it's in a weird location.
-  jni = overrideCabal super.jni (drv: {
-    preConfigure = ''
-      local libdir=( "${pkgs.jdk}/lib/openjdk/jre/lib/"*"/server" )
-      configureFlags+=" --extra-lib-dir=''${libdir[0]}"
-    '';
-  });
-
-  # The package doesn't know about the AL include hierarchy.
-  # https://github.com/phaazon/al/issues/1
-  al = appendConfigureFlag super.al "--extra-include-dirs=${pkgs.openal}/include/AL";
-
   # https://github.com/froozen/kademlia/issues/2
   kademlia = dontCheck super.kademlia;
 
-  # Won't find it's header files without help.
-  sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";
-
-  hzk = overrideCabal super.hzk (drv: {
-    preConfigure = "sed -i -e /include-dirs/d hzk.cabal";
-    configureFlags =  "--extra-include-dirs=${pkgs.zookeeper_mt}/include/zookeeper";
-    doCheck = false;
-  });
-
-  haskakafka = overrideCabal super.haskakafka (drv: {
-    preConfigure = "sed -i -e /extra-lib-dirs/d -e /include-dirs/d haskakafka.cabal";
-    configureFlags =  "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka";
-    doCheck = false;
-  });
+  hzk = dontCheck super.hzk;
+  haskakafka = dontCheck super.haskakafka;
 
   # Depends on broken "lss" package.
   snaplet-lss = dontDistribute super.snaplet-lss;
@@ -127,9 +94,6 @@ self: super: {
   # Depends on broken "hails" package.
   hails-bin = dontDistribute super.hails-bin;
 
-  # Foreign dependency name clashes with another Haskell package.
-  libarchive-conduit = super.libarchive-conduit.override { archive = pkgs.libarchive; };
-
   # Switch levmar build to openblas.
   bindings-levmar = overrideCabal super.bindings-levmar (drv: {
     preConfigure = ''
@@ -192,11 +156,6 @@ self: super: {
     # https://github.com/jaspervdj/hakyll/issues/491
     else dontCheck super.hakyll;
 
-  # Heist's test suite requires system pandoc
-  heist = overrideCabal super.heist (drv: {
-    testToolDepends = [pkgs.pandoc];
-  });
-
   # cabal2nix likes to generate dependencies on hinotify when hfsevents is really required
   # on darwin: https://github.com/NixOS/cabal2nix/issues/146.
   hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify;
@@ -208,20 +167,6 @@ self: super: {
     then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa
     else dontCheck super.fsnotify;
 
-  # the system-fileio tests use canonicalizePath, which fails in the sandbox
-  system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio;
-
-  # Prevents needing to add security_tool as a build tool to all of x509-system's
-  # dependencies.
-  x509-system = if pkgs.stdenv.isDarwin && !pkgs.stdenv.cc.nativeLibc
-    then let inherit (pkgs.darwin) security_tool;
-      in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: {
-        postPatch = (drv.postPatch or "") + ''
-          substituteInPlace System/X509/MacOS.hs --replace security ${security_tool}/bin/security
-        '';
-      })
-    else super.x509-system;
-
   double-conversion = if !pkgs.stdenv.isDarwin
     then addExtraLibrary super.double-conversion pkgs.stdenv.cc.cc.lib
     else addExtraLibrary (overrideCabal super.double-conversion (drv:
@@ -243,29 +188,9 @@ self: super: {
   # tests don't compile for some odd reason
   jwt = dontCheck super.jwt;
 
-  # https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216
-  gio = disableHardening (addPkgconfigDepend (addBuildTool super.gio self.gtk2hs-buildtools) pkgs.glib) ["fortify"];
-  glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.gtk2hs-buildtools) pkgs.glib) ["fortify"];
-  gtk3 = disableHardening (super.gtk3.override { inherit (pkgs) gtk3; }) ["fortify"];
-  gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.gtk2hs-buildtools) pkgs.gtk2) ["fortify"];
-  gtksourceview2 = (addPkgconfigDepend super.gtksourceview2 pkgs.gtk2).override { inherit (pkgs.gnome2) gtksourceview; };
-  gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; };
-
-  # Need WebkitGTK, not just webkit.
-  webkit = super.webkit.override { webkit = pkgs.webkitgtk2; };
-  webkitgtk3 = super.webkitgtk3.override { webkit = pkgs.webkitgtk24x; };
-  webkitgtk3-javascriptcore = super.webkitgtk3-javascriptcore.override { webkit = pkgs.webkitgtk24x; };
-  websnap = super.websnap.override { webkit = pkgs.webkitgtk24x; };
-
   # https://github.com/mvoidex/hsdev/issues/11
   hsdev = dontHaddock super.hsdev;
 
-  hs-mesos = overrideCabal super.hs-mesos (drv: {
-    # Pass _only_ mesos; the correct protobuf is propagated.
-    extraLibraries = [ pkgs.mesos ];
-    preConfigure = "sed -i -e /extra-lib-dirs/d -e 's|, /usr/include, /usr/local/include/mesos||' hs-mesos.cabal";
-  });
-
   # Upstream notified by e-mail.
   permutation = dontCheck super.permutation;
 
@@ -307,38 +232,6 @@ self: super: {
   HerbiePlugin = dontCheck super.HerbiePlugin;
   wai-cors = dontCheck super.wai-cors;
 
-  # These packages try to access the network.
-  amqp = dontCheck super.amqp;
-  amqp-conduit = dontCheck super.amqp-conduit;
-  bitcoin-api = dontCheck super.bitcoin-api;
-  bitcoin-api-extra = dontCheck super.bitcoin-api-extra;
-  bitx-bitcoin = dontCheck super.bitx-bitcoin;          # http://hydra.cryp.to/build/926187/log/raw
-  concurrent-dns-cache = dontCheck super.concurrent-dns-cache;
-  digitalocean-kzs = dontCheck super.digitalocean-kzs;  # https://github.com/KazumaSATO/digitalocean-kzs/issues/1
-  github-types = dontCheck super.github-types;          # http://hydra.cryp.to/build/1114046/nixlog/1/raw
-  hadoop-rpc = dontCheck super.hadoop-rpc;              # http://hydra.cryp.to/build/527461/nixlog/2/raw
-  hasql = dontCheck super.hasql;                        # http://hydra.cryp.to/build/502489/nixlog/4/raw
-  hasql-transaction = dontCheck super.hasql-transaction; # wants to connect to postgresql
-  hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; });
-  marmalade-upload = dontCheck super.marmalade-upload;  # http://hydra.cryp.to/build/501904/nixlog/1/raw
-  mongoDB = dontCheck super.mongoDB;
-  network-transport-tcp = dontCheck super.network-transport-tcp;
-  network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30
-  pipes-mongodb = dontCheck super.pipes-mongodb;        # http://hydra.cryp.to/build/926195/log/raw
-  raven-haskell = dontCheck super.raven-haskell;        # http://hydra.cryp.to/build/502053/log/raw
-  riak = dontCheck super.riak;                          # http://hydra.cryp.to/build/498763/log/raw
-  scotty-binding-play = dontCheck super.scotty-binding-play;
-  servant-router = dontCheck super.servant-router;
-  serversession-backend-redis = dontCheck super.serversession-backend-redis;
-  slack-api = dontCheck super.slack-api;                # https://github.com/mpickering/slack-api/issues/5
-  socket = dontCheck super.socket;
-  stackage = dontCheck super.stackage;                  # http://hydra.cryp.to/build/501867/nixlog/1/raw
-  textocat-api = dontCheck super.textocat-api;          # http://hydra.cryp.to/build/887011/log/raw
-  warp = dontCheck super.warp;                          # http://hydra.cryp.to/build/501073/nixlog/5/raw
-  wreq = dontCheck super.wreq;                          # http://hydra.cryp.to/build/501895/nixlog/1/raw
-  wreq-sb = dontCheck super.wreq-sb;                    # http://hydra.cryp.to/build/783948/log/raw
-  wuss = dontCheck super.wuss;                          # http://hydra.cryp.to/build/875964/nixlog/2/raw
-
   # https://github.com/NICTA/digit/issues/3
   digit = dontCheck super.digit;
 
@@ -348,9 +241,6 @@ self: super: {
   # https://github.com/ekmett/structures/issues/3
   structures = dontCheck super.structures;
 
-  # Tries to mess with extended POSIX attributes, but can't in our chroot environment.
-  xattr = dontCheck super.xattr;
-
   # Disable test suites to fix the build.
   acme-year = dontCheck super.acme-year;                # http://hydra.cryp.to/build/497858/log/raw
   aeson-lens = dontCheck super.aeson-lens;              # http://hydra.cryp.to/build/496769/log/raw
@@ -426,8 +316,6 @@ self: super: {
   HTF = dontCheck super.HTF;
   htsn = dontCheck super.htsn;
   htsn-import = dontCheck super.htsn-import;
-  http-client-openssl = dontCheck super.http-client-openssl;
-  http-client-tls = dontCheck super.http-client-tls;
   ihaskell = dontCheck super.ihaskell;
   influxdb = dontCheck super.influxdb;
   itanium-abi = dontCheck super.itanium-abi;
@@ -492,9 +380,6 @@ self: super: {
   snap-core = dontCheck super.snap-core;
   sourcemap = dontCheck super.sourcemap;
 
-   # Needs access to locale data, but looks for it in the wrong place.
-  scholdoc-citeproc = dontCheck super.scholdoc-citeproc;
-
   # These test suites run for ages, even on a fast machine. This is nuts.
   Random123 = dontCheck super.Random123;
   systemd = dontCheck super.systemd;
@@ -505,12 +390,6 @@ self: super: {
   # https://github.com/bos/snappy/issues/1
   snappy = dontCheck super.snappy;
 
-  # Expect to find sendmail(1) in $PATH.
-  mime-mail = appendConfigureFlag super.mime-mail "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"sendmail\"";
-
-  # Help the test suite find system timezone data.
-  tz = overrideCabal super.tz (drv: { preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; });
-
   # https://ghc.haskell.org/trac/ghc/ticket/9625
   vty = dontCheck super.vty;
   vty_5_15 = dontCheck super.vty_5_15;
@@ -530,18 +409,12 @@ self: super: {
   # https://github.com/pixbi/duplo/issues/25
   duplo = dontCheck super.duplo;
 
-  # Nix-specific workaround
-  xmonad = appendPatch (dontCheck super.xmonad) ./patches/xmonad-nix.patch;
-
   # https://github.com/evanrinehart/mikmod/issues/1
   mikmod = addExtraLibrary super.mikmod pkgs.libmikmod;
 
   # https://github.com/basvandijk/threads/issues/10
   threads = dontCheck super.threads;
 
-  # https://github.com/ucsd-progsys/liquid-fixpoint/issues/44
-  liquid-fixpoint = overrideCabal super.liquid-fixpoint (drv: { preConfigure = "patchShebangs ."; });
-
   # Missing module.
   rematch = dontCheck super.rematch;            # https://github.com/tcrayford/rematch/issues/5
   rematch-text = dontCheck super.rematch-text;  # https://github.com/tcrayford/rematch/issues/6
@@ -561,11 +434,6 @@ self: super: {
   # https://github.com/vincenthz/hs-asn1/issues/12
   asn1-encoding = dontCheck super.asn1-encoding;
 
-  # wxc supports wxGTX >= 3.0, but our current default version points to 2.8.
-  # http://hydra.cryp.to/build/1331287/log/raw
-  wxc = (addBuildDepend super.wxc self.split).override { wxGTK = pkgs.wxGTK30; };
-  wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK30; };
-
   # Depends on QuickCheck 1.x.
   HaVSA = super.HaVSA.override { QuickCheck = self.QuickCheck_1_2_0_1; };
   test-framework-quickcheck = super.test-framework-quickcheck.override { QuickCheck = self.QuickCheck_1_2_0_1; };
@@ -587,9 +455,6 @@ self: super: {
   # https://github.com/alephcloud/hs-configuration-tools/issues/40
   configuration-tools = dontCheck super.configuration-tools;
 
-  # Test suite wants to connect to $DISPLAY.
-  hsqml = dontCheck (addExtraLibrary (super.hsqml.override { qt5 = pkgs.qt5Full; }) pkgs.mesa);
-
   # HsColour: Language/Unlambda.hs: hGetContents: invalid argument (invalid byte sequence)
   unlambda = dontHyperlinkSource super.unlambda;
 
@@ -607,10 +472,6 @@ self: super: {
     preConfigure = "sed -i -e 's,time .* < 1.6,time >= 1.5,' -e 's,haddock-library >= 1.1 && < 1.3,haddock-library >= 1.1,' pandoc.cabal";
   });
 
-  # Tests attempt to use NPM to install from the network into
-  # /homeless-shelter. Disabled.
-  purescript = dontCheck super.purescript;
-
   # Requires bower-json >= 1.0.0.1 && < 1.1
   purescript_0_10_5 = super.purescript_0_10_5.overrideScope (self: super: {
     bower-json = self.bower-json_1_0_0_1;
@@ -636,50 +497,6 @@ self: super: {
   # https://github.com/anton-k/csound-expression-dynamic/issues/1
   csound-expression-dynamic = dontHaddock super.csound-expression-dynamic;
 
-  # Hardcoded include path
-  poppler = overrideCabal super.poppler (drv: {
-    postPatch = ''
-      sed -i -e 's,glib/poppler.h,poppler.h,' poppler.cabal
-      sed -i -e 's,glib/poppler.h,poppler.h,' Graphics/UI/Gtk/Poppler/Structs.hsc
-    '';
-  });
-
-  # Uses OpenGL in testing
-  caramia = dontCheck super.caramia;
-
-  llvm-general-darwin = overrideCabal (super.llvm-general.override { llvm-config = pkgs.llvm_35; }) (drv: {
-      preConfigure = ''
-        sed -i llvm-general.cabal \
-            -e 's,extra-libraries: stdc++,extra-libraries: c++,'
-      '';
-      configureFlags = (drv.configureFlags or []) ++ ["--extra-include-dirs=${pkgs.libcxx}/include/c++/v1"];
-      librarySystemDepends = [ pkgs.libcxx ] ++ drv.librarySystemDepends or [];
-    });
-
-  # Supports only 3.5 for now, https://github.com/bscarlet/llvm-general/issues/142
-  llvm-general =
-    if pkgs.stdenv.isDarwin
-    then self.llvm-general-darwin
-    else super.llvm-general.override { llvm-config = pkgs.llvm_35; };
-
-  # Needs help finding LLVM.
-  spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm;
-
-  # Tries to run GUI in tests
-  leksah = dontCheck (overrideCabal super.leksah (drv: {
-    executableSystemDepends = (drv.executableSystemDepends or []) ++ (with pkgs; [
-      gnome3.defaultIconTheme # Fix error: Icon 'window-close' not present in theme ...
-      wrapGAppsHook           # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system
-      gtk3                    # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed
-    ]);
-    postPatch = (drv.postPatch or "") + ''
-      for f in src/IDE/Leksah.hs src/IDE/Utils/ServerConnection.hs
-      do
-        substituteInPlace "$f" --replace "\"leksah-server\"" "\"${self.leksah-server}/bin/leksah-server\""
-      done
-    '';
-  }));
-
   # Packages of the diagrams ecosystem that require:
   #   diagrams-core ==1.4.*
   #   diagrams-lib ==1.4.*
@@ -715,9 +532,6 @@ self: super: {
     optparse-applicative = self.optparse-applicative_0_13_0_0;
   });
 
-  # Patch to consider NIX_GHC just like xmonad does
-  dyre = appendPatch super.dyre ./patches/dyre-nix.patch;
-
   # Test suite won't compile against tasty-hunit 0.9.x.
   zlib = dontCheck super.zlib;
 
@@ -770,14 +584,6 @@ self: super: {
   # https://github.com/yesodweb/serversession/issues/1
   serversession = dontCheck super.serversession;
 
-  yesod-bin = if pkgs.stdenv.isDarwin
-    then addBuildDepend super.yesod-bin pkgs.darwin.apple_sdk.frameworks.Cocoa
-    else super.yesod-bin;
-
-  hmatrix = if pkgs.stdenv.isDarwin
-    then addBuildDepend super.hmatrix pkgs.darwin.apple_sdk.frameworks.Accelerate
-    else super.hmatrix;
-
   # Hydra no longer allows building texlive packages.
   lhs2tex = dontDistribute super.lhs2tex;
 
@@ -793,16 +599,6 @@ self: super: {
   # https://github.com/kazu-yamamoto/logger/issues/42
   logger = dontCheck super.logger;
 
-  # https://github.com/edwinb/EpiVM/issues/13
-  # https://github.com/edwinb/EpiVM/issues/14
-  epic = addExtraLibraries (addBuildTool super.epic self.happy) [pkgs.boehmgc pkgs.gmp];
-
-  # https://github.com/ekmett/wl-pprint-terminfo/issues/7
-  wl-pprint-terminfo = addExtraLibrary super.wl-pprint-terminfo pkgs.ncurses;
-
-  # https://github.com/bos/pcap/issues/5
-  pcap = addExtraLibrary super.pcap pkgs.libpcap;
-
   # https://github.com/qnikst/imagemagick/issues/34
   imagemagick = dontCheck super.imagemagick;
 
@@ -892,40 +688,6 @@ self: super: {
   # https://github.com/bos/configurator/issues/22
   configurator = dontCheck super.configurator;
 
-  # The cabal files for these libraries do not list the required system dependencies.
-  miniball = overrideCabal super.miniball (drv: {
-    librarySystemDepends = [ pkgs.miniball ];
-  });
-  SDL-image = overrideCabal super.SDL-image (drv: {
-    librarySystemDepends = [ pkgs.SDL pkgs.SDL_image ] ++ drv.librarySystemDepends or [];
-  });
-  SDL-ttf = overrideCabal super.SDL-ttf (drv: {
-    librarySystemDepends = [ pkgs.SDL pkgs.SDL_ttf ];
-  });
-  SDL-mixer = overrideCabal super.SDL-mixer (drv: {
-    librarySystemDepends = [ pkgs.SDL pkgs.SDL_mixer ];
-  });
-  SDL-gfx = overrideCabal super.SDL-gfx (drv: {
-    librarySystemDepends = [ pkgs.SDL pkgs.SDL_gfx ];
-  });
-  SDL-mpeg = overrideCabal super.SDL-mpeg (drv: {
-    configureFlags = (drv.configureFlags or []) ++ [
-      "--extra-lib-dirs=${pkgs.smpeg}/lib"
-      "--extra-include-dirs=${pkgs.smpeg}/include/smpeg"
-    ];
-  });
-
-  # https://github.com/ivanperez-keera/hcwiid/pull/4
-  hcwiid = overrideCabal super.hcwiid (drv: {
-    configureFlags = (drv.configureFlags or []) ++ [
-      "--extra-lib-dirs=${pkgs.bluez.out}/lib"
-      "--extra-lib-dirs=${pkgs.cwiid}/lib"
-      "--extra-include-dirs=${pkgs.cwiid}/include"
-      "--extra-include-dirs=${pkgs.bluez.dev}/include"
-    ];
-    prePatch = '' sed -i -e "/Extra-Lib-Dirs/d" -e "/Include-Dirs/d" "hcwiid.cabal" '';
-  });
-
   # https://github.com/basvandijk/concurrent-extra/issues/12
   concurrent-extra = dontCheck super.concurrent-extra;
 
@@ -941,16 +703,6 @@ self: super: {
   # https://github.com/goldfirere/singletons/issues/122
   singletons = dontCheck super.singletons;
 
-  # cabal2nix doesn't pick up some of the dependencies.
-  ginsu = let
-    g = addBuildDepend super.ginsu pkgs.perl;
-    g' = overrideCabal g (drv: {
-      executableSystemDepends = (drv.executableSystemDepends or []) ++ [
-        pkgs.ncurses
-      ];
-    });
-  in g';
-
   # https://github.com/guillaume-nargeot/hpc-coveralls/issues/52
   hpc-coveralls = disableSharedExecutables super.hpc-coveralls;
 
@@ -963,72 +715,20 @@ self: super: {
   # https://github.com/sol/hpack/issues/53
   hpack = dontCheck super.hpack;
 
-  # Tests require `docker` command in PATH
-  # Tests require running docker service :on localhost
-  docker = dontCheck super.docker;
-
   # https://github.com/deech/fltkhs/issues/16
   fltkhs = overrideCabal super.fltkhs (drv: {
-    libraryToolDepends = (drv.libraryToolDepends or []) ++ [pkgs.autoconf];
-    librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.fltk13 pkgs.mesa_noglu pkgs.libjpeg];
     broken = true;      # linking fails because the build doesn't pull in the mesa libraries
   });
   fltkhs-fluid-examples = dontDistribute super.fltkhs-fluid-examples;
 
-  # https://github.com/skogsbaer/hscurses/pull/26
-  hscurses = overrideCabal super.hscurses (drv: {
-    librarySystemDepends = (drv.librarySystemDepends or []) ++ [ pkgs.ncurses ];
-  });
-
   # We get lots of strange compiler errors during the test suite run.
   jsaddle = dontCheck super.jsaddle;
 
-  # Looks like Avahi provides the missing library
-  dnssd = super.dnssd.override { dns_sd = pkgs.avahi.override { withLibdnssdCompat = true; }; };
-
   # Haste stuff
   haste-Cabal         = markBroken (self.callPackage ../tools/haskell/haste/haste-Cabal.nix {});
   haste-cabal-install = markBroken (self.callPackage ../tools/haskell/haste/haste-cabal-install.nix { Cabal = self.haste-Cabal; });
   haste-compiler      = markBroken (self.callPackage ../tools/haskell/haste/haste-compiler.nix { inherit overrideCabal; super-haste-compiler = super.haste-compiler; });
 
-  # Ensure the necessary frameworks are propagatedBuildInputs on darwin
-  OpenGLRaw = overrideCabal super.OpenGLRaw (drv: {
-    librarySystemDepends =
-      pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends;
-    libraryHaskellDepends = drv.libraryHaskellDepends
-      ++ pkgs.lib.optionals pkgs.stdenv.isDarwin
-                            [ pkgs.darwin.apple_sdk.frameworks.OpenGL ];
-    preConfigure = pkgs.lib.optionalString pkgs.stdenv.isDarwin ''
-      frameworkPaths=($(for i in $nativeBuildInputs; do if [ -d "$i"/Library/Frameworks ]; then echo "-F$i/Library/Frameworks"; fi done))
-      frameworkPaths=$(IFS=, ; echo "''${frameworkPaths[@]}")
-      configureFlags+=$(if [ -n "$frameworkPaths" ]; then echo -n "--ghc-options=-optl=$frameworkPaths"; fi)
-    '';
-  });
-  GLURaw = overrideCabal super.GLURaw (drv: {
-    librarySystemDepends =
-      pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends;
-    libraryHaskellDepends = drv.libraryHaskellDepends
-      ++ pkgs.lib.optionals pkgs.stdenv.isDarwin
-                            [ pkgs.darwin.apple_sdk.frameworks.OpenGL ];
-  });
-  bindings-GLFW = overrideCabal super.bindings-GLFW (drv: {
-    doCheck = false; # requires an active X11 display
-    librarySystemDepends =
-      pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends;
-    libraryHaskellDepends = drv.libraryHaskellDepends
-      ++ pkgs.lib.optionals pkgs.stdenv.isDarwin
-                            (with pkgs.darwin.apple_sdk.frameworks;
-                             [ AGL Cocoa OpenGL IOKit Kernel CoreVideo
-                               pkgs.darwin.CF ]);
-  });
-  OpenCL = overrideCabal super.OpenCL (drv: {
-    librarySystemDepends =
-      pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends;
-    libraryHaskellDepends = drv.libraryHaskellDepends
-      ++ pkgs.lib.optionals pkgs.stdenv.isDarwin
-                            [ pkgs.darwin.apple_sdk.frameworks.OpenCL ];
-  });
-
   # tinc is a new build driver a la Stack that's not yet available from Hackage.
   tinc = self.callPackage ../tools/haskell/tinc {};
 
@@ -1079,18 +779,6 @@ self: super: {
   # Test suite fails a QuickCheck property.
   optparse-applicative_0_13_0_0 = dontCheck super.optparse-applicative_0_13_0_0;
 
-  # GLUT uses `dlopen` to link to freeglut, so we need to set the RUNPATH correctly for
-  # it to find `libglut.so` from the nix store. We do this by patching GLUT.cabal to pkg-config
-  # depend on freeglut, which provides GHC to necessary information to generate a correct RPATH.
-  #
-  # Note: Simply patching the dynamic library (.so) of the GLUT build will *not* work, since the
-  # RPATH also needs to be propagated when using static linking. GHC automatically handles this for
-  # us when we patch the cabal file (Link options will be recored in the ghc package registry).
-  #
-  # Additional note: nixpkgs' freeglut and macOS's OpenGL implementation do not cooperate,
-  # so disable this on Darwin only
-  ${if pkgs.stdenv.isDarwin then null else "GLUT"} = addPkgconfigDepend (appendPatch super.GLUT ./patches/GLUT.patch) pkgs.freeglut;
-
   # https://github.com/Philonous/hs-stun/pull/1
   # Remove if a version > 0.1.0.1 ever gets released.
   stunclient = overrideCabal super.stunclient (drv: {
@@ -1099,15 +787,13 @@ self: super: {
     '';
   });
 
+  # test suite cannot find its own "idris" binary
   idris = overrideCabal super.idris (drv: {
     # "idris" binary cannot find Idris library otherwise while building. After
     # installing it's completely fine though. This seems like a bug in Idris
     # that's related to builds with shared libraries enabled. It would be great
     # if someone who knows a thing or two about Idris could look into this.
     preBuild = "export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH";
-    # https://github.com/idris-lang/Idris-dev/issues/2499
-    librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp];
-    # test suite cannot find its own "idris" binary
     doCheck = false;
   });
 
@@ -1183,10 +869,6 @@ self: super: {
   # note: the library is unmaintained, no upstream issue
   dataenc = doJailbreak super.dataenc;
 
-  libsystemd-journal = overrideCabal super.libsystemd-journal (old: {
-    librarySystemDepends = old.librarySystemDepends or [] ++ [ pkgs.systemd ];
-  });
-
   # horribly outdated (X11 interface changed a lot)
   sindre = markBroken super.sindre;
 
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
new file mode 100644
index 00000000000..ba3c7ef6746
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -0,0 +1,386 @@
+# NIX-SPECIFIC OVERRIDES/PATCHES FOR HASKELL PACKAGES
+#
+# This file contains overrides which are needed because of Nix. For example,
+# some packages may need help finding the location of native libraries. In
+# general, overrides in this file are (mostly) due to one of the following reasons:
+#
+# * packages that hard code the location of native libraries, so they need to be patched/
+#   supplied the patch explicitly
+# * passing native libraries that are not detected correctly by cabal2nix
+# * test suites that fail due to some features not available in the nix sandbox
+#   (networking being a common one)
+#
+# In general, this file should *not* contain overrides that fix build failures that could
+# also occur on standard, FHS-compliant non-Nix systems. For example, if tests have a compile
+# error, that is a bug in the package, and that failure has nothing to do with Nix.
+#
+# Common examples which should *not* be a part of this file:
+#
+# * overriding a specific version of a haskell library because some package fails
+#   to build with a newer version. Such overrides have nothing to do with Nix itself,
+#   and they would also be neccessary outside of Nix if you use the same set of
+#   package versions.
+# * disabling tests that fail due to missing files in the tarball or compile errors
+# * disabling tests that require too much memory
+# * enabling/disabling certain features in packages
+#
+# If you have an override of this kind, see configuration-common.nix instead.
+{ pkgs }:
+
+with import ./lib.nix { inherit pkgs; };
+
+self: super: builtins.intersectAttrs super {
+
+  # Apply NixOS-specific patches.
+  ghc-paths = appendPatch super.ghc-paths ./patches/ghc-paths-nix.patch;
+
+  # fix errors caused by hardening flags
+  epanet-haskell = disableHardening super.epanet-haskell ["format"];
+
+  # Link the proper version.
+  zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; };
+
+  # Use the default version of mysql to build this package (which is actually mariadb).
+  # test phase requires networking
+  mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.lib; });
+
+  # CUDA needs help finding the SDK headers and libraries.
+  cuda = overrideCabal super.cuda (drv: {
+    extraLibraries = (drv.extraLibraries or []) ++ [pkgs.linuxPackages.nvidia_x11];
+    configureFlags = (drv.configureFlags or []) ++
+      pkgs.lib.optional pkgs.stdenv.is64bit "--extra-lib-dirs=${pkgs.cudatoolkit}/lib64" ++ [
+      "--extra-lib-dirs=${pkgs.cudatoolkit}/lib"
+      "--extra-include-dirs=${pkgs.cudatoolkit}/include"
+    ];
+    preConfigure = ''
+      unset CC          # unconfuse the haskell-cuda configure script
+      sed -i -e 's|/usr/local/cuda|${pkgs.cudatoolkit}|g' configure
+    '';
+  });
+
+  # jni needs help finding libjvm.so because it's in a weird location.
+  jni = overrideCabal super.jni (drv: {
+    preConfigure = ''
+      local libdir=( "${pkgs.jdk}/lib/openjdk/jre/lib/"*"/server" )
+      configureFlags+=" --extra-lib-dir=''${libdir[0]}"
+    '';
+  });
+
+  # The package doesn't know about the AL include hierarchy.
+  # https://github.com/phaazon/al/issues/1
+  al = appendConfigureFlag super.al "--extra-include-dirs=${pkgs.openal}/include/AL";
+
+  # Won't find it's header files without help.
+  sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";
+
+  hzk = overrideCabal super.hzk (drv: {
+    preConfigure = "sed -i -e /include-dirs/d hzk.cabal";
+    configureFlags =  "--extra-include-dirs=${pkgs.zookeeper_mt}/include/zookeeper";
+  });
+
+  haskakafka = overrideCabal super.haskakafka (drv: {
+    preConfigure = "sed -i -e /extra-lib-dirs/d -e /include-dirs/d haskakafka.cabal";
+    configureFlags =  "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka";
+  });
+
+  # Foreign dependency name clashes with another Haskell package.
+  libarchive-conduit = super.libarchive-conduit.override { archive = pkgs.libarchive; };
+
+  # Fix Darwin build.
+  halive = if pkgs.stdenv.isDarwin
+    then addBuildDepend super.halive pkgs.darwin.apple_sdk.frameworks.AppKit
+    else super.halive;
+
+  # Heist's test suite requires system pandoc
+  heist = overrideCabal super.heist (drv: {
+    testToolDepends = [pkgs.pandoc];
+  });
+
+  # the system-fileio tests use canonicalizePath, which fails in the sandbox
+  system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio;
+
+  # Prevents needing to add security_tool as a build tool to all of x509-system's
+  # dependencies.
+  x509-system = if pkgs.stdenv.isDarwin && !pkgs.stdenv.cc.nativeLibc
+    then let inherit (pkgs.darwin) security_tool;
+      in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: {
+        postPatch = (drv.postPatch or "") + ''
+          substituteInPlace System/X509/MacOS.hs --replace security ${security_tool}/bin/security
+        '';
+      })
+    else super.x509-system;
+
+  # https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216
+  gio = disableHardening (addPkgconfigDepend (addBuildTool super.gio self.gtk2hs-buildtools) pkgs.glib) ["fortify"];
+  glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.gtk2hs-buildtools) pkgs.glib) ["fortify"];
+  gtk3 = disableHardening (super.gtk3.override { inherit (pkgs) gtk3; }) ["fortify"];
+  gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.gtk2hs-buildtools) pkgs.gtk2) ["fortify"];
+  gtksourceview2 = (addPkgconfigDepend super.gtksourceview2 pkgs.gtk2).override { inherit (pkgs.gnome2) gtksourceview; };
+  gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; };
+
+  # Need WebkitGTK, not just webkit.
+  webkit = super.webkit.override { webkit = pkgs.webkitgtk2; };
+  webkitgtk3 = super.webkitgtk3.override { webkit = pkgs.webkitgtk24x; };
+  webkitgtk3-javascriptcore = super.webkitgtk3-javascriptcore.override { webkit = pkgs.webkitgtk24x; };
+  websnap = super.websnap.override { webkit = pkgs.webkitgtk24x; };
+
+  hs-mesos = overrideCabal super.hs-mesos (drv: {
+    # Pass _only_ mesos; the correct protobuf is propagated.
+    extraLibraries = [ pkgs.mesos ];
+    preConfigure = "sed -i -e /extra-lib-dirs/d -e 's|, /usr/include, /usr/local/include/mesos||' hs-mesos.cabal";
+  });
+
+  # These packages try to access the network.
+  amqp = dontCheck super.amqp;
+  amqp-conduit = dontCheck super.amqp-conduit;
+  bitcoin-api = dontCheck super.bitcoin-api;
+  bitcoin-api-extra = dontCheck super.bitcoin-api-extra;
+  bitx-bitcoin = dontCheck super.bitx-bitcoin;          # http://hydra.cryp.to/build/926187/log/raw
+  concurrent-dns-cache = dontCheck super.concurrent-dns-cache;
+  digitalocean-kzs = dontCheck super.digitalocean-kzs;  # https://github.com/KazumaSATO/digitalocean-kzs/issues/1
+  github-types = dontCheck super.github-types;          # http://hydra.cryp.to/build/1114046/nixlog/1/raw
+  hadoop-rpc = dontCheck super.hadoop-rpc;              # http://hydra.cryp.to/build/527461/nixlog/2/raw
+  hasql = dontCheck super.hasql;                        # http://hydra.cryp.to/build/502489/nixlog/4/raw
+  hasql-transaction = dontCheck super.hasql-transaction; # wants to connect to postgresql
+  hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; });
+  marmalade-upload = dontCheck super.marmalade-upload;  # http://hydra.cryp.to/build/501904/nixlog/1/raw
+  mongoDB = dontCheck super.mongoDB;
+  network-transport-tcp = dontCheck super.network-transport-tcp;
+  network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30
+  pipes-mongodb = dontCheck super.pipes-mongodb;        # http://hydra.cryp.to/build/926195/log/raw
+  raven-haskell = dontCheck super.raven-haskell;        # http://hydra.cryp.to/build/502053/log/raw
+  riak = dontCheck super.riak;                          # http://hydra.cryp.to/build/498763/log/raw
+  scotty-binding-play = dontCheck super.scotty-binding-play;
+  servant-router = dontCheck super.servant-router;
+  serversession-backend-redis = dontCheck super.serversession-backend-redis;
+  slack-api = dontCheck super.slack-api;                # https://github.com/mpickering/slack-api/issues/5
+  socket = dontCheck super.socket;
+  stackage = dontCheck super.stackage;                  # http://hydra.cryp.to/build/501867/nixlog/1/raw
+  textocat-api = dontCheck super.textocat-api;          # http://hydra.cryp.to/build/887011/log/raw
+  warp = dontCheck super.warp;                          # http://hydra.cryp.to/build/501073/nixlog/5/raw
+  wreq = dontCheck super.wreq;                          # http://hydra.cryp.to/build/501895/nixlog/1/raw
+  wreq-sb = dontCheck super.wreq-sb;                    # http://hydra.cryp.to/build/783948/log/raw
+  wuss = dontCheck super.wuss;                          # http://hydra.cryp.to/build/875964/nixlog/2/raw
+  http-client = dontCheck super.http-client;
+  http-client-openssl = dontCheck super.http-client-openssl;
+  http-client-tls = dontCheck super.http-client-tls;
+  http-conduit = dontCheck super.http-conduit;
+  transient-universe = dontCheck super.transient-universe;
+
+  # Tries to mess with extended POSIX attributes, but can't in our chroot environment.
+  xattr = dontCheck super.xattr;
+
+   # Needs access to locale data, but looks for it in the wrong place.
+  scholdoc-citeproc = dontCheck super.scholdoc-citeproc;
+
+  # Expect to find sendmail(1) in $PATH.
+  mime-mail = appendConfigureFlag super.mime-mail "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"sendmail\"";
+
+  # Help the test suite find system timezone data.
+  tz = overrideCabal super.tz (drv: { preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; });
+
+  # Nix-specific workaround
+  xmonad = appendPatch (dontCheck super.xmonad) ./patches/xmonad-nix.patch;
+
+  # https://github.com/ucsd-progsys/liquid-fixpoint/issues/44
+  liquid-fixpoint = overrideCabal super.liquid-fixpoint (drv: { preConfigure = "patchShebangs ."; });
+
+  # wxc supports wxGTX >= 3.0, but our current default version points to 2.8.
+  # http://hydra.cryp.to/build/1331287/log/raw
+  wxc = (addBuildDepend super.wxc self.split).override { wxGTK = pkgs.wxGTK30; };
+  wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK30; };
+
+  # Test suite wants to connect to $DISPLAY.
+  hsqml = dontCheck (addExtraLibrary (super.hsqml.override { qt5 = pkgs.qt5Full; }) pkgs.mesa);
+
+  # Tests attempt to use NPM to install from the network into
+  # /homeless-shelter. Disabled.
+  purescript = dontCheck super.purescript;
+
+  # Hardcoded include path
+  poppler = overrideCabal super.poppler (drv: {
+    postPatch = ''
+      sed -i -e 's,glib/poppler.h,poppler.h,' poppler.cabal
+      sed -i -e 's,glib/poppler.h,poppler.h,' Graphics/UI/Gtk/Poppler/Structs.hsc
+    '';
+  });
+
+  # Uses OpenGL in testing
+  caramia = dontCheck super.caramia;
+
+  llvm-general-darwin = overrideCabal (super.llvm-general.override { llvm-config = pkgs.llvm_35; }) (drv: {
+      preConfigure = ''
+        sed -i llvm-general.cabal \
+            -e 's,extra-libraries: stdc++,extra-libraries: c++,'
+      '';
+      configureFlags = (drv.configureFlags or []) ++ ["--extra-include-dirs=${pkgs.libcxx}/include/c++/v1"];
+      librarySystemDepends = [ pkgs.libcxx ] ++ drv.librarySystemDepends or [];
+    });
+
+  # Supports only 3.5 for now, https://github.com/bscarlet/llvm-general/issues/142
+  llvm-general =
+    if pkgs.stdenv.isDarwin
+    then self.llvm-general-darwin
+    else super.llvm-general.override { llvm-config = pkgs.llvm_35; };
+
+  # Needs help finding LLVM.
+  spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm;
+
+  # Tries to run GUI in tests
+  leksah = dontCheck (overrideCabal super.leksah (drv: {
+    executableSystemDepends = (drv.executableSystemDepends or []) ++ (with pkgs; [
+      gnome3.defaultIconTheme # Fix error: Icon 'window-close' not present in theme ...
+      wrapGAppsHook           # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system
+      gtk3                    # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed
+    ]);
+    postPatch = (drv.postPatch or "") + ''
+      for f in src/IDE/Leksah.hs src/IDE/Utils/ServerConnection.hs
+      do
+        substituteInPlace "$f" --replace "\"leksah-server\"" "\"${self.leksah-server}/bin/leksah-server\""
+      done
+    '';
+  }));
+
+  # Patch to consider NIX_GHC just like xmonad does
+  dyre = appendPatch super.dyre ./patches/dyre-nix.patch;
+
+  yesod-bin = if pkgs.stdenv.isDarwin
+    then addBuildDepend super.yesod-bin pkgs.darwin.apple_sdk.frameworks.Cocoa
+    else super.yesod-bin;
+
+  hmatrix = if pkgs.stdenv.isDarwin
+    then addBuildDepend super.hmatrix pkgs.darwin.apple_sdk.frameworks.Accelerate
+    else super.hmatrix;
+
+  # https://github.com/edwinb/EpiVM/issues/13
+  # https://github.com/edwinb/EpiVM/issues/14
+  epic = addExtraLibraries (addBuildTool super.epic self.happy) [pkgs.boehmgc pkgs.gmp];
+
+  # https://github.com/ekmett/wl-pprint-terminfo/issues/7
+  wl-pprint-terminfo = addExtraLibrary super.wl-pprint-terminfo pkgs.ncurses;
+
+  # https://github.com/bos/pcap/issues/5
+  pcap = addExtraLibrary super.pcap pkgs.libpcap;
+
+  # The cabal files for these libraries do not list the required system dependencies.
+  miniball = overrideCabal super.miniball (drv: {
+    librarySystemDepends = [ pkgs.miniball ];
+  });
+  SDL-image = overrideCabal super.SDL-image (drv: {
+    librarySystemDepends = [ pkgs.SDL pkgs.SDL_image ] ++ drv.librarySystemDepends or [];
+  });
+  SDL-ttf = overrideCabal super.SDL-ttf (drv: {
+    librarySystemDepends = [ pkgs.SDL pkgs.SDL_ttf ];
+  });
+  SDL-mixer = overrideCabal super.SDL-mixer (drv: {
+    librarySystemDepends = [ pkgs.SDL pkgs.SDL_mixer ];
+  });
+  SDL-gfx = overrideCabal super.SDL-gfx (drv: {
+    librarySystemDepends = [ pkgs.SDL pkgs.SDL_gfx ];
+  });
+  SDL-mpeg = overrideCabal super.SDL-mpeg (drv: {
+    configureFlags = (drv.configureFlags or []) ++ [
+      "--extra-lib-dirs=${pkgs.smpeg}/lib"
+      "--extra-include-dirs=${pkgs.smpeg}/include/smpeg"
+    ];
+  });
+
+  # https://github.com/ivanperez-keera/hcwiid/pull/4
+  hcwiid = overrideCabal super.hcwiid (drv: {
+    configureFlags = (drv.configureFlags or []) ++ [
+      "--extra-lib-dirs=${pkgs.bluez.out}/lib"
+      "--extra-lib-dirs=${pkgs.cwiid}/lib"
+      "--extra-include-dirs=${pkgs.cwiid}/include"
+      "--extra-include-dirs=${pkgs.bluez.dev}/include"
+    ];
+    prePatch = '' sed -i -e "/Extra-Lib-Dirs/d" -e "/Include-Dirs/d" "hcwiid.cabal" '';
+  });
+
+  # cabal2nix doesn't pick up some of the dependencies.
+  ginsu = let
+    g = addBuildDepend super.ginsu pkgs.perl;
+    g' = overrideCabal g (drv: {
+      executableSystemDepends = (drv.executableSystemDepends or []) ++ [
+        pkgs.ncurses
+      ];
+    });
+  in g';
+
+  # Tests require `docker` command in PATH
+  # Tests require running docker service :on localhost
+  docker = dontCheck super.docker;
+
+  # https://github.com/deech/fltkhs/issues/16
+  fltkhs = overrideCabal super.fltkhs (drv: {
+    libraryToolDepends = (drv.libraryToolDepends or []) ++ [pkgs.autoconf];
+    librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.fltk13 pkgs.mesa_noglu pkgs.libjpeg];
+  });
+
+  # https://github.com/skogsbaer/hscurses/pull/26
+  hscurses = overrideCabal super.hscurses (drv: {
+    librarySystemDepends = (drv.librarySystemDepends or []) ++ [ pkgs.ncurses ];
+  });
+
+  # Looks like Avahi provides the missing library
+  dnssd = super.dnssd.override { dns_sd = pkgs.avahi.override { withLibdnssdCompat = true; }; };
+
+  # Ensure the necessary frameworks are propagatedBuildInputs on darwin
+  OpenGLRaw = overrideCabal super.OpenGLRaw (drv: {
+    librarySystemDepends =
+      pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends;
+    libraryHaskellDepends = drv.libraryHaskellDepends
+      ++ pkgs.lib.optionals pkgs.stdenv.isDarwin
+                            [ pkgs.darwin.apple_sdk.frameworks.OpenGL ];
+    preConfigure = pkgs.lib.optionalString pkgs.stdenv.isDarwin ''
+      frameworkPaths=($(for i in $nativeBuildInputs; do if [ -d "$i"/Library/Frameworks ]; then echo "-F$i/Library/Frameworks"; fi done))
+      frameworkPaths=$(IFS=, ; echo "''${frameworkPaths[@]}")
+      configureFlags+=$(if [ -n "$frameworkPaths" ]; then echo -n "--ghc-options=-optl=$frameworkPaths"; fi)
+    '';
+  });
+  GLURaw = overrideCabal super.GLURaw (drv: {
+    librarySystemDepends =
+      pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends;
+    libraryHaskellDepends = drv.libraryHaskellDepends
+      ++ pkgs.lib.optionals pkgs.stdenv.isDarwin
+                            [ pkgs.darwin.apple_sdk.frameworks.OpenGL ];
+  });
+  bindings-GLFW = overrideCabal super.bindings-GLFW (drv: {
+    doCheck = false; # requires an active X11 display
+    librarySystemDepends =
+      pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends;
+    libraryHaskellDepends = drv.libraryHaskellDepends
+      ++ pkgs.lib.optionals pkgs.stdenv.isDarwin
+                            (with pkgs.darwin.apple_sdk.frameworks;
+                             [ AGL Cocoa OpenGL IOKit Kernel CoreVideo
+                               pkgs.darwin.CF ]);
+  });
+  OpenCL = overrideCabal super.OpenCL (drv: {
+    librarySystemDepends =
+      pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends;
+    libraryHaskellDepends = drv.libraryHaskellDepends
+      ++ pkgs.lib.optionals pkgs.stdenv.isDarwin
+                            [ pkgs.darwin.apple_sdk.frameworks.OpenCL ];
+  });
+
+  # GLUT uses `dlopen` to link to freeglut, so we need to set the RUNPATH correctly for
+  # it to find `libglut.so` from the nix store. We do this by patching GLUT.cabal to pkg-config
+  # depend on freeglut, which provides GHC to necessary information to generate a correct RPATH.
+  #
+  # Note: Simply patching the dynamic library (.so) of the GLUT build will *not* work, since the
+  # RPATH also needs to be propagated when using static linking. GHC automatically handles this for
+  # us when we patch the cabal file (Link options will be recored in the ghc package registry).
+  #
+  # Additional note: nixpkgs' freeglut and macOS's OpenGL implementation do not cooperate,
+  # so disable this on Darwin only
+  ${if pkgs.stdenv.isDarwin then null else "GLUT"} = addPkgconfigDepend (appendPatch super.GLUT ./patches/GLUT.patch) pkgs.freeglut;
+
+  idris = overrideCabal super.idris (drv: {
+    # https://github.com/idris-lang/Idris-dev/issues/2499
+    librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp];
+  });
+
+  libsystemd-journal = overrideCabal super.libsystemd-journal (old: {
+    librarySystemDepends = old.librarySystemDepends or [] ++ [ pkgs.systemd ];
+  });
+
+}
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index b42f94a3635..d2ecc338128 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -105,6 +105,7 @@ let
       };
 
   commonConfiguration = import ./configuration-common.nix { inherit pkgs; };
+  nixConfiguration = import ./configuration-nix.nix { inherit pkgs; };
 
 in
 
@@ -112,4 +113,5 @@ in
     (extends overrides
       (extends packageSetConfig
         (extends compilerConfig
-          (extends commonConfiguration haskellPackages))))
+          (extends commonConfiguration
+            (extends nixConfiguration haskellPackages)))))

From b33124a143a9e4942c5d641e6fee8761c37b676c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Thu, 2 Feb 2017 18:29:48 +0100
Subject: [PATCH 554/899] haskell-download: don't test (requires networking)

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index ba3c7ef6746..6768b8bba90 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -161,6 +161,7 @@ self: super: builtins.intersectAttrs super {
   wreq = dontCheck super.wreq;                          # http://hydra.cryp.to/build/501895/nixlog/1/raw
   wreq-sb = dontCheck super.wreq-sb;                    # http://hydra.cryp.to/build/783948/log/raw
   wuss = dontCheck super.wuss;                          # http://hydra.cryp.to/build/875964/nixlog/2/raw
+  download = dontCheck super.download;
   http-client = dontCheck super.http-client;
   http-client-openssl = dontCheck super.http-client-openssl;
   http-client-tls = dontCheck super.http-client-tls;

From afa428b8f32e6df61d28a38fe4fb045d9617098f Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Tue, 7 Feb 2017 16:09:17 +0100
Subject: [PATCH 555/899] networkmanager(applet): 1.4.2 -> 1.4.4

---
 pkgs/tools/networking/network-manager-applet/default.nix | 2 +-
 pkgs/tools/networking/network-manager/default.nix        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index 0cb5c92abec..8d62cb1bc74 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url    = "mirror://gnome/sources/${pname}/${networkmanager.major}/${name}.tar.xz";
-    sha256 = "431b7b4876638c6a537c8bf9c91a9250532b3d960b22b056df554695a81e4499";
+    sha256 = "09ijxicsqf39y6h8kwbfjyljfbqkkx4vrpyfn6gfg1h9mvp4cf39";
   };
 
   configureFlags = [ "--sysconfdir=/etc" ];
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 0bd79890dc0..1ad1e54e7fb 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
   name    = "network-manager-${version}";
   pname   = "NetworkManager";
   major   = "1.4";
-  version = "${major}.2";
+  version = "${major}.4";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
-    sha256 = "a864e347ddf6da8dabd40e0185b8c10a655d4a94b45cbaa2b3bb4b5e8360d204";
+    sha256 = "029k2f1arx1m5hppmr778i9yg34jj68nmji3i89qs06c33rpi4w2";
   };
 
   outputs = [ "out" "dev" ];

From 0a687c3d1089b5dbf8fa8d4ab52bb54d91440571 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Tue, 7 Feb 2017 16:10:50 +0100
Subject: [PATCH 556/899] networkmanager_openconnect: 1.2.2 -> 1.2.4

---
 pkgs/tools/networking/network-manager/openconnect.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix
index 303ca70aace..e1a5f954986 100644
--- a/pkgs/tools/networking/network-manager/openconnect.nix
+++ b/pkgs/tools/networking/network-manager/openconnect.nix
@@ -5,11 +5,11 @@ stdenv.mkDerivation rec {
   name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
   pname   = "NetworkManager-openconnect";
   major   = "1.2";
-  version = "${major}.2";
+  version = "${major}.4";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
-    sha256 = "522979593e21b4e884112816708db9eb66148b3491580dacfad53472b94aafec";
+    sha256 = "15j98wwspv6mcmy91w30as5qc1bzsnhlk060xhjy4qrvd37y0xx1";
   };
 
   buildInputs = [ openconnect networkmanager libsecret ]

From b900796d0f1673d4a93dcc543a159f8d2706a5d3 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Tue, 7 Feb 2017 16:11:15 +0100
Subject: [PATCH 557/899] networkmanager_openvpn: 1.2.6 -> 1.2.8

---
 pkgs/tools/networking/network-manager/openvpn.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix
index 92dc45ac82c..3edbe7dba6e 100644
--- a/pkgs/tools/networking/network-manager/openvpn.nix
+++ b/pkgs/tools/networking/network-manager/openvpn.nix
@@ -5,11 +5,11 @@ stdenv.mkDerivation rec {
   name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
   pname   = "NetworkManager-openvpn";
   major   = "1.2";
-  version = "${major}.6";
+  version = "${major}.8";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
-    sha256 = "2373e2bb0a8a876cb2997cd8b0e3d6e10012d9bef3705ea3ac21f6394b3f1fb0";
+    sha256 = "0m06sg2rnz764psvpsrx0pvll11nfn9hypgbp3s6vna8y83l02ry";
   };
 
   buildInputs = [ openvpn networkmanager libsecret ]

From 725c179be3f92d0d92b260d928fae9000e6d8337 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Tue, 7 Feb 2017 16:11:37 +0100
Subject: [PATCH 558/899] networkmanager_strongswan: 1.4.0 -> 1.4.1

---
 pkgs/tools/networking/network-manager/strongswan.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix
index 9e0033cca90..9d26a84d6f2 100644
--- a/pkgs/tools/networking/network-manager/strongswan.nix
+++ b/pkgs/tools/networking/network-manager/strongswan.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   name    = "${pname}-${version}";
   pname   = "NetworkManager-strongswan";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchurl {
     url    = "https://download.strongswan.org/NetworkManager/${name}.tar.bz2";
-    sha256 = "0qfnylg949lkyw1nmyggz2ipgmy154ic5q5ljjcwcgi14r90ys02";
+    sha256 = "0r5j8cr4x01d2cdy970990292n7p9v617cw103kdczw646xwcxs8";
   };
 
   postPatch = ''

From e362a3d5c94ba379d428fbd2cc40470719a61556 Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <sveina@gmail.com>
Date: Fri, 27 Jan 2017 17:29:46 +0000
Subject: [PATCH 559/899] nginx: Format the config file

---
 .../services/web-servers/nginx/default.nix        | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index c9eacdd85dc..815769b243f 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -16,7 +16,20 @@ let
   ) cfg.virtualHosts;
   enableIPv6 = config.networking.enableIPv6;
 
-  configFile = pkgs.writeText "nginx.conf" ''
+  configFile = pkgs.runCommand "nginx.conf" {
+    inherit configFileUnformatted;
+    passAsFile = [ "configFileUnformatted" ];
+    # configFileUnformatted is created locally, therefore so should this be.
+    preferLocalBuild = true;
+    allowSubstitutes = false;
+  } ''
+    cp ${configFileUnformatted} nginx.conf
+    chmod u+w nginx.conf
+    ${pkgs.nginx-config-formatter}/bin/nginxfmt nginx.conf
+    cp nginx.conf $out
+  '';
+
+  configFileUnformatted = pkgs.writeText "nginx.unformatted.conf" ''
     user ${cfg.user} ${cfg.group};
     error_log stderr;
     daemon off;

From 4628724469bf987adfdd49f4173e299128d859d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 7 Feb 2017 16:59:33 +0100
Subject: [PATCH 560/899] autorevision: specify full paths to 'sed' and 'tee'

---
 pkgs/tools/misc/autorevision/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/autorevision/default.nix b/pkgs/tools/misc/autorevision/default.nix
index 058fa4881e8..7cd19618a89 100644
--- a/pkgs/tools/misc/autorevision/default.nix
+++ b/pkgs/tools/misc/autorevision/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, asciidoc, libxml2, docbook_xml_dtd_45, libxslt
-, docbook_xsl, diffutils, coreutils, gnugrep
+, docbook_xsl, diffutils, coreutils, gnugrep, gnused
 }:
 
 stdenv.mkDerivation rec {
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
     sed -e "s|cmp|${diffutils}/bin/cmp|" \
         -e "s|cat|${coreutils}/bin/cat|" \
         -e "s|grep|${gnugrep}/bin/grep|" \
+        -e "s|\<sed\>|${gnused}/bin/sed|" \
+        -e "s|\<tee\>|${coreutils}/bin/tee|" \
         -i "$out/bin/autorevision"
   '';
 

From 4853900dd3cf1908e92a6287a500368ed4752ef1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 7 Feb 2017 17:02:49 +0100
Subject: [PATCH 561/899] autorevision: 1.14 -> 1.20

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

diff --git a/pkgs/tools/misc/autorevision/default.nix b/pkgs/tools/misc/autorevision/default.nix
index 7cd19618a89..19880efd545 100644
--- a/pkgs/tools/misc/autorevision/default.nix
+++ b/pkgs/tools/misc/autorevision/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "autorevision-${version}";
-  version = "1.14";
+  version = "1.20";
 
   src = fetchurl {
     url = "https://github.com/Autorevision/autorevision/releases/download/v%2F${version}/autorevision-${version}.tgz";
-    sha256 = "0h0ig922am9qd0nbri3i6p4k789mv5iavxzxwylclg0mfgx43qd2";
+    sha256 = "1xlp7wn2vv17rp848ai272sifi6fmwdr6dg4im53hrf32j3gzlhy";
   };
 
   buildInputs = [

From 8dd90abc1763a50bcb2372468e1bb6f074433077 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 7 Feb 2017 17:12:05 +0100
Subject: [PATCH 562/899] autorevision: use sed word delimiters for better
 precision

Fixes wrongly replaced 'cat' in help text:

$ autorevision -h
usage: autorevision {-t output-type | -s symbol} [-o cache-file [-f] ] [-e name] [-U] [-V]
	Options include:
	-t output-type		= specify output type
	-s symbol		= specify symbol output
	-o cache-file		= specify cache file lo/nix/store/1rzzq2wdn5vfgbp5y9613jpdkf8i9ag6-coreutils-8.26/bin/cation
...

(Also replace all occurences per line, in case that should occur.)
---
 pkgs/tools/misc/autorevision/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/autorevision/default.nix b/pkgs/tools/misc/autorevision/default.nix
index 19880efd545..02caf6e33f9 100644
--- a/pkgs/tools/misc/autorevision/default.nix
+++ b/pkgs/tools/misc/autorevision/default.nix
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
   installFlags = [ "prefix=$(out)" ];
 
   postInstall = ''
-    sed -e "s|cmp|${diffutils}/bin/cmp|" \
-        -e "s|cat|${coreutils}/bin/cat|" \
-        -e "s|grep|${gnugrep}/bin/grep|" \
-        -e "s|\<sed\>|${gnused}/bin/sed|" \
-        -e "s|\<tee\>|${coreutils}/bin/tee|" \
+    sed -e "s|\<cmp\>|${diffutils}/bin/cmp|g" \
+        -e "s|\<cat\>|${coreutils}/bin/cat|g" \
+        -e "s|\<grep\>|${gnugrep}/bin/grep|g" \
+        -e "s|\<sed\>|${gnused}/bin/sed|g" \
+        -e "s|\<tee\>|${coreutils}/bin/tee|g" \
         -i "$out/bin/autorevision"
   '';
 

From 34b5c9a4de92120d2c302e084f0139bc3cd8f155 Mon Sep 17 00:00:00 2001
From: Fernando J Pando <fernando.pando@stelligent.com>
Date: Mon, 30 Jan 2017 12:44:14 -0500
Subject: [PATCH 563/899] buildbot: 0.9.0.post1 -> 0.9.3

- Fixes unneeded patching
- Adds worker to build inputs now needed for tests
- Replaces enableworker option with worker configuration module
- Openssh required for tests
- Fixes worker hardcoded paths
- Tested on Nixos Unstable
---
 nixos/modules/module-list.nix                 |   1 +
 .../buildbot/master.nix                       |  30 ++--
 .../buildbot/worker.nix                       | 128 ++++++++++++++++++
 .../tools/build-managers/buildbot/default.nix |  42 ++----
 .../tools/build-managers/buildbot/plugins.nix |  25 ++--
 .../tools/build-managers/buildbot/worker.nix  |  10 +-
 pkgs/top-level/all-packages.nix               |   1 -
 7 files changed, 176 insertions(+), 61 deletions(-)
 create mode 100644 nixos/modules/services/continuous-integration/buildbot/worker.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index bd427bc679c..b8c8775fce1 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -141,6 +141,7 @@
   ./services/computing/torque/mom.nix
   ./services/computing/slurm/slurm.nix
   ./services/continuous-integration/buildbot/master.nix
+  ./services/continuous-integration/buildbot/worker.nix
   ./services/continuous-integration/buildkite-agent.nix
   ./services/continuous-integration/hydra/default.nix
   ./services/continuous-integration/gitlab-runner.nix
diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix
index a40be4f546e..512e09eb804 100644
--- a/nixos/modules/services/continuous-integration/buildbot/master.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/master.nix
@@ -7,7 +7,7 @@ with lib;
 let
   cfg = config.services.buildbot-master;
   escapeStr = s: escape ["'"] s;
-  masterCfg = pkgs.writeText "master.cfg" ''
+  masterCfg = if cfg.masterCfg == null then pkgs.writeText "master.cfg" ''
     from buildbot.plugins import *
     factory = util.BuildFactory()
     c = BuildmasterConfig = dict(
@@ -27,9 +27,8 @@ let
       factory.addStep(step)
 
     ${cfg.extraConfig}
-  '';
-
-  configFile = if cfg.masterCfg == null then masterCfg else cfg.masterCfg;
+  ''
+  else pkgs.writeText "master.cfg" cfg.masterCfg;
 
 in {
   options = {
@@ -67,15 +66,13 @@ in {
       };
 
       masterCfg = mkOption {
-        type = with types; nullOr path;
+        type = types.str;
         description = ''
-          Optionally pass path to raw master.cfg file.
+          Optionally pass raw master.cfg file as string.
           Other options in this configuration will be ignored.
         '';
         default = null;
-        example = literalExample ''
-          pkgs.writeText "master.cfg" "BuildmasterConfig = c = {}"
-        '';
+        example = "BuildmasterConfig = c = {}";
       };
 
       schedulers = mkOption {
@@ -99,9 +96,9 @@ in {
         type = types.listOf types.str;
         description = "List of Workers.";
         default = [
-          "worker.Worker('default-worker', 'password')"
+          "worker.Worker('example-worker', 'pass')"
         ];
-        example = [ "worker.LocalWorker('default-worker')" ];
+        example = [ "worker.LocalWorker('example-worker')" ];
       };
 
       status = mkOption {
@@ -209,7 +206,7 @@ in {
 
     users.extraUsers = optional (cfg.user == "buildbot") {
       name = "buildbot";
-      description = "buildbot user";
+      description = "Buildbot User.";
       isNormalUser = true;
       createHome = true;
       home = cfg.home;
@@ -219,7 +216,7 @@ in {
     };
 
     systemd.services.buildbot-master = {
-      description = "Buildbot Continuous Integration Server";
+      description = "Buildbot Continuous Integration Server.";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       path = cfg.packages;
@@ -233,9 +230,8 @@ in {
       };
 
       preStart = ''
-        mkdir -vp ${cfg.buildbotDir}
-        chown -c ${cfg.user}:${cfg.group} ${cfg.buildbotDir}
-        ln -sf ${configFile} ${cfg.buildbotDir}/master.cfg
+        ${pkgs.coreutils}/bin/mkdir -vp ${cfg.buildbotDir}
+        ${pkgs.coreutils}/bin/ln -sfv ${masterCfg} ${cfg.buildbotDir}/master.cfg
         ${cfg.package}/bin/buildbot create-master ${cfg.buildbotDir}
       '';
 
@@ -247,4 +243,6 @@ in {
     };
   };
 
+  meta.maintainers = with lib.maintainers; [ nand0p Mic92 ];
+
 }
diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix
new file mode 100644
index 00000000000..430fd4e53f1
--- /dev/null
+++ b/nixos/modules/services/continuous-integration/buildbot/worker.nix
@@ -0,0 +1,128 @@
+# NixOS module for Buildbot Worker.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.buildbot-worker;
+
+in {
+  options = {
+    services.buildbot-worker = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable the Buildbot Worker.";
+      };
+
+      user = mkOption {
+        default = "bbworker";
+        type = types.str;
+        description = "User the buildbot Worker should execute under.";
+      };
+
+      group = mkOption {
+        default = "bbworker";
+        type = types.str;
+        description = "Primary group of buildbot Worker user.";
+      };
+
+      extraGroups = mkOption {
+        type = types.listOf types.str;
+        default = [ "nixbld" ];
+        description = "List of extra groups that the Buildbot Worker user should be a part of.";
+      };
+
+      home = mkOption {
+        default = "/home/bbworker";
+        type = types.path;
+        description = "Buildbot home directory.";
+      };
+
+      buildbotDir = mkOption {
+        default = "${cfg.home}/worker";
+        type = types.path;
+        description = "Specifies the Buildbot directory.";
+      };
+
+      workerUser = mkOption {
+        default = "example-worker";
+        type = types.str;
+        description = "Specifies the Buildbot Worker user.";
+      };
+
+      workerPass = mkOption {
+        default = "pass";
+        type = types.str;
+        description = "Specifies the Buildbot Worker password.";
+      };
+
+      masterUrl = mkOption {
+        default = "localhost:9989";
+        type = types.str;
+        description = "Specifies the Buildbot Worker connection string.";
+      };
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.buildbot-worker;
+        description = "Package to use for buildbot worker.";
+        example = pkgs.buildbot-worker;
+      };
+
+      packages = mkOption {
+        default = [ ];
+        example = [ pkgs.git ];
+        type = types.listOf types.package;
+        description = "Packages to add to PATH for the buildbot process.";
+      };
+
+    };
+  };
+
+  config = mkIf cfg.enable {
+    users.extraGroups = optional (cfg.group == "bbworker") {
+      name = "bbworker";
+    };
+
+    users.extraUsers = optional (cfg.user == "bbworker") {
+      name = "bbworker";
+      description = "Buildbot Worker User.";
+      isNormalUser = true;
+      createHome = true;
+      home = cfg.home;
+      group = cfg.group;
+      extraGroups = cfg.extraGroups;
+      useDefaultShell = true;
+    };
+
+    systemd.services.buildbot-worker = {
+      description = "Buildbot Worker.";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      wants = [ "buildbot-master.service" ];
+      path = cfg.packages;
+
+      preStart = ''
+        # NOTE: ensure master has time to start in case running on localhost
+        ${pkgs.coreutils}/bin/sleep 4
+        ${pkgs.coreutils}/bin/mkdir -vp ${cfg.buildbotDir}
+        ${cfg.package}/bin/buildbot-worker create-worker ${cfg.buildbotDir} ${cfg.masterUrl} ${cfg.workerUser} ${cfg.workerPass}
+      '';
+
+      serviceConfig = {
+        Type = "forking";
+        User = cfg.user;
+        Group = cfg.group;
+        WorkingDirectory = cfg.home;
+        ExecStart = "${cfg.package}/bin/buildbot-worker start ${cfg.buildbotDir}";
+      };
+
+    };
+  };
+
+  meta.maintainers = with lib.maintainers; [ nand0p ];
+
+}
diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
index 8e85c645e2e..427ff705840 100644
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -1,21 +1,13 @@
-{ stdenv,
-  lib,
-  pythonPackages,
-  fetchurl,
-  coreutils,
-  openssh,
-  buildbot-worker,
-  plugins ? [],
-  enableLocalWorker ? false
-}:
+{ stdenv, lib, fetchurl, coreutils, openssh, buildbot-worker, makeWrapper,
+  pythonPackages, gnused, plugins ? [] }:
 
 pythonPackages.buildPythonApplication (rec {
   name = "${pname}-${version}";
   pname = "buildbot";
-  version = "0.9.0.post1";
+  version = "0.9.3";
   src = fetchurl {
     url = "mirror://pypi/b/${pname}/${name}.tar.gz";
-    sha256 = "18rnsp691cnmbymlch6czx3mrcmifmf6dk97h9nslgfkkyf25n5g";
+    sha256 = "1yw7knk5dcvwms14vqwlp89flhjf8567l17s9cq7vydh760nmg62";
   };
 
   buildInputs = with pythonPackages; [
@@ -31,7 +23,11 @@ pythonPackages.buildPythonApplication (rec {
     pylint
     astroid
     pyflakes
-  ] ++ lib.optionals (enableLocalWorker) [openssh];
+    openssh
+    buildbot-worker
+    makeWrapper
+    treq
+  ];
 
   propagatedBuildInputs = with pythonPackages; [
 
@@ -39,7 +35,6 @@ pythonPackages.buildPythonApplication (rec {
     twisted
     jinja2
     zope_interface
-    future
     sqlalchemy
     sqlalchemy_migrate
     future
@@ -61,32 +56,21 @@ pythonPackages.buildPythonApplication (rec {
     ramlfications
     sphinx-jinja
 
-  ] ++ plugins ++
-  lib.optionals (enableLocalWorker) [buildbot-worker];
-
-  preInstall = ''
-    # writes out a file that can't be read properly
-    sed -i.bak -e '69,84d' buildbot/test/unit/test_www_config.py
-  '';
+  ] ++ plugins;
 
   postPatch = ''
-    # re-hardcode path to tail
-    sed -i 's|/usr/bin/tail|${coreutils}/bin/tail|' buildbot/scripts/logwatcher.py
+    ${gnused}/bin/sed -i 's|/usr/bin/tail|${coreutils}/bin/tail|' buildbot/scripts/logwatcher.py
   '';
 
   postFixup = ''
-    mv -v $out/bin/buildbot $out/bin/.wrapped-buildbot
-    echo "#!/bin/sh" > $out/bin/buildbot
-    echo "export PYTHONPATH=$PYTHONPATH" >> $out/bin/buildbot
-    echo "exec $out/bin/.wrapped-buildbot \"\$@\"" >> $out/bin/buildbot
-    chmod -c 555 $out/bin/buildbot
+    makeWrapper $out/bin/.buildbot-wrapped $out/bin/buildbot --set PYTHONPATH "$PYTHONPATH"
   '';
 
   meta = with stdenv.lib; {
     homepage = http://buildbot.net/;
     description = "Continuous integration system that automates the build/test cycle";
     maintainers = with maintainers; [ nand0p ryansydnor ];
-    platforms = platforms.all;
+    platforms = platforms.linux;
     license = licenses.gpl2;
   };
 })
diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix
index 2875f6942a9..f2fdd1535bf 100644
--- a/pkgs/development/tools/build-managers/buildbot/plugins.nix
+++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix
@@ -4,11 +4,11 @@ let
   buildbot-pkg = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot-pkg";
-    version = "0.9.0.post1";
+    version = "0.9.3";
 
     src = fetchurl {
       url = "mirror://pypi/b/${pname}/${name}.tar.gz";
-      sha256 = "0frmnc73dsyc9mjnrnpm4vdrwb7c63gc6maq6xvlp486v7sdhjbi";
+      sha256 = "02949cvmghyh313i1hmplwxp3nzq789kk85xjx2ir82cpr1d6h6j";
     };
 
     propagatedBuildInputs = with pythonPackages; [ setuptools ];
@@ -26,14 +26,15 @@ in {
   www = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot_www";
-    version = "0.9.0.post1";
+    version = "0.9.3";
 
     # NOTE: wheel is used due to buildbot circular dependency
     format = "wheel";
 
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/02/d0/fc56ee27a09498638a47dcc5637ee5412ab7a67bfb4b3ff47e041f3d7b66/${name}-py2-none-any.whl";
-      sha256 = "14ghch67k6090736n89l401swz7r9hnk2zlmdb59niq8lg7dyg9q";
+    src = pythonPackages.fetchPypi {
+      inherit pname version format;
+      python = "py2";
+      sha256 = "0yggg6mcykcnv41srl2sp2zwx2r38vb6a8jgxh1a4825mspm2jf7";
     };
 
     meta = with stdenv.lib; {
@@ -48,14 +49,14 @@ in {
   console-view = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot-console-view";
-    version = "0.9.0.post1";
+    version = "0.9.3";
 
     src = fetchurl {
       url = "mirror://pypi/b/${pname}/${name}.tar.gz";
-      sha256 = "0dc7rb7mrpva5gj7l57i96a78d6yj28pkkj9hfim1955z9dgn58l";
+      sha256 = "1rkzakm05x72nvdivc5bc3gab3nyasdfvlwnwril90jj9q1b92dk";
     };
 
-    propagatedBuildInputs = [ buildbot-pkg ];
+    propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
 
     meta = with stdenv.lib; {
       homepage = http://buildbot.net/;
@@ -69,14 +70,14 @@ in {
   waterfall-view = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot-waterfall-view";
-    version = "0.9.0.post1";
+    version = "0.9.3";
 
     src = fetchurl {
       url = "mirror://pypi/b/${pname}/${name}.tar.gz";
-      sha256 = "0x9vvw15zzgj4w3qcxh8r10rb36ni0qh1215y7wbawh5lggnjm0g";
+      sha256 = "033x2cs0znhk1j0lw067nmjw2m7yy1fdq5qch0sx50jnpjiq6g6g";
     };
 
-    propagatedBuildInputs = [ buildbot-pkg ];
+    propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
 
     meta = with stdenv.lib; {
       homepage = http://buildbot.net/;
diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix
index 7d7ecc1c52d..861ed647c5d 100644
--- a/pkgs/development/tools/build-managers/buildbot/worker.nix
+++ b/pkgs/development/tools/build-managers/buildbot/worker.nix
@@ -1,18 +1,22 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchurl, gnused, coreutils, pythonPackages }:
 
 pythonPackages.buildPythonApplication (rec {
   name = "${pname}-${version}";
   pname = "buildbot-worker";
-  version = "0.9.0.post1";
+  version = "0.9.3";
 
   src = fetchurl {
     url = "mirror://pypi/b/${pname}/${name}.tar.gz";
-    sha256 = "1f8ij3y62r9z7qv92x21rg9h9whhakkwv59rgniq09j64ggjz8lx";
+    sha256 = "176kp04g4c7gj15f73wppraqrirbfclyx214gcz966019niikcsp";
   };
 
   buildInputs = with pythonPackages; [ setuptoolsTrial mock ];
   propagatedBuildInputs = with pythonPackages; [ twisted future ];
 
+  postPatch = ''
+    ${gnused}/bin/sed -i 's|/usr/bin/tail|${coreutils}/bin/tail|' buildbot_worker/scripts/logwatcher.py
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://buildbot.net/;
     description = "Buildbot Worker Daemon";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9e20f795fc..1de24c26a2b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6137,7 +6137,6 @@ with pkgs;
   };
   buildbot-full = self.buildbot.override {
     plugins = with self.buildbot-plugins; [ www console-view waterfall-view ];
-    enableLocalWorker = true;
   };
 
   buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { };

From c48c2fc1472006776b75569195901ea33d5e7141 Mon Sep 17 00:00:00 2001
From: Mikhail Volkhov <volhovm.cs@gmail.com>
Date: Tue, 7 Feb 2017 19:46:35 +0300
Subject: [PATCH 564/899] scudcloud: 1.38 -> 1.40

---
 .../networking/instant-messengers/scudcloud/default.nix   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
index 5e5c2fe8eed..9bed654b9b3 100644
--- a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
+++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchgit, python3Packages }:
 
 python3Packages.buildPythonPackage {
-  name = "scudcloud-1.38";
+  name = "scudcloud-1.40";
 
   # Branch 254-port-to-qt5
-  # https://github.com/raelgc/scudcloud/commit/6bcd877daea3d679cd5fd2c946c2d933940c48d9
+  # https://github.com/raelgc/scudcloud/commit/43ddc87f123a641b1fa78ace0bab159b05d34b65
   src = fetchgit {
       url = https://github.com/raelgc/scudcloud/;
-      rev = "6bcd877daea3d679cd5fd2c946c2d933940c48d9";
-      sha256 = "1884svz6m5vl06d0yac5zjb2phxwg6bjva72y15fw4larkjnh72s";
+      rev = "43ddc87f123a641b1fa78ace0bab159b05d34b65";
+      sha256 = "1lh9naf9xfrmj1pj7p8bd3fz7vy3gap6cvda4silk4b6ylyqa8vj";
   };
 
   propagatedBuildInputs = with python3Packages; [ pyqt5 dbus-python ];

From de592483d1f644cc46d9a8a00c36c1e7bda4ab1a Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 7 Feb 2017 17:55:40 +0100
Subject: [PATCH 565/899] Add xfce documentation

---
 nixos/doc/manual/configuration/configuration.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml
index 448e2a932e9..8677c13db40 100644
--- a/nixos/doc/manual/configuration/configuration.xml
+++ b/nixos/doc/manual/configuration/configuration.xml
@@ -21,6 +21,7 @@ effect after you run <command>nixos-rebuild</command>.</para>
 <xi:include href="user-mgmt.xml" />
 <xi:include href="file-systems.xml" />
 <xi:include href="x-windows.xml" />
+<xi:include href="xfce.xml" />
 <xi:include href="networking.xml" />
 <xi:include href="linux-kernel.xml" />
 

From e3fce56047ebb9403d212834510c2b4835f5ef37 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 7 Feb 2017 17:07:20 +0100
Subject: [PATCH 566/899] nixos.chrony: add extraFlags config option

---
 nixos/modules/services/networking/chrony.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix
index ff62acff6eb..9741c039cbc 100644
--- a/nixos/modules/services/networking/chrony.nix
+++ b/nixos/modules/services/networking/chrony.nix
@@ -30,6 +30,8 @@ let
     ${cfg.extraConfig}
   '';
 
+  chronyFlags = "-n -m -u chrony -f ${configFile} ${toString cfg.extraFlags}";
+
 in
 
 {
@@ -76,6 +78,13 @@ in
           <literal>chrony.conf</literal>
         '';
       };
+
+      extraFlags = mkOption {
+        default = [];
+        example = [ "-s" ];
+        type = types.listOf types.str;
+        description = "Extra flags passed to the chronyd command.";
+      };
     };
 
   };
@@ -123,7 +132,7 @@ in
           '';
 
         serviceConfig =
-          { ExecStart = "${pkgs.chrony}/bin/chronyd -n -m -u chrony -f ${configFile}";
+          { ExecStart = "${pkgs.chrony}/bin/chronyd ${chronyFlags}";
           };
       };
 

From 9293f86bf212fe3f713f45252bcb708803c82c3b Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 7 Feb 2017 17:59:07 +0100
Subject: [PATCH 567/899] nixos.chrony: remove generatecommandkey option

It's deprecated and no longer used.
---
 nixos/modules/services/networking/chrony.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix
index 9741c039cbc..9bf266b3805 100644
--- a/nixos/modules/services/networking/chrony.nix
+++ b/nixos/modules/services/networking/chrony.nix
@@ -23,7 +23,6 @@ let
     driftfile ${stateDir}/chrony.drift
 
     keyfile ${keyFile}
-    generatecommandkey
 
     ${optionalString (!config.time.hardwareClockInLocalTime) "rtconutc"}
 

From bfd7fe8ba5b1b3ae5015f23bcb3ccd64bb708836 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 7 Feb 2017 18:34:09 +0100
Subject: [PATCH 568/899] nixos: fix taskserver module to evaluate properly
 when keys are managed manually

---
 nixos/modules/services/misc/taskserver/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix
index ca82a733f6f..d28c5dc7af8 100644
--- a/nixos/modules/services/misc/taskserver/default.nix
+++ b/nixos/modules/services/misc/taskserver/default.nix
@@ -125,10 +125,10 @@ let
       server.key = ${cfg.dataDir}/keys/server.key
       server.crl = ${cfg.dataDir}/keys/server.crl
     '' else ''
-      ca.cert = ${cfg.pki.ca.cert}
-      server.cert = ${cfg.pki.server.cert}
-      server.key = ${cfg.pki.server.key}
-      server.crl = ${cfg.pki.server.crl}
+      ca.cert = ${cfg.pki.manual.ca.cert}
+      server.cert = ${cfg.pki.manual.server.cert}
+      server.key = ${cfg.pki.manual.server.key}
+      server.crl = ${cfg.pki.manual.server.crl}
     ''}
   '' + cfg.extraConfig);
 

From 14ca10f8c551d9fb6b4687bd007c77d37eb5e484 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Tue, 7 Feb 2017 16:35:58 -0200
Subject: [PATCH 569/899] jwm: 1575 -> 1580

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

diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index 97e4b391a79..c670dc52e52 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "jwm-${version}";
-  version = "1575";
+  version = "1580";
   
   src = fetchFromGitHub {
     owner = "joewing";
     repo = "jwm";
     rev = "s${version}";
-    sha256 = "0dw0f29s04jglncavgqr7h9h791f7vw3lb3dcwrgmzk5v50v4nx9";
+    sha256 = "098m54mn8f1vzdb7j6zmlflid7a4yjinbdh7avg2a0z45nl1znb4";
   };
 
   nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ];

From 3801ecb0d90cac8f01559e5e486af15471094230 Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <ambrop7@gmail.com>
Date: Tue, 7 Feb 2017 19:51:19 +0100
Subject: [PATCH 570/899] kdevplatform: Add patch to fix build with newer KF5.

---
 .../kdevplatform-projectconfigskeleton.patch  | 55 +++++++++++++++++++
 .../editors/kdevelop5/kdevplatform.nix        |  2 +
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/applications/editors/kdevelop5/kdevplatform-projectconfigskeleton.patch

diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform-projectconfigskeleton.patch b/pkgs/applications/editors/kdevelop5/kdevplatform-projectconfigskeleton.patch
new file mode 100644
index 00000000000..ba5140c77fc
--- /dev/null
+++ b/pkgs/applications/editors/kdevelop5/kdevplatform-projectconfigskeleton.patch
@@ -0,0 +1,55 @@
+From e84645d1694bdad7f179cd41babce723fe07aa63 Mon Sep 17 00:00:00 2001
+From: Kevin Funk <kfunk@kde.org>
+Date: Mon, 5 Dec 2016 15:20:53 +0100
+Subject: Hotfix for restoring build with newer KConfig
+
+https://phabricator.kde.org/D3386 is a SIC change, handle that
+---
+ project/projectconfigskeleton.cpp |  4 ++++
+ project/projectconfigskeleton.h   | 14 +++++---------
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/project/projectconfigskeleton.cpp b/project/projectconfigskeleton.cpp
+index 0e06149..c4c9767 100644
+--- a/project/projectconfigskeleton.cpp
++++ b/project/projectconfigskeleton.cpp
+@@ -46,6 +46,10 @@ ProjectConfigSkeleton::ProjectConfigSkeleton( const QString & configname )
+ ProjectConfigSkeleton::ProjectConfigSkeleton( KSharedConfigPtr config )
+         : KConfigSkeleton( config ), d( new ProjectConfigSkeletonPrivate )
+ {
++    // FIXME: Check if that does the right thing.
++    // https://phabricator.kde.org/D3386 broke source compat in kconfig, thus requiring us to make this ctor public
++    Q_ASSERT(config);
++    d->m_developerTempFile = config->name();
+ }
+ 
+ void ProjectConfigSkeleton::setDeveloperTempFile( const QString& cfg )
+diff --git a/project/projectconfigskeleton.h b/project/projectconfigskeleton.h
+index ed17ed0..c8314df 100644
+--- a/project/projectconfigskeleton.h
++++ b/project/projectconfigskeleton.h
+@@ -55,16 +55,12 @@ public:
+ 
+     Path projectFile() const;
+     Path developerFile() const;
++
++protected:
++    explicit ProjectConfigSkeleton( KSharedConfigPtr config );
++
+ private:
+-    /**
+-     * There's no way in KDE4 API to find out the file that the config object
+-     * was created from, so we can't apply defaults when using this
+-     * constructors. Thus I'm making this private, so we can find out when
+-     * this constructor is used and see if we need to add appropriate API to
+-     * kdelibs
+-     */
+-     explicit ProjectConfigSkeleton( KSharedConfigPtr config );
+-     struct ProjectConfigSkeletonPrivate * const d;
++    struct ProjectConfigSkeletonPrivate * const d;
+ };
+ 
+ }
+-- 
+cgit v0.11.2
+
diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix
index 93c3eac9c34..c36885a9e13 100644
--- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevplatform.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
     sha256 = "643d1145e1948af221f9ae148d0a10809f3d89af4b97ff0d6c4d571004f46bd4";
   };
 
+  patches = [ ./kdevplatform-projectconfigskeleton.patch ];
+
   nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ];
 
   propagatedBuildInputs = [ ];

From 97bf0637d5bec8d1fe7a9b0b5a220528afbac97c Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Tue, 7 Feb 2017 14:07:28 -0500
Subject: [PATCH 571/899] pants: init at 1.2.1

This will need more patching to work properly (especially for python
builds), but I've been able to convince it to build some simple java and
scala projects in its current form so I figured I'd spread it.
---
 pkgs/top-level/python-packages.nix | 148 +++++++++++++++++++++++++++++
 1 file changed, 148 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 84971210b6c..c7042e46e4f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -672,6 +672,17 @@ in {
     };
   };
 
+  ansicolors = buildPythonPackage rec {
+    name    = "ansicolors-${version}";
+    version = "1.0.2";
+
+    src = self.fetchPypi {
+      pname = "ansicolors";
+      inherit version;
+      sha256 = "02lmh2fbqcwr98cq13l9ql0fvyad1dcb3ap3c5xq9qwjp45m6r3n";
+    };
+  };
+
   asgiref = buildPythonPackage rec {
     name = "asgiref-${version}";
     version = "1.0.0";
@@ -8148,6 +8159,17 @@ in {
     };
   };
 
+  lmdb = buildPythonPackage rec {
+    pname = "lmdb";
+    version = "0.92";
+    name = "${pname}-${version}";
+
+    src = self.fetchPypi {
+      inherit pname version;
+      sha256 = "01nw6r08jkipx6v92kw49z34wmwikrpvc5j9xawdiyg1n2526wrx";
+    };
+  };
+
   logilab_astng = buildPythonPackage rec {
     name = "logilab-astng-0.24.3";
 
@@ -8478,6 +8500,33 @@ in {
     };
   };
 
+  pants = buildPythonPackage rec {
+    pname   = "pantsbuild.pants";
+    version = "1.2.1";
+    name    = "${pname}-${version}";
+
+    src = self.fetchPypi {
+      inherit pname version;
+      sha256 = "1bnzhhd2acwk7ckv56xzg2d9vxacl3k5bh13bsjxymnq3spm962w";
+    };
+
+    prePatch = ''
+      sed -E -i "s/'([[:alnum:].-]+)[=><][^']*'/'\\1'/g" setup.py
+    '';
+
+    # Unnecessary, and causes some really weird behavior around .class files, which
+    # this package bundles. See https://github.com/NixOS/nixpkgs/issues/22520. 
+    dontStrip = true;
+
+    propagatedBuildInputs = with self; [
+      ansicolors beautifulsoup4 cffi coverage docutils fasteners futures
+      isort lmdb markdown mock packaging pathspec pep8 pex psutil pyflakes
+      pygments pystache pytestcov pytest pywatchman requests2 scandir
+      setproctitle setuptools six thrift wheel twitter-common-dirutil
+      twitter-common-confluence twitter-common-collections
+    ];
+  };
+
   paperwork-backend = buildPythonPackage rec {
     name = "paperwork-backend-${version}";
     version = "1.0.6";
@@ -8513,6 +8562,17 @@ in {
     };
   };
 
+  pathspec = buildPythonPackage rec {
+    pname   = "pathspec";
+    version = "0.3.4";
+    name    = "${pname}-${version}";
+
+    src = self.fetchPypi {
+      inherit pname version;
+      sha256 = "0a37yrr2jhlg8aiynxivh2xqani7l9j725qxzrm7cm7m4rfcl1bn";
+    };
+  };
+
   pathtools = buildPythonPackage rec {
     name = "pathtools-${version}";
     version = "0.1.2";
@@ -8651,6 +8711,20 @@ in {
     };
   };
 
+  pex = buildPythonPackage rec {
+    name = "pex-${version}";
+    version = "1.2.2";
+
+    src = self.fetchPypi {
+      pname  = "pex";
+      sha256 = "1nwrf03cd6jw24lxyaalj59fdm2infr9glabznkpaq65mjzwshl3";
+      inherit version;
+    };
+
+    # A few more dependencies I don't want to handle right now...
+    doCheck = false;
+  };
+
   pies = buildPythonPackage rec {
     name = "pies-2.6.5";
 
@@ -25950,6 +26024,80 @@ in {
     };
   };
 
+  twitter-common-collections = buildPythonPackage rec {
+    pname   = "twitter.common.collections";
+    version = "0.3.9";
+    name    = "${pname}-${version}";
+
+    src = self.fetchPypi {
+      inherit pname version;
+      sha256 = "0wf8ks6y2kalx2inzayq0w4kh3kg25daik1ac7r6y79i03fslsc5";
+    };
+
+    propagatedBuildInputs = with self; [ twitter-common-lang ];
+  };
+
+  twitter-common-confluence = buildPythonPackage rec {
+    pname   = "twitter.common.confluence";
+    version = "0.3.9";
+    name    = "${pname}-${version}";
+
+    src = self.fetchPypi {
+      inherit pname version;
+      sha256 = "1i2fjn23cmms81f1fhvvkg6hgzqpw07dlqg3ydz6cqv2glw7zq26";
+    };
+
+    propagatedBuildInputs = with self; [ twitter-common-log ];
+  };
+
+  twitter-common-dirutil = buildPythonPackage rec {
+    pname   = "twitter.common.dirutil";
+    version = "0.3.9";
+    name    = "${pname}-${version}";
+
+    src = self.fetchPypi {
+      inherit pname version;
+      sha256 = "1wpjfmmxsdwnbx5dl13is4zkkpfcm94ksbzas9y2qhgswfa9jqha";
+    };
+
+    propagatedBuildInputs = with self; [ twitter-common-lang ];
+  };
+
+  twitter-common-lang = buildPythonPackage rec {
+    pname   = "twitter.common.lang";
+    version = "0.3.9";
+    name    = "${pname}-${version}";
+
+    src = self.fetchPypi {
+      inherit pname version;
+      sha256 = "1l8fmnsrx7hgg3ivslg588rnl9n1gfjn2w6224fr8rs7zmkd5lan";
+    };
+  };
+
+  twitter-common-log = buildPythonPackage rec {
+    pname   = "twitter.common.log";
+    version = "0.3.9";
+    name    = "${pname}-${version}";
+
+    src = self.fetchPypi {
+      inherit pname version;
+      sha256 = "1bdzbxx2bxwpf57xaxfz1nblzgfvhlidz8xqd7s84c62r3prh02v";
+    };
+
+    propagatedBuildInputs = with self; [ twitter-common-options twitter-common-dirutil ];
+  };
+
+  twitter-common-options = buildPythonPackage rec {
+    pname   = "twitter.common.options";
+    version = "0.3.9";
+    name    = "${pname}-${version}";
+
+    src = self.fetchPypi {
+      inherit pname version;
+      sha256 = "0d1czag5mcxg0vcnlklspl2dvdab9kmznsycj04d3vggi158ljrd";
+    };
+  };
+
   twine = buildPythonPackage rec {
     name = "twine-${version}";
     version = "1.8.1";

From 5a84059c610b61a5d7ad98ef57f2e7a528292afc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 7 Feb 2017 20:21:14 +0100
Subject: [PATCH 572/899] gnome-vfs: Drop unused Samba dependency

It does not appear in the runtime closure so let's ditch it.
---
 pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
index 76c2f8c0d40..48523f512b3 100644
--- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, samba, dbus_glib
+{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, dbus_glib
 , glib, fam, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   buildInputs =
-    [ pkgconfig libxml2 bzip2 openssl samba dbus_glib fam cdparanoia
+    [ pkgconfig libxml2 bzip2 openssl dbus_glib fam cdparanoia
       intltool gnome_mime_data avahi acl
     ];
 

From 11621b9ec042cf5dc022ce9bc91624b62e0d874a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 7 Feb 2017 20:22:57 +0100
Subject: [PATCH 573/899] samba: Fix URL

Fixes #22527.
---
 pkgs/build-support/fetchurl/mirrors.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 5ae5eb105e7..e3759fe49cd 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -128,7 +128,7 @@ rec {
   ];
 
   samba = [
-    http://samba.org/ftp/
+    https://www.samba.org/ftp/
     http://ftp.riken.jp/net/samba
   ];
 

From 3a526deaeeb7a83dae6e4a3c2a4cddcb776b3985 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 7 Feb 2017 19:00:48 +0000
Subject: [PATCH 574/899] libgdiplus: fix install on darwin

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

diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix
index 25c5a6d683d..f84cc677d16 100644
--- a/pkgs/development/libraries/libgdiplus/default.nix
+++ b/pkgs/development/libraries/libgdiplus/default.nix
@@ -28,6 +28,10 @@ stdenv.mkDerivation rec {
     ]
     ++ stdenv.lib.optional stdenv.isDarwin Carbon;
 
+  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+    ln -s $out/lib/libgdiplus.0.dylib $out/lib/libgdiplus.so
+  '';
+
   meta = {
     platforms = stdenv.lib.platforms.unix;
   };

From f586e4befe0a8780ed12778a31cb73bc0f0da3d4 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Tue, 7 Feb 2017 21:09:54 +0100
Subject: [PATCH 575/899] nghttp2: 1.17.0 -> 1.19.0

Package update.
New features as documented in changelogs : https://github.com/nghttp2/nghttp2/releases
---
 pkgs/development/libraries/nghttp2/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index 0697b05c0a5..aee0b3d7116 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig
 
 # Optional Dependencies
-, openssl ? null, libev ? null, zlib ? null
+, openssl ? null, libev ? null, zlib ? null, libcares ? null
 , enableHpack ? false, jansson ? null
 , enableAsioLib ? false, boost ? null
 , enableGetAssets ? false, libxml2 ? null
@@ -17,18 +17,18 @@ with { inherit (stdenv.lib) optional; };
 
 stdenv.mkDerivation rec {
   name = "nghttp2-${version}";
-  version = "1.17.0";
+  version = "1.19.0";
 
   # Don't use fetchFromGitHub since this needs a bootstrap curl
   src = fetchurl {
     url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2";
-    sha256 = "7685b6717d205d3a251b7dd5e73a7ca5e643bc5c01f928b82bfeed30c243f28a";
+    sha256 = "477466eee27158d37b4478d9335dd091497cae4d7f2375fc6657beab67db9e7a";
   };
 
   outputs = [ "out" "dev" "lib" ];
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ openssl libev zlib ]
+  buildInputs = [ openssl libev zlib libcares ]
     ++ optional enableHpack jansson
     ++ optional enableAsioLib boost
     ++ optional enableGetAssets libxml2

From eaba666273c285ec2d3702c8e627a9035683e268 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 7 Feb 2017 20:08:55 +0000
Subject: [PATCH 576/899] luaPackages.luafilesystem: fix build on darwin

---
 pkgs/top-level/lua-packages.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index badbeaafed9..a5490970b72 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -137,9 +137,16 @@ let
       url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz";
       sha256 = "134azkxw84xp9g5qmzjsmcva629jm7plwcmjxkdzdg05vyd7kig1";
     };
+    preConfigure = "substituteInPlace config --replace 'CC= gcc' '';"
+    + stdenv.lib.optionalString stdenv.isDarwin ''
+      substituteInPlace config \
+      --replace 'LIB_OPTION= -shared' '###' \
+      --replace '#LIB_OPTION= -bundle' 'LIB_OPTION= -bundle'
+      substituteInPlace Makefile --replace '10.3' '10.5'
+    '';
     meta = {
       homepage = "https://github.com/keplerproject/luafilesystem";
-      hydraPlatforms = stdenv.lib.platforms.linux;
+      hydraPlatforms = stdenv.lib.platforms.unix;
       maintainers = with maintainers; [ flosse ];
     };
   };

From d3bd528d41b3df1ca152d797f774ee9d277b669d Mon Sep 17 00:00:00 2001
From: Mounium <muoniurn@gmail.com>
Date: Tue, 7 Feb 2017 21:20:24 +0100
Subject: [PATCH 577/899] Adding support for Hungarian language

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

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index ea265ae6661..b74483b8274 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -13,7 +13,7 @@
 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
 , gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas
 , defaultIconTheme, glib, ncurses
-, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" ]
+, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" ]
 , withHelp ? true
 , kdeIntegration ? false
 }:

From bd46a375df572c838d6721ef0365e76227a735c7 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 8 Feb 2017 01:30:31 +0100
Subject: [PATCH 578/899] grsecurity: 4.9.8-201702060653 -> 201702071801

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

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index d4c0b20e9b8..ea93815e786 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -96,8 +96,8 @@ rec {
 
   grsecurity_testing = grsecPatch
     { kver   = "4.9.8";
-      grrev  = "201702060653";
-      sha512 = "1kammx0q0v37xw9z9zk7ppkixrwlr866dpfykjs4wy3ypcivnvkbk7dimyihna3vrylwgp5gq90ly7dj7d9gdblh83ccnq6n2m7ba43";
+      grrev  = "201702071801";
+      sha512 = "05hxn9jzkywd15iqjd7lykj0f9czw0kq1rs7krxnrk4lhr4k4ahbhq4330mw4pwcvln4ys25dw7mbljn9zvymb7b1kc3m301rrbgj5f";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,

From 764b1d19f9bf9f70fa390b74a657b7e4a928c572 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 8 Feb 2017 09:12:57 +0900
Subject: [PATCH 579/899] thunderbird-bin: 45.7.0 -> 45.7.1

---
 .../mailreaders/thunderbird-bin/sources.nix   | 466 +++++++++---------
 .../mailreaders/thunderbird/default.nix       |   4 +-
 2 files changed, 235 insertions(+), 235 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
index 12315a7ce12..556101f6f95 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
@@ -1,585 +1,585 @@
 {
-  version = "45.7.0";
+  version = "45.7.1";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/ar/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ar/thunderbird-45.7.1.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "5e971fbaebf1e827da0f257277f7589777f426da8ce5465bfc2e5ca935cbe3b573562a94671f5b90b1005447169000b14c422aafdba68ceb7b48c7c1cc529fb0";
+      sha512 = "e1c0092e9068c5b687443c66e51d0a66821b509d554ae49563ceb5ca7f9f1429b47b084d39d9b8c7726aad79d61ad09b3b256118560b77ae9a179152d4914147";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/ast/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ast/thunderbird-45.7.1.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "9ae45c5ff83dab4b4da3849d147546e8265718e568a82a14ec111128ac97b606dc122962954e8f2650e29f7bd7335508eebf30b3245165ac5563ccbe9960dffb";
+      sha512 = "0dfa480291f654fcd3af50711b3634202b81e9661a037a98d1e32e7b51bdc0395331fa99d8806a49873f23a02be95a383bfbdf001f905eac42d9b132d1e170ee";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/be/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/be/thunderbird-45.7.1.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "6aa812541b2db739e2afabfbc00e3de8c068460b9689490adfb0306b54914efee6a3fe1854f1c5e18eaf266220c1c3b7291e4da0d3f8cf0f7d651a0ef83ea8eb";
+      sha512 = "fd705a8bdbe5bb6e8c7e120495021b538f75ca8d5c485d9d224392808c5397e149004c2262e2dbf982d5248a7ab036ed82980665be7628cf87e789b5d4ed4e19";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/bg/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/bg/thunderbird-45.7.1.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "54d657278863d8b8030119fd1a31656c822e4c12eaa607ee3b61dac2ac24ed11069e913f3d6b1c868a040bfb610d79133e3bfc509937fe742f23d1d5c8be0480";
+      sha512 = "f6ceb36dfd93e10b29a8d5322604c1fe17d1ef96113e79bd3c5a0f9912b4a77f8a182f676919ad5a58c15ef9555fc2ab07d8c2f375654057cdf2efc0be9a1ea1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/bn-BD/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/bn-BD/thunderbird-45.7.1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "45ba00305d7ee59d4d33c73f1dd6bdd6e49f74e7bc41092fc3216f09e36987a0f7a5aed42788a2c4873eee9121267d7206813066b1b63d3a8b6953cdaad62882";
+      sha512 = "d3dfebeb5d6a301449130c94c7cbdea50e8c29c2571b408d89b3a632a164056605bc0e15dc2957f677d639ca9712088d94c62d26c0b2ade4faadb159978519c8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/br/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/br/thunderbird-45.7.1.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "277660c584fe60336a3333fedb181713e8eb5a9ede4844238a61748a279c68d5768d96fbaa93b9c6132af5a37fdd38650e0c91579a6b17a3501caf213054426b";
+      sha512 = "1de73392b72d595504314e36c2c8cda7ee781a246dab443ba8f1cf46027c40a85a1e7a8626bfc46901940a08d89de69c2779a0702e5271da3f703aa299ae4767";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/ca/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ca/thunderbird-45.7.1.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "c9e69470dec521144fb96f99e9a22987f5e982b4e385ead271966e62e4c252d880aec2581e6f0692710cab8f9667c5c34f26c9cd86ccc84c7bf25b21abd4461f";
+      sha512 = "e481f63846a437dd1326820f455ec7c50ae56e638bc771814c4a53b5fcd7b397e0b6d7886965f4ebc94c15d33eeabb947c65a72ddad8ebd6a0549ec5df94be73";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/cs/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/cs/thunderbird-45.7.1.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "0be3aac8ffd4d0ad3571740933c3da0e1cd47dbd7e555eca9862751da367f0128537fd190159c138bc5f713fb282189d23220b45ada59de8ead59711566e7b8d";
+      sha512 = "148114a531d1dd467fa59690836dee75e2640dca5b448175424d56224867676990561693e12faef7ea53b0e0a87cb039a5f7b35432901703f135cfb99f48e53f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/cy/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/cy/thunderbird-45.7.1.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "a36b500385a55756686e5d3378ae1b84df4d438507bbf0c84fbdb6e2a3942e2eb032b37f004fbb70d2ce00b495082534ffae670811b1b0ff82bf33b88d3481c6";
+      sha512 = "6ee390cc87fc717cb1e413e5e2b46eb1f7335f617877f9c190075f808f9e0f7d21f59a41a651f2bce14323a46994c499056c6ba3308dfc28a2733f125e200a0e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/da/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/da/thunderbird-45.7.1.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "f704327994b2ab085fddf9749dd440062ee8e2d5a9aedb2fd6b4c80bad6fc2ece620ed7794f14b8f55b4e1c358178f6b11d61086e0535b077a770573942f3c33";
+      sha512 = "1246c3338ec1c66ec0631cd3dd2e2ddfa2f55eaac2ebf36d6fc78a58cdafe15b5bb02c542447fa7aeac56eb9dce2501951b998c605844ce37fe8bb4868c100c7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/de/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/de/thunderbird-45.7.1.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "cae4b36fca75a9246a91cd0a26248ac2d9d4f1be93eb4ae7b172a9ee66efab17d023a8008e318c0db1b1fe227fd0085def6441a8e16e2fb284198805754aca7f";
+      sha512 = "ba651c2f07eceb4c20a9997bd518c322b025467e3474a56c17e1c35ea9dab7c3ac08295f573cdb7c4967e531dfcaa76facf4185ecc12a66436690817c73c0454";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/dsb/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/dsb/thunderbird-45.7.1.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "5fb46ea74aecac2ea56ad2cf10b00098d144be99d841648cd76baaaba6e26709f4f470d58a22465a3a62dbc4578c8001afe857a4e9536b30bb50d0fa942a25bb";
+      sha512 = "5fcbb029e59b50e3c8762acdcb561f3541a1056bd467f2830b316ef39b9f55f88797693ef4c281d8411c678bfbe86abde74483f0b9418e185fe80463487da489";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/el/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/el/thunderbird-45.7.1.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "33fbac5d0cd9348d2e1a5ff239770d058cd29382abebe394756088ff0610e7fce00021ce0f62d81570c557451dcc5352d0c9644f83c08c0f24a496c60194ecc1";
+      sha512 = "36fa1fe8d3b52ee95275acfcda8eeda175f9ff5d44b7fcd0e33df2a27fd4c815d79b647265e9c32bfdcd9f1900bc98195bee6de5e580abb452ca47003a438b40";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/en-GB/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/en-GB/thunderbird-45.7.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "f763c506aa22cb40a9c991a17ca6bdf5e7451a4b727733c54e58aaca2f1945ad008ffb51665f4d960d70189e5008853fbe0308382c8c9300b3156b143fca2375";
+      sha512 = "15973247dab22789b8c63f5617fd1d85aa2a889e78d1bfd8ade002d769bf81857cf7d84c6302c168c5923ccdd08ea561df4fca1f17f0fe3337608af161c6e86e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/en-US/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/en-US/thunderbird-45.7.1.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "c186bb0d52eeb8ad87b26871257a9ac6a29cb418ff9956e81804ebd1f557d28f31d99124c530f141b612594dd149996c6258d11953698e5e9083bd1b7c7ebdc3";
+      sha512 = "4acce7404bad1bef72d1ba0630a6d9e7678716121b5520d399c3e47096a5b82c03b797a3680428d1c8447121d403de227d7f327001a27092db8df438f1d88d18";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/es-AR/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/es-AR/thunderbird-45.7.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "5aeadcfb8417898367f192f09c1a12595e772d72f66fefb54510ea447942b1a715bd619224dab0047d218bf35e6b7a88562d7bf45f4bfede3f94d189af209e0b";
+      sha512 = "68e7e8b134d6b3a6b44ecf9deaaa4fe58a2ba2324621722300eb39c74f6d4801edb7532ff81a2a22f473b55d227caefce4e5460b9527fee2bc7e9b765b4a66e9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/es-ES/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/es-ES/thunderbird-45.7.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "d4762f067f645489147cb53c5fa1e6eb7e2f6df7bfb541b824988a8e918df289498e27af70407a1537b28dfa40d0483a0da08fe757839e3bea2d958e2d9ea7c4";
+      sha512 = "80517102d930a0613254f5f2ebbccfadc27606664e957b217e899b2d519f1a7fd189caa17756ae9849f870b97ed8a589c327d3239d2312368a94583434a31bf9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/et/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/et/thunderbird-45.7.1.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "c4b2f7f2b13ea7fb5a14e5ae2e258962f8f3a269d3d35987d37015d72d42d196e6581928f6cb4f5300036c58d4e6ab69b085588164e6b516a778b0f5c789f22a";
+      sha512 = "3399aaf7a8eb812b4ed4c56e8e6619c9e7018e552bc810f9a20773854cdaaa3a4382754fafde2809bb945885059c1613e3832071bdc55d32816aac49e38acc9e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/eu/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/eu/thunderbird-45.7.1.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "d38a6bf51d9b8b8c15a709bd8618cf71cee799afea3466f0d197a8c4a1b9b8c4dc60da1b43f398619fe3a73b8444429cdd48af8065bd3a34f91f271d78169ea0";
+      sha512 = "4b7ace6485b3d9f14a924a9827226c3337f4b95107b94e51925524aea6eff2d446868f7a7f350c22ef7dec0c3c04c0fbb79f9eac9c1db0070195ce402559b3c6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/fi/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/fi/thunderbird-45.7.1.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "087b9b6b500ecb674b013a8f9fd050cd7694c6e07f90de8e421ac46558afb5b73640d293c155c200f06df3e1dc40adb8d2f2b2f28d30aa83cc888c5f7097f8e1";
+      sha512 = "42330fa494ff9e09ddddaa5828fd6e984f4e016d45f90638a72d958f1d0d52458c4d66492c4bf3a9a57fad32ebb24ecd4d43efc51795f738f50d7385b3090015";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/fr/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/fr/thunderbird-45.7.1.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "50824c56fbcd2d164f891a749114b3401e01845b0118b007528542f82884a832ef1cd5fa72b41cf878de80a1f220e453cd26356375275b72b8b7e14dbb94abd9";
+      sha512 = "53696b4b77c2dfc4eeb03059429dbf38dc31910664ef7638ce291adee5d9e0bcfb1b8a19524a96fed02594b664d125e9c4791aac674c03e9dbb272544f429cb1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/fy-NL/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/fy-NL/thunderbird-45.7.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "5e32fb0c933a9b5dfd4557a16b41bd8fd17f734b66b887a10780e7a3c5658383450fd63c42f693ed095056fcbdd45e7b2fc2bd7a919225b8dd8152c0620b93df";
+      sha512 = "2c8a487a2a77451d2d4c239a16cdf114e1d9ef37d7c0a1f2dd2e3e9ba6270004e39fc38828b363805ac530b2f6cd3016594dfcccf2db37525f9700866d6a513f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/ga-IE/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ga-IE/thunderbird-45.7.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "747c305440e3fbacd96dbd1aba42fc85d302171220eca94bb46930f618404ec152de5a1bc130fd7033098d7f9401fc945df51c8215a49e7ba1d6fedc22679d81";
+      sha512 = "127d0cfc24b8e3e00aedee39aa400af198c7e48239fce97dde27416ac517108957d5f18735e5106eaba0433321f406ca9c82d774a83f1e58dc297b80e55a33dd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/gd/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/gd/thunderbird-45.7.1.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "6e661d5c2b6a531dd4600ac55c65d895e176477a85a0311697e1a14d3888da2de40d03701e4f447898e4119c210bb64d90ef2a3f1d131540ae521cf4448bfb7f";
+      sha512 = "48dca91d52b3f71a76c3a08003247bcfe498342b3e2e6158f58087251a9248959d17a7c91437475892a5b5124d9a76a1f0cc99c118e34c763ae4227fc4776dd9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/gl/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/gl/thunderbird-45.7.1.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "9da68b8ea5125f94c22ef74bad14ce2f624e59521e62b778884fa68740a2bcc632b80d83a3e85011bbcdc76bac7cebe7853f22ad6bf7c9642878a089dbd034fb";
+      sha512 = "92993f4090d641ee6573ec08c9ed25d3126e0e9796568aaa77296e859fd70069ce0f63f017fc08a3e01d65dd9864063f8ec089ee8e43197d511358b53259fb76";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/he/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/he/thunderbird-45.7.1.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "cc9e36346cc7b0b18afaf23e7637d51e2232db028f9b9d5c708a1bb4ba0cd62638343fae5dd414098c6755782a2e8e9ac4731e38746574610edbad94acb65bad";
+      sha512 = "c7e78d6aa2920fa81820b54a3f1047d42089e65fcc424ff663ef287cf581aec7b11fec33c309c88ae5986c9a78d3967dbc3cccd6efadbacfb145e36d2409e514";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/hr/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/hr/thunderbird-45.7.1.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "0f68a4059b2053319cdf0fe335f782d9a53e392c5d1c471326cdc47f2f779dcce75e4882e6c9e339cf6d0589f084ab54d9ef5d4c4df193c96a7f476cd0c5f9ef";
+      sha512 = "0160db00133e4564b9ca0ddcb2771abd343bd3cef1bfc09303805bc0aaa01a5cbeeb6a23effd2e8256ae5457a2fddc149156d1702705531c728134845945dc56";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/hsb/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/hsb/thunderbird-45.7.1.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "f6077a9c5b91f5688d2f71201064015d87bf38bc34d9f556ee1037650815c05e71a2cfc0d67736c308fdb6b5217f0fec56fbfc5a7044940f06c809579a80610e";
+      sha512 = "012f4544e60f7a917ffd49fd6668da548e6e44ce666a86f61cc0e36e53806db16496824bd20b253d079e27d5601ddb6cc1ee290c600e116c922bb842a2232294";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/hu/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/hu/thunderbird-45.7.1.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "958d7b9d82fc4ecbd0387df0bf2c95d27fde530b28519a5c7e6795f0e62ec0fcdc77bcf526342d5e13df993236daa2576f205c8333705adc2be35f156d5b9176";
+      sha512 = "ff13587b1098f0d503c6f3b81c2a9f3c075d192517e0dee6d9fe324927a6dce8686d989a34c3d36cff7a8e2bd6a074aee5fc96f7527ec3fd78cc0c96f4279b2c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/hy-AM/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/hy-AM/thunderbird-45.7.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "2415b150651c0a6f173238180973a6ec1615e67fbb7fb7aa4d2d3d773e14c0584ca2c8ac268fb8c6597c1985fc91db741d6a842e17b47f4841cd50a13cb7896b";
+      sha512 = "84f3ca15346c821dcb9efdcfbc2b599a68b608cf8dc28145e0aac80babcf3b82da456a0816f2e31ed47b19c47f3afa9a265f864de6662fdd4fa8586d520ea025";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/id/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/id/thunderbird-45.7.1.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "3a682b3a4dc497244446674c98e588ed0f8f5e835eef00d9530e78d84a62e43ad849b807b8d6a9086ed20347b874da2ae486769e451ec19525e8e34004a34727";
+      sha512 = "2310cca9ced00d10b932eb6d27797b53e427f997671b836a5d03bc3f263fd469ea3dc5a2ba35a71da6b73e4dec83c60fc31203329562d6250ec573a38c55f115";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/is/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/is/thunderbird-45.7.1.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "9fd5b5a7d606913ab9697754093e21daefbb70baf515200bb3b8400f6eed2cce39b1415ef6f4ddb195c40bdd7deb9ed8c863c5d3c2ba4b8d4e3714f62ead7fc5";
+      sha512 = "710f180201035cde81d8e07cbc7e9e83289a160f6679393d2dd70c48c92f5b3568c0f7290e18613945abee052433f31c2b3b11019cb95cb8f6b23f04e985741d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/it/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/it/thunderbird-45.7.1.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "0d05dca4e136b3aac77af366f3356a5af32c0f46589a6303eafdf63f0e8128fd9c4f80232852ff91ab1f0a4e06e27daa70fbff640e3f6a30c0a31dae280b0cf1";
+      sha512 = "d5596d86c425f2d1251947a6d66558d87ec22a20490db23c267c514b98ddb9acebc30180c6c29a242ead4bf079fb8e9bc35414210c1d294dc735923f0ab29d3d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/ja/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ja/thunderbird-45.7.1.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "ffe36363f9958132c8a4263f985ae3d5ab349fc7247cd3521a2ea613fb3dfea420d36af8e650d024d9db39b89b225751bccd0efc8e2e4d4c91bd8786657dc0db";
+      sha512 = "954e41ec6842e4ea40c84354a3499085d5fa754c0a8fe581fd0e1ddafb84c218b0afc6b84d6b89448573372ca8170563f4732eb0e00388d5daf918fc9eccab5b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/ko/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ko/thunderbird-45.7.1.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "9d91b3df05ba7d55428cd3854a70a28e42d7d51a227d239a29c5d9efb11f8d0eaaf812bc71940d33875bb7bfed9699a9131874af8ee49e4504cb996c0c3571d7";
+      sha512 = "3b48ec21a87f4763e95a045f273b3077cc0f73f0cd79d0fd341bab93308ca6aa122aa1b6fe60cd9857e2af30f8b868a1ce56ca5e2418235b9207c33339abe66b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/lt/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/lt/thunderbird-45.7.1.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "3b5aa45b9e893b784a192961c40c4c29dc3bba641b13b9aaaf0fc67b8d7b5aa3b404700c63fdf3f7bdeadaaae89495b1e37e274fb686a46b654113308dafaae5";
+      sha512 = "e314d8aebc993a9471610d885736e50a174905cdd862eacb3cc08516fda8538cd86afbe62744a7a28947f289cd9d3847436ac4be6966097c4e2d81f74bb3aa19";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/nb-NO/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/nb-NO/thunderbird-45.7.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "1959225b4fb510cc414b57934728c75e91bbd9d105ce0cfc7784167c4f30676adb59302e9252475c758dec08618df733f8873378a0d0ca3db4dd51b9c469c424";
+      sha512 = "2d14dad1eedc2b5043adca4d8ae9ddfa7bd7c4d9c246fb5abaf552f2bd1a27cd7d64638291a82391ceb84ba83c6c4f22f9ae09c7efc1c2530cfe986654b8b27e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/nl/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/nl/thunderbird-45.7.1.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "c4c32627de1e70a9934178bbf05298ccd22194269dfd82907919b91edbbd9ee177c3cbb821e8c62d6aa6fd67207ecab633e80cadfa85bf1fed8d67a508e1da42";
+      sha512 = "fcde3900e201175fb9071b553f26dc49cad67888137df2e6ca4c7a85ffcf85aa23ca331bd4e5a3430b20615b2dbfae1ca4fe59833cd9d303f7ea6f8b73f42f64";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/nn-NO/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/nn-NO/thunderbird-45.7.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "3ca25a101458c38677eac0998a3d88097d9a56214e2cfb47113ea250e2aa504ad0f2f9f97b94644c39a8079a0ef57ba3a6d89298180f16c26f0e253b25338a57";
+      sha512 = "a3e41f8fe0486a691c413104fe89009db9e4709821bac4a7062a78a6a30b083fed5a522c6d5b7c004e0e9b2131aa4bdbae85e8dae3300d2f81fd875981d79b44";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/pa-IN/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/pa-IN/thunderbird-45.7.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "8ff5831dad507d975946f30b28c757e3dbab3b48c410df24b9a18e2b01cdc0813640f75603e14a5fadf7f449657b5dbe580cbec2f93f1c010d252c491510588f";
+      sha512 = "841cf7f21b436d1194c4082ec0fd0067bed7ae625299b8f07f535708005ea3a7c217f4a6d3acd8b392e620ebdd15447f62f969c4e0c8e40e69f77c3b89402517";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/pl/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/pl/thunderbird-45.7.1.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "b50a227c15ef35067baa3ce95fe0fc8e6f5cc2d90abd14f3d783198573de530bf0d86b216cb065b73ab540f213cd2a896beb8335a7d5cce150110d3e23e5846b";
+      sha512 = "026002b4161801b9ba44442ac2b54f0897b6fd3dea3c6819a16c5b886c829308558917470e87eba1e7bfa9adf6d5a33dcce4645f24cec8b8cf7ef4773d924e65";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/pt-BR/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/pt-BR/thunderbird-45.7.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "f286dfb2dca8b69569059c39eba7dd2d78037440f64687fb7543f2209d54e5b68884da910a91f87f0f16ba0516d78da65835f56d94a3ccd89644aaee83e0d562";
+      sha512 = "7b78eed009541c2b5e99fac1c6267f42511feab8cd26b8c6cd758c8cc4fade84195da5b4ed1dd44ba078c3ae6a3d2aeed0bdd04e37a48f585938765a7e14021e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/pt-PT/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/pt-PT/thunderbird-45.7.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "49a74c9068102b510995c1634e9a3084216caeb8995b07ad287fe0239040e9a63aa1f3800870912212cf5b94dcbd6672ad96154dc19589804f63eab8f9e0213f";
+      sha512 = "15f5f46ad34ab5506d462c68ae5a2c0ab1548b8588ac877863ca73c97166d10ed26a6af32c9f0f57bb94da7b0c025813585a17e52dd3238b49344995905bb705";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/rm/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/rm/thunderbird-45.7.1.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "c17bade5200a48d8aae39b6084768065709e45d3eb29054c507d038d88d3f2ab4ee0ec4fec111b20c5acec341817fd1ac52babcf581b985d0e28e8e2a35e1934";
+      sha512 = "d0e70c192fdd0cc440f81173b13a09e6916355c2f65292c234e1da288e9a54ff1696e20c3a04f3a18fdb664d0fd76d8c477c7b19b0368a1d5dd889a5bfdf8f49";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/ro/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ro/thunderbird-45.7.1.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "f146430b29fd011df252a077bb283221b3af1ce7dea1f482f807624326909a98e9dc18debaa184b3704554fda591961b70c5f09748c8d523e309dccc08c790e8";
+      sha512 = "0bd336fa6f8e1f22e8d9f8e10071518a91922d9f8b75d4e462cda1ff9a7e6a744a4d8b4412dd3d1f5617553cea67bf73599b5023dd205437ff3aa26854916e24";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/ru/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ru/thunderbird-45.7.1.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "3794c474c09e20c9c58359a005377fa7a2336c72399b7149191c54dc824031377470b8b105d731380efc3a89f73c7befa18a443210affc3d8062943d8db9f544";
+      sha512 = "61a02467ee16e6a14b535be1b4a3ce2fa3a6bc6a61c2804e234242758361182df976f7edd0c8080637f3403436b018946c28668da09ecb9322c0eaa5fe395ba1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/si/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/si/thunderbird-45.7.1.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "a06ad8b09784b1dc291a3196765f98b89ca66b1c68b1546b3cb71864c73339063af62e8f06ec3518c6508cb54dc2f3cc93b50906a3ff9cba88809ee9b18c731e";
+      sha512 = "823e069b47f42c35c194bbfae832f71203e78f14057223bc569d8a18bc631d2d5bfdc3dfe5cb18c0bbae561b39023cb43dc26bf841a0e20e53bf336128bc1210";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/sk/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/sk/thunderbird-45.7.1.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "6f4a883e1da1dc3902e0230c2105eda528e882caeaac0762c8a7bcd5e9c63e003bb803f921af2e7f9c7a21f34fbbb3558222d8e018f083553d5f532b915896c7";
+      sha512 = "c3bf6785424419f7a1240c2069abafcd1275dfdf8908fe2e80dbd395176328e7c8c0c2cad9ce7ef46a605bae9e153e6c98fa696145fe7a186e30c7a2b147dde2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/sl/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/sl/thunderbird-45.7.1.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "328199364bcbf2816fce38597fe8554dc0ddf31cc1ab027c5b7e1a490d7261e4c440938ede308e7aabfa3a05f9b7ba9880209eaeab306022e4b46fd0eeef5b94";
+      sha512 = "bbf63ca0e0992c5102b047c5e41dd9a2dd04d38bcbb983393345a54679ddf100496082804d17c088f6dbb76bcaf1d9be39f0e45d1e1cb0abc33fef98a79bde7c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/sq/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/sq/thunderbird-45.7.1.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "a04e1b5d44fdaaec2ddc49d531eef3c7bb84347533f84e0974a243a5b3b90ba8acee63080ba191b5404432e4ec597ced4cd69d674d1ec50e21825ff79fbe7af1";
+      sha512 = "68f2977a84aa0a1fc94b19a3504733cb4168d5835244482e775b0200cc0e17a548cb3f4e29d81edffb9172d3faced2a8d459709ddb90e1957c6c05ff792ce05d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/sr/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/sr/thunderbird-45.7.1.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "f9439cb927e37769e3da2e511865114d9cb76d2a8de6de4b83f240606609501090fa8f0348c515aebe97d7214842c2731de24f3881baa32fc04b0d2779711704";
+      sha512 = "d0de9ea4f4cfb619d37b957b4260477522ae1c2df9af19e6001672f7f693015c09e8e74ff0278d0107abbb0483de0c9f6d251efaa3d9175947beb8c156145ae8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/sv-SE/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/sv-SE/thunderbird-45.7.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "db3c318588b029cac92b0d4f85da41aa09538e1c8941719fa2a87302d5d025e83c08a86ce720417b1dd8810b7284c1ff913bf299791c60b5babc1a81e7cbfdc4";
+      sha512 = "db4af37830a458808b9450b414b7e25aede621c602b344cfbb62f00fb610747ee48fe3a7aceb1a58c0b1fc397415ea7a9e0888e0cbd7116922f2bc28d09c6426";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/ta-LK/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ta-LK/thunderbird-45.7.1.tar.bz2";
       locale = "ta-LK";
       arch = "linux-x86_64";
-      sha512 = "976fa4171b0f7f085cb5d5d5ca23cc009c26bde5bedc4c8ebd76e30d6dc75b19ba3022167639b4df03d85865f2c9e1725a70e2badae644622a233a1d74a3a989";
+      sha512 = "1db6844293dce004878176cb76df68e7c7b3fd1147b4e78bf647d155d1a7efe01e5126c088c96d26f78dd2c9de98e0703b7eedef1f2de1584a0cb835f9123c1b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/tr/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/tr/thunderbird-45.7.1.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "fd336f9880d03cf276d8749afbd605452344d3e7966a260e81020f59eb30166f10ba0d2bc17ff0e635a5cb1d15dad46cae36629526cc3383827ca162743c3642";
+      sha512 = "f05b1f63839a9d38431b9c1bce8a2f31ad242edc4df5b327f9f0a562dca1f94a9f3947ba55a517cca5dab9a96fc44b938496bf72086f1dd8d1399aa3170167a1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/uk/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/uk/thunderbird-45.7.1.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "3f9ae50655d274ed6a7022a2af0f9f403a835dd3d76027f176ddfddf4fc3095b1e5951cbdf043e449a34b387b7ad446740a01c2867573064039e3a1b34f7f66b";
+      sha512 = "303d6b4ea136dba2217301f6c42bd91e45ff635ffa1ab38ec0633d963a1bafc1625475bbd24383e5b9dcf233a19ab0a712e70891614e14207b651c4e65016456";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/vi/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/vi/thunderbird-45.7.1.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "82fccaecc5e654f4d49292bc8d45d7b27aed13a63df0cfd7eccd8b06131f5cb3053d1e3dda5e6cbeedfa6df275833fa38860c0ddb6cf59402b2e4c3aea208cad";
+      sha512 = "3f712c97073ff191bf2e16d61877711ca4faac204e85b2394015d53a4f600a3c0fa352787ccddf863379ebefce4020b3526f957f2556620e4632bcb20204421c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/zh-CN/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/zh-CN/thunderbird-45.7.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "d4d35875d1c0edc2d67cccf9804b5dbe66f4808155933515fa6c532f657856bde441c3bf1af9553d4417e4858ca64db112d4d9fbdbd1151cd22d38da09b7a895";
+      sha512 = "d986a5e9a60512ca4d398fc4fb503aa7980947eee68dfcd5c4a73bcc8b324c20c6a3be66855eece6d0d77019e6b22d8ae220058948488d197063f55a291a8865";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-x86_64/zh-TW/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/zh-TW/thunderbird-45.7.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "0d7986de773742dbab8210aa97cf6c7d80b792cfae192a06a3cf1c0b39436431ce174c3b97c5421879eb261960bb5eeb52c8b22abcba208b531fd45896ba9124";
+      sha512 = "7dee7ced1c48aa6019eb80c66d2c68af9b5afe89ba3c147bd83e78532fab84fbdba8afce934ef8bb55a82837b84475797cad25710001e22fa522823bc60d6a96";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/ar/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ar/thunderbird-45.7.1.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "8ff8bb47f0a845139f813df40d021a215e498c38149b53f57094b4ee20484f4a0ad668337b6dc79ad8e84d6a6a9b9a99de6fed57accdf5b8dc123b0833961d0e";
+      sha512 = "0453a451bc0ef3704cf54121f7781f11c2a35c29fa407b36a1159bdb462daf35ac13da1cb0deca19b5b9456a4bc68c8bcfa12384dde82441a8e69c5376875d5a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/ast/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ast/thunderbird-45.7.1.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "8968e2f4d61b4753c6e1cc07a0f61ad6fbe0d205b29b424bfeda4bcdc3b23d3458561eca7287dded12196c008b6ad699f680b61aaf6dd7f4ee6dd7e813b25ed3";
+      sha512 = "4bc10c64922604b95dfb310f0415a8e49552378c51025511265e7f1e7f2cf7bd8f9e9c6b3e45f8806f2df9fd02db451014cae4de7c2e5ce57e48dc1288cb30b3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/be/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/be/thunderbird-45.7.1.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "2a3b2e5f101a6a69f425494934900d151545a026d8c77a4e08342d3816de5229802c834120e5a797b5691b55fb5e486d21b3dea189ce6ffb8e4323e0f2dc2051";
+      sha512 = "0fb8f8d0a2c7ea4455c0ff90b85e4ef6b0b6f8ccd08f9f9d4852743ebc1f6a6277011be82be979142097fe8cba853d244afad30749aaa423bd9ffcde9fc3a00a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/bg/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/bg/thunderbird-45.7.1.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "09de26308307a0fc43dfde5a5033c737a79d76e80a4f5e457b87a8c8710dfe05acd1fd782e3b86872673c61b9d559162135b017a9f93dc3ef9d93c530b7f513b";
+      sha512 = "6d586700050d399e4058eb03931bc6915ec56a9270462a7a60846f66b884aea9627526b87b14a654166e30b8a1d43412ba8acfcb12ba4af8d3fd4fd15d4d7cbb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/bn-BD/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/bn-BD/thunderbird-45.7.1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "040523cd6589834870b23de3660a81fd588e2d2ba8c727be6d19cf92ec0b669d79058a8139f0ca7a289493658324216f8fe3fcfeed2721fc54c7c3860bf1e0ef";
+      sha512 = "1cfa845129724a098cb913b3bcaf7174ab125321b35f58279ec9c11c04f7f991b37bb9000eeea4003cf033f6f0089992ebd0d7ebf1d6f8b4d7c558eb8c850d99";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/br/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/br/thunderbird-45.7.1.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "df02188626d3180ea0822756a116f1b6a4cee6178b0e0fc22bccc3970ea3aa5717b75cb5623f5dddadf354ac0c890acd4f13f434418b7431b944ccef2833aafa";
+      sha512 = "951631129aff5cbfc2695e1a5dddd88e855d57716ce335a15ae069b7bb4572d082495ddad9caea202c5d36f46f599cdcb8f028def63252f7888fb2ba24f4437f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/ca/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ca/thunderbird-45.7.1.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "2ab3ff92c2899ca294631e9b0a2402080493f478affb40eee4aad7b001c7a7d8f8cc81b5659c16d7d134c8ecf6e8f1447fd6daccf7ff82b03f283be55638bde3";
+      sha512 = "cae03ff18fb33f6d097836e5e7f5884f64e7c594eaaf77cb3a0e1f46214b878ef2de51c750bf1f849f5cfddc68da21c3fb72927ddf6824a89ae51e44378123fc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/cs/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/cs/thunderbird-45.7.1.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "7ba56912a4ce6e87b6e4a1303f254608960aa2a156e7d246230e4dbaaf50f083b9f4afc52e89966caea6fd64eefe3dc9bbcdfccd1c0e65910efc49e44bfd5a76";
+      sha512 = "ea9ec870c91cc2eaab758a3585e20779d24734e62c285f1f591646f9aba92e33c6a7966b0b1e484f28ba0a2f40d74f918dc899c87518f052b793fb5d1cc867ce";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/cy/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/cy/thunderbird-45.7.1.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "f74b4829ada40e7b507012ae77cef420d3e8f77b41e8adee352dd1f91300f090e98dafc852f7983d04a8eea4ae90d1978301c39347aa75ad68eec42822a9c1fb";
+      sha512 = "082d8f2fa527a75b8a388f84085a709cde9d9c455aaa2615f35bad0eb6962de0af163d515e0481edcbba29fb858095aebb05c0a3f25f33e1e14f7136b83a73d9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/da/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/da/thunderbird-45.7.1.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "29139a2f285a684952a209e898e444af2290b32940de11f3a93db472985bab2071d813dd69e73df5422f8088772cf76591a792b567a957d9a36aba54102603d0";
+      sha512 = "9ccb84b78ec7fbef596b64e76fae50bbc8af63eb0c0d37c6f81e1353f3afc242c0e3be9495d4b0125fc0500e0b4569df3e00d5e302f93f7007bcdf3089cf0c22";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/de/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/de/thunderbird-45.7.1.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "5cf919f3ff9911068b57afe972539a5f5c35335cc1b2462437cd31767d2b949305d77f30a839e89421c60a92abe63be3b4805acc0c5c37eb4f95e3e465449fc9";
+      sha512 = "a493f5e2c4c787f7c8f15d1d2da6f457a52af3deee161d3d9c031525eff48d2aeb294b6745e3ada079026f727db06baaca943d0711aeedb8df5bcd37c3f13286";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/dsb/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/dsb/thunderbird-45.7.1.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "989afa417e7819de693327caf9c13a8e2704aef0627795807c715e0c4a2bde9f2a5c67ea13d0a541cee79d74643cec58c07d1a8121ebc86ecf1c4b121c10f777";
+      sha512 = "4d1e7a0bf3f55d913aaa47c37ed5529c59240168f2a53faa4367d3c47e900e136d25446b2b4e465d05b3857fdf3671e9bc7f98be6fe7b42c1ec926d0216d6022";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/el/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/el/thunderbird-45.7.1.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "20679e832ded809351203c788ec4e87a303ee6dfeb56b5bdeb6745a59d8ec3980e42356126ee20abdba35143fe7f7e24112aa6ddd9059c7fa9b1919b730c4f06";
+      sha512 = "145bf4a0db9b2fd3b16637fed966d6c0f0d184eeb7ce373024609b869219720f73feb0c10b13c761a4214a88d68ceeee234ac50694ac16599a92e2fe6ea61e4a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/en-GB/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/en-GB/thunderbird-45.7.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "44b92fd4895d25e43e4875f2f654886f2bfbe1d97643eec7da098bff9046ce61a2423a55557911dc1c02bbb49e44d907b31adcb3743804ef358ce38d86691b0d";
+      sha512 = "1d3deeccfbba4a871a54eb4ad6077be1cf2e6fc7adb0ad0c04b3638db3b7fb3cbf66b55737befaef034d0b1671e9a53bdadc8d9ee7b3b9eb33a7c64e53ce5b2e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/en-US/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/en-US/thunderbird-45.7.1.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "3aad942932385264efd5eec81aeda2bae552b281f89416a6228f9f3b6f7f58e927fdf46d8da0064e51a792d2e4deefecc17717422ee911691a2305d72fa8f913";
+      sha512 = "b1340885d6c92da79ad99f9f491ca1f15429aca73759d4e5055c212f33af96f7a7d4446eec6bc37ffcff4371213051188d7211c021da50f25b85fcf445ca58dc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/es-AR/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/es-AR/thunderbird-45.7.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "28bb08df80f60ea268b4d8706a61cc6ead17c059d2d05d3017e6199a4c5c73bbb63c3159d9f35656749b6c1990a4938ebb6b10c1d016504b3346fbf9b18b6182";
+      sha512 = "307473247bbcf0064380b4d9f9bb12ea796c32dfc012af2d4246466aab880dc040a92f06e0917acdf2f930a9df0cc0fce39b17e4ff710ea2311f4b2250b90f53";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/es-ES/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/es-ES/thunderbird-45.7.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "dff7c77e94b7ad138b153e9a83934da72a2f57db5c1a6404a0c47fc26c2ae241b5c65ac56f499e54f8cf488a9fc9d144194326afb710f959bafdd4b9c56a7348";
+      sha512 = "3245ee600a95e1f59e8e7aabb521be96d88c1e59ae5cd29cc78825ed2c8c2abd1135dce1c2272d1eef2716717719947ca4b223359e1c56df406569b55226de61";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/et/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/et/thunderbird-45.7.1.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "a3ec79f99783b5ae9ce6b3d690f959bbb80f0a41396bde676f9b1bf8a68e39200525a35c8932123906dfbd84df4b6de19e0a9f27c2d3883b2a3c71c1349e5969";
+      sha512 = "b1cd90842d3888e555799cef84bd2e8d3eeb0c73abd4af9bab2a9db2b24ee90770f39d1376e63df567f8ab63778f6cde305ea8ba2a070aad36d6809a676a2344";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/eu/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/eu/thunderbird-45.7.1.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "90255f58a358fa9e9b27d36b1b9b954d753ef584118f84405bf4b4d1dde4cf2a19c3dda91b30551f03b1d07c2f96c00f8ba72726fb2f4c325f7db82387fd45c2";
+      sha512 = "6278435a0f46cbd40514780beacda014c8528a79bb5d9be1366b0dd46dc71aa1f7a387311511e8d04cea3e78dd84157b97307df5bb69797b6d39cd299be18a33";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/fi/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/fi/thunderbird-45.7.1.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "d19f0a819a3b5b04038cfaf7adf3ec4da337789ad5fd809b27447427838140fffb35a5bab8a0e018d65fa467935fe691a578ce044eb57d746b4df48f879ac8c9";
+      sha512 = "000fbb4519ed626af2dfaec3d588f4ce567212b8a01c4aeae34b1f9e8ec6086ad45b90b57412fe830b8e236606d686e05c807e60bc2078df1364fd9f58d06d0e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/fr/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/fr/thunderbird-45.7.1.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "0e9204299add1f7ca774b59eae56d8a04c3a575894f9824d7d60c19769e2bd596def6537dd07cdc7e025ce2cf0220577864dd1f0701c2fdfb39c22e87ac03e83";
+      sha512 = "5120e880f297f8899ee6067660d65cf1ffd66d3ae6c16a888ab5e5e1b32f48a58aefef9a7023b1a8860987a5ca6399d69fd6df8e12838c00c305c3854c18582f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/fy-NL/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/fy-NL/thunderbird-45.7.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "d62bb3d3fab33aa5556d80ae7331771f8ae8efd389d301c98aab57debb6aec0765bca89bf254819e3b7bcdda392a12f27771e344b486027cb8faa5fc051f5a05";
+      sha512 = "2e3b2a7cdcd4e5bcae6e46f86c5a4956f164ec37f4cb657ac18c1233c5b36b8c0f041e6930ea15adbcd8269662f9315e2822a9ed43be38a5fae8b7c747812035";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/ga-IE/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ga-IE/thunderbird-45.7.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "30248eb96c52255c476dc43aa5232a1185143d5fc56a246fd8d1219c573a63eee1a583d96d470b8bcfdfa1e48f6fa8e49c10c990ee75936078dc5ba2612af533";
+      sha512 = "b4567af9057eaffe812feb43fa195474094fe1c0d804eb79a9dc936b93662cdfafd1c1f4bba51adda57abed677473fe2bd5e5ce9523659c931035b617a1e3ad7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/gd/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/gd/thunderbird-45.7.1.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "853cd5f940c155aaabea87b2436282ee9e60de0744aa28426ebe7d5d3a2cda653c88c9fd5c1cb335fe5e4447b8b4eee79674dc5bb18a113e665906e13a5faadf";
+      sha512 = "1200cfb333861d2bd5013cfa5c764f202b7a2febadff5f4c8c0bc648f744af19362b07147e720c06046d4ceae7fac186c5bc33c1b637104241493f960a5c307c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/gl/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/gl/thunderbird-45.7.1.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "3505a993c4f0062be5108096c104e8d2c34bbd677036f3facbc9e71cdff66dcdfcf720b02065e03e18030f81c3571d8d971febdbc8e593ea7cb3b52d5cdfa969";
+      sha512 = "10ec0d042e14c80d65af5ce7a271844553e4bfb96f349a16d94c5caed3c33fa35fb2065ec99b2ae1dfb7b1e47059f6f3ce730d6d293efdd380862fe18b03c877";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/he/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/he/thunderbird-45.7.1.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "183c71c1b5745d27d6e5a2a9f6131e5a8da942fac1e3c4b1111973d0c22441a264119a088c7f3fa525dda31c40177c6017b7e67f9e518f851c41a16180b88533";
+      sha512 = "7d7edbf3fd840fcf80c3d3491fcf9cbeed923b597840bdc16e7e43097cd5843554030e2690ff178f10ad97b0f447760bd06da87b4cae545dfb32c3b0f4668b68";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/hr/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/hr/thunderbird-45.7.1.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "485aa2be69afc9fc9576ef03b19d33423c15667096b57c5b6b47ab303d0ea5376c1a01a1d92a4c679874bff109a6206c585adcc6f6ed954ce17343722d4ba7ab";
+      sha512 = "28a2e3e0dcabecced0a9b66a5e11434fcbabe11257508eb481513e56a82d13c5bf36e79d8174fcd0080b0b310df4ada6f92f3d24fb67658d40db66823d18e0a6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/hsb/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/hsb/thunderbird-45.7.1.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "8bf706f4b5662e5febd4a23cd939af570e75fcee4f0af2304b7239349eb4ee40a361eaf5cb02d103db4cb80c5962d9a549b282d0692dfb335dd1d0206ef9d604";
+      sha512 = "760c99978bc2a326fa5e5d8f9b4a6fc9420a8a3c95251b42dc3db26bb399942a5fdd08f3eff3eaea9f3bc96ca85b0523abdae3f72b7400f8bed136e906a8e79f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/hu/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/hu/thunderbird-45.7.1.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "de6aa8dc185ba3fed516fa478dc9c66211f26bde7e21d6b2b86b19ad58e192ca4540bc0847fbd5d24c4f32602f05577cffd2c3046f5282afbe55432d2ef16bd2";
+      sha512 = "4118ae0a62d7c8c6e68f7468040361091f98197c8135ba88ba9165ff3c807ae3ec8ac7e587224e9f45cb49290abe7c85aa11518714440db0f797f426fb73b5d5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/hy-AM/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/hy-AM/thunderbird-45.7.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "2c9138c07246475d7fd9be05f631126f0051b2cb7ad688d6d4bc02254d5b9fce3eaebea7b8ff8df6e82d45211ca0279a03b8616d776dc30bc0a30f867ff01214";
+      sha512 = "664dade424cdca68158c98e531dc0b46ee5482f728b4f172684061da029c7dac76d80bcaa4c0228ff929a19e6bf11fd08890b3ed71fa6e23f442dba174de84da";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/id/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/id/thunderbird-45.7.1.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "2bed57e5998da429c80e2e04a4250c58bcdc17214a94a80d1d03bdefcbf7567bd65ac3ceb46f7b9d59ac37eec0bfe31f4050f02894be6828c2fc96488e4290f2";
+      sha512 = "58e48787ec26d8cfaa7be233055d95982d073ae8a1a01e4556d239e18598939ab6077f0aaa4b14051c6460730f89c1710a6dbb54ce5aaaa75967418f324073ab";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/is/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/is/thunderbird-45.7.1.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "ba2e12db8b2ef82971762bb13e802bdf1e65252843687b40dee0455e6de46083220904cdf51c492ccdb13c7390b8692e5d4db7e4f170c88b545ee17e50710083";
+      sha512 = "77e95822a92855c41ed557574ab3f0e464d8be21146139a1cbff243ae76b035ae0912e92c07513d4c5fc9d522a2da1a738dc7ab790f9327ecc6d94c0d577a124";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/it/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/it/thunderbird-45.7.1.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "e1fbedc1c8eb67cb0528ffc8c103cf0606a43240471e920fdc3cec4c3cd0ac357878992ee67a2eff90f8abf5c6654a27f17dc37c69d0d828d3e9c3fd0345e34a";
+      sha512 = "835a2059b02ffd019fefa2988bc2f05f456e5fc8b05badc7f5477a6958ba8fac1bc3539cc66ce6eca73fe86b4c70a172b609fa365e83593ff97405e9bbb533cd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/ja/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ja/thunderbird-45.7.1.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "2741dcc26e73c0ef5fee48b84b02c336310aa15004d4b7cc2781e80f045dd5ba5b21aacc9c90e223c22c4491914810c6df9435d025ea76929605fc6462f6713e";
+      sha512 = "11b6f0d2326bb89a6cf6d8452d2312eb8f7af616a0fcd43dd2b2263f52397c1c0a0a3ad7ceb67dd09b81a624adb95ed8a905bd7c9dba5f1d2a94114776257ff6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/ko/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ko/thunderbird-45.7.1.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "5236c168604748c2a3edb8f0ffeedaa51792fceb61e4b5439932324c8bf94304ff65598655f2c6f66260c253563a381cf99ab5c07dce89a3728afef346e48e66";
+      sha512 = "69f804d87a17072803b6e081dedcea57d633036299eaee9599b7df83604dd599234236b5b5b647da25c066633ee481e196fe9b219bc3da29d07b6dd55fdbf4f1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/lt/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/lt/thunderbird-45.7.1.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "2c919f8835753afcf6f9d7cb027c1df8e00f6d197a0fe26e3de7222bed2a54028843974cf2b0ec2d88a29e22e6ad84192b1ecc3057528647db8b7e9eb29f040c";
+      sha512 = "4534bc70c43b108e59d7e7c15cb53e32f54c20e0ad21a5c0e1d309b3fec32db870ab8cb268d59b8964c526c28382cd89753ccc978e34d0aedd5c87eeeb525a5e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/nb-NO/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/nb-NO/thunderbird-45.7.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "dbc4609240a5cf5e6db64360b386da196039fb6d7ac4517b8f5de5466dca830a06b284db2f7db7d4352f5cffe2122277e90b37b2a2533dd9a3a3ec1691c8824f";
+      sha512 = "13d4f6b638d6005ec854cac82b16c02dc347d0cd1eb804a056c106fb1031c11982973abbfbd319f4925264a1095cce8bede670f68c2efc9bd4be49ceb6b2f2a3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/nl/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/nl/thunderbird-45.7.1.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "b7f0517d2eda98ab6d6de52513eb7493231eb1e319862256798280c1fc924af8a0f3330bf8aac01916b54d54b2b5c7427897a6b2516229e4387a77424a349f4c";
+      sha512 = "b6e49ff5a473dee02bb749481924fdbb345be2d532119dde93f80396a29da726b0450e2f2ee522454c8dcef74b09dfcb57474264873b873beeaa6edc81853fb2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/nn-NO/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/nn-NO/thunderbird-45.7.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "cf3ffbc00fb2553bf87da5f0efbd5d115d717de04a047f0cbdc17bb500dc05880495b3242c5d75801374418d1aa6f173303cad7f9325558cd6da6c67d42b675c";
+      sha512 = "3992cb6ca869e9470bb30042ba3c8d1710511a2170504a5a65cafa4a9091492903509ddd366c29f5e9e7ada9ac657416972002a297a57550a418031a7ed6ee0f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/pa-IN/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/pa-IN/thunderbird-45.7.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "70d224c9145cf6225335cdbbfd137d73131651fa22cc326657c0e75c3c1c4a73730c4193d575da5c7881bb607ddfebd74ce428a1425e12b60e5dfeac661bad02";
+      sha512 = "6aca05743fe7383490cd94281fe1d0c64451832e128b8b3da5d2643bf59f05cdcfe2130ba5218f7e314ac7c55b126ad62d4d24f987b215bfe767a17d6a8eeeed";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/pl/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/pl/thunderbird-45.7.1.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "664c04d5650c24ae6c2422b41dbaf737fe83b8cd142a869b5ce4042688bc3c4da26fea9bd034a9ab978cd8404cabc90822c3ba23983fb75bfd0118570b0eb9d5";
+      sha512 = "0b8969b08e11792c547d666843799459e27d3732f4e56ab64d7624df4360e6cf65fc2cce538ffd0a287f239cf6c57ebe7aad68bd397c0f56a85dcc499f35e4a5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/pt-BR/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/pt-BR/thunderbird-45.7.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "a25f39972af8ce6181ca703b7f35307e74c436a476e1a3482d770aca41275b98373ad8279ba0095c68b5518c525d0813a3d215712d65aef661af8cef5d97ae52";
+      sha512 = "4a921106175214b7fd029e27e19f4442a50076d08c2bf6f6ad4b27c1c37730d2f90ac4bd058363395777d336e5170bdd48276f71b0d253375d32daac9af66412";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/pt-PT/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/pt-PT/thunderbird-45.7.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "4fab35699dc609be69a1d613b5996d412b6c79c2b79f04466ea862713509abee1f12e1188371374027a37df953dda810d44dc066c9cfad2737bd5dd433beb522";
+      sha512 = "f64a4396570349d2f520f8eeca157a012e028cba1e3cf592f5e11807997b4501a2af829dd4920ffac5fee8c50bd691d037aa86bbe9396305352ed4710e854e25";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/rm/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/rm/thunderbird-45.7.1.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "4167aabf7a012824637ecc1e356b983e79a91c02d5079bb2d99546c99fdd3e7631323420d78d4b8fda596d8a9bec82ebb02d0a8092af5c71ff3b7536ecb77df8";
+      sha512 = "540d6db390cbe93dbb607f84286e445da5234b01c55846f3d3a91cc61d30d1d32f0216fbfefc0ab0d7a60c5369a63aaab385c73362adf1a0595db57282dad01e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/ro/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ro/thunderbird-45.7.1.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "b642339e49fc0c06481d9fcfdbcc1234ec2313ffbe0c6825d34ae1447b128afe1c20c5c983a565be1a42d740a9989548b59c9fbb737e952d7aca0804d41be75e";
+      sha512 = "37cede489bb3082efa853f310dec5293baa411abcf15e9f193a760768cfc2b9f7be952bb6225bf901a0097bc19e77d9133c0e6dfed880c6e33cef250e80ff0f1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/ru/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ru/thunderbird-45.7.1.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "08e4b72edc6a4625639e313acfa6caddd0d82630930d32eb6c01f3e4a5fcb5e62836856c4f8e27e1855a14eacf66fe84078bb7445a8f809dbe31c41b86818a26";
+      sha512 = "b091376e3937712f5f92ac789dbe39b90e1b486b4409325341dadb06d4a4a3ff4fa9438d8da2fb5b7923beab4ec6b568d6be309cd22a68c277c822614205734d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/si/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/si/thunderbird-45.7.1.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "1464769f4b50a7cf2eb8b51a6040bb623a5d7942665943ac16f3659139724253ba8b75cf6987c3e67e7d88c7a7d680aa34800672fdcfaf6c130e3690316fcba4";
+      sha512 = "bb53ecebf56785d7ede52b7a0afed0a01e6248d537ccd8bcd236a837fed86b3f390cf9493f1c2d6d6d58c0d349cd6cfef2a59996fd7766ee77f25dc1af75faca";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/sk/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/sk/thunderbird-45.7.1.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "63b2cdbde995f2977e2047a9d0966358d10ad717e16ec1e7b013973203dea5cfa48cd3677407a21d89783496babee62c912887591b09701be95295f67878448d";
+      sha512 = "c13c32cf17b0291bf049c2790fce2066e8b07aa2f30fb7bbecaf8cb88b4660bbf07506cb04e5aa8b756a35371d25c5a793b54d0134a81027946d35109e7714a9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/sl/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/sl/thunderbird-45.7.1.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "82d43393eb873c96334ee994d07f9fe4873efeda9dc326a1398ddfcbd02a83c2b20c1d78c0e1f88f5c1a4c4b4008c94eff07912696cffb2cd7d5340cfef7d5b2";
+      sha512 = "be0d2a0e501f074329b815f61c1ce04337499c7a88f58e3526e762b47c82ccd975c22063a363a338e22bfc12ad3403107751f66376b1d269101b660e391e7437";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/sq/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/sq/thunderbird-45.7.1.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "5fb9aae5dd7e39e60ca17c4ba12c418f0ef75952f35537ae3ff4b1f57914f9ddcc5e8c8dbfcbad2c4a29911a6e48b6e96514759112170bb377b7883484f7a83b";
+      sha512 = "1aadc162591de3467af622c3e1fc7655885d7831d2faa470a5f53b2fb12a42dfbd44f3a942dc4089a28235942ba0e46749810a88adbb396e1417f7ed0fc07586";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/sr/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/sr/thunderbird-45.7.1.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "b1fa8938971d0736da1e297fb8a431750e8a1681250015aa249d3e6a1b797933c47e3ab43516cdc199ac4213b4e3505b8ce68264ed342a53bba7e4d86ef64e6b";
+      sha512 = "aab1299fb2e2b022bfaaa6403461bd2f5ed70d5fea77ea29936fea465984cc57bfa1ed5be1e8968138e757118d1caa3eb664388fddb04d0008abe932035c818e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/sv-SE/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/sv-SE/thunderbird-45.7.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "ed008ecc0355faf21e79121c9987823220b9ff796df22ab59ccf79dbfc336d998df51f13500a9a189fd40900a9fec52cb53be0811e391a48d4149f021bfffd77";
+      sha512 = "11ce9c1b444adb242e826d4e1e8ab88e2272ac6b77f68f9d2a860c75e421c7b69f1841d0a4fef0b9b4d3a636678f0d57d5abb985f5fda6b5afd6cfb319f39b14";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/ta-LK/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ta-LK/thunderbird-45.7.1.tar.bz2";
       locale = "ta-LK";
       arch = "linux-i686";
-      sha512 = "4bd8c5a05706f88b2678331e8096d0b04d2717bfc9e6f22d6abf00881fcea46c4de50bf435d51a1022c9217ce837668439d152d0dd257ac2e77fdea44421810f";
+      sha512 = "e46dff7831a6805917d2982347e4899aea9c726bcbf1e0b081c8ead225d585df1d0e9c485729d28483fd7ea8e0e5a47598fa9146f0138ed8ed65162c8191a381";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/tr/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/tr/thunderbird-45.7.1.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "0f3aa7228a605df6e2f5fcaddfb95009ea6b9084791d876ed1fca148ba11b08646ea1265bb1d6771e681f5b33317ea43381ef271842d263e7c387942447a3748";
+      sha512 = "158e4d49beae2af88c9aeddf5933e58a73541d0acc960d3965159662dd18ec876fd9a598b7bdba31261f8eeccf1595eb5e66ace3656658b3557c1482b7a4263f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/uk/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/uk/thunderbird-45.7.1.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "825ff1066f1b533ac5091fa74a050fdc760145f378126b2b7cb63b9bf3e58936372d475fa5b2b900cb79ea99f553a4228182c09c1483ded6f2256a831966d37e";
+      sha512 = "0d298daa6b416b60b696d57ae7508f56749f1fdc7f8d4ca3514fc106b91567fcc3bf41881cce398d431c0aa0b6bb9d5913d25abcded8e68628fe54fae3cbec25";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/vi/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/vi/thunderbird-45.7.1.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "b8fdfe8463c99695219a59f2951363685249a6ced9ecb38b7e25455b4102baf334e69437b15bdcb06ca36575367b13cd3331d7ac5e0349d8fdcb4350b70cc680";
+      sha512 = "f3e21ff0bf5b0b57bf6a3d1564ec0194c4c4b8987e0db89c84662e091131601526cd1b109e113fa8738d6b16d61220df1ef6c09acfd46c154de7e86dd9aa744b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/zh-CN/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/zh-CN/thunderbird-45.7.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "f41c99d2a972210e0999fd6a509ffed9fa34edee23f7925c8dccdd5f492aef7c15fb3fc995ea549d095746302852e3957b9da01346277a2ed6b3efafa1a2acb1";
+      sha512 = "ad624ccf882b3703de853d67b9fb2d53fa4a69a20353638dc108750b35b486f2333307e7fb947e39a76f32cc204459347fe9c52e5c6c60c8b9210d9f7ca68632";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.0/linux-i686/zh-TW/thunderbird-45.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/zh-TW/thunderbird-45.7.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "d903664c9cefe044e0871b527d0a2f45812312c99f541832887abdef46d6c741085f807bf09a9e6f83d24992377ced5a84534a33f933025dd6bde11a7aa8cde3";
+      sha512 = "877e9fbfd4421fecb01d94142ae753c7b90b7a1430a01dfdfbf916e4505a1b647fc3f75d896558437e7d5c4ae3a0aefe0892881f4bec7ce9ab672d7b44c337b3";
     }
     ];
 }
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 170a5f4374f..52775ce9781 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -14,7 +14,7 @@
   enableOfficialBranding ? false
 }:
 
-let version = "45.7.0"; in
+let version = "45.7.1"; in
 let verName = "${version}"; in
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://mozilla/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.xz";
-    sha512 = "99cea54b553158c1e08cf19157ac2bb6822fd1fef0501d36f983e6b8d4f2143a2e6124d61297446944033d3fed9326fe0f12ca45db0b5815be71a0777e73ffb0";
+    sha512 = "aa1231169cfe243a257e6b9088281b85d0cf75207e3b9ebeda7792567a86f6098fb5c74dc397e3eeeb1925d221d2fb1b17df8762afd115eff9ad4d1370a49e56";
   };
 
   patches = [ ./gcc6.patch ];

From b09215bed57a434810b7772201f594420dbac379 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 7 Feb 2017 16:58:14 -0800
Subject: [PATCH 580/899] rakudo-star: 2016.07 -> 2017.01

---
 pkgs/development/interpreters/rakudo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index 210570ad846..83e8f1d0030 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "rakudo-star-${version}";
-  version = "2016.07";
+  version = "2017.01";
 
   src = fetchurl {
     url    = "http://rakudo.org/downloads/star/${name}.tar.gz";
-    sha256 = "0czx7w1chf108mpyps7k7nqq8cbsy1rbb87ajms9xj65l4ywg8ka";
+    sha256 = "07zjqdzxm30pmjqwlnr669d75bsbimy09sk0dvgm0pnn3zr92fjq";
   };
 
   buildInputs = [ icu zlib gmp readline perl ]
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
     homepage    = "http://www.rakudo.org";
     license     = licenses.artistic2;
     platforms   = platforms.unix;
-    maintainers = [ maintainers.thoughtpolice maintainers.vrthra ];
+    maintainers = with maintainers; [ thoughtpolice vrthra ];
   };
 }

From bac5a018a0c1106e1a7ada50fc94d00a4336dc1b Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 7 Feb 2017 17:11:13 -0800
Subject: [PATCH 581/899] libsixel: 1.6.1 -> 1.7.3

---
 pkgs/development/libraries/libsixel/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix
index b57247b8fa2..9d4b62eb97a 100644
--- a/pkgs/development/libraries/libsixel/default.nix
+++ b/pkgs/development/libraries/libsixel/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchFromGitHub}:
 stdenv.mkDerivation rec {
-  version = "1.6.1";
+  version = "1.7.3";
   name = "libsixel-${version}";
 
   src = fetchFromGitHub {
     repo = "libsixel";
-    rev = "ef4374f80385edc48e0844cf324d7ef757688e44";
+    rev = "v${version}";
     owner = "saitoha";
-    sha256 = "08m5q2ppk235bzbwff1wg874vr1bh4080qdj26l39v8lw1xzlqcp";
+    sha256 = "1hzmypzzigmxl07vgc52wp4dgxkhya3gfk4yzaaxc8s630r6ixs8";
   };
 
   meta = with stdenv.lib; {

From 7b169579c411697ffdc86df5b96c231cb3b7553b Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Fri, 25 Nov 2016 18:37:15 -0400
Subject: [PATCH 582/899] glew: 1.13.0 -> 2.0.0

---
 pkgs/development/libraries/glew/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix
index 89bd7e918fd..02c87cf709a 100644
--- a/pkgs/development/libraries/glew/default.nix
+++ b/pkgs/development/libraries/glew/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "glew-1.13.0";
+  name = "glew-2.0.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/glew/${name}.tgz";
-    sha256 = "1iwb2a6wfhkzv6fa7zx2gz1lkwa0iwnd9ka1im5vdc44xm4dq9da";
+    sha256 = "0r37fg2s1f0jrvwh6c8cz5x6v4wqmhq42qm15cs9qs349q5c6wn5";
   };
 
   outputs = [ "bin" "out" "dev" "doc" ];
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     mkdir -pv $out/share/doc/glew
     mkdir -p $out/lib/pkgconfig
     cp glew*.pc $out/lib/pkgconfig
-    cp -r README.txt LICENSE.txt doc $out/share/doc/glew
+    cp -r README.md LICENSE.txt doc $out/share/doc/glew
     rm $out/lib/*.a
   '';
 

From 01ca916411fca7947be55f549ea644c9d0688e9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 8 Feb 2017 06:11:04 +0100
Subject: [PATCH 583/899] haskell: distribute
 servant-{elm,docs,auth,auth-server} and logging-effect

---
 .../haskell-modules/configuration-hackage2nix.yaml          | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 0de3fc58a74..634648b9175 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2035,6 +2035,7 @@ extra-packages:
   - persistent-template == 2.1.*        # needed for git-annex
   - primitive == 0.5.1.*                # required to build alex with GHC 6.12.3
   - QuickCheck < 2                      # required by test-framework-quickcheck and its users
+  - servant-auth-server < 0.2.2.0       # https://github.com/plow-technologies/servant-auth/issues/25
   - seqid < 0.2                         # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
   - seqid-streams < 0.2                 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
   - split < 0.2                         # newer versions don't work with GHC 6.12.3
@@ -5436,7 +5437,6 @@ dont-distribute-packages:
   log:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   logentries:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   logger:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  logging-effect:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   logging-facade-journald:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   logic-classes:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Logic:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6785,14 +6785,10 @@ dont-distribute-packages:
   servant-auth-client:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-docs:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-hmac:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-auth-server:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-token-api:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-token:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-auth:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-csharp:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-db-postgresql:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-docs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-elm:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-github-webhook:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-haxl-client:                          [ i686-linux, x86_64-linux, x86_64-darwin ]

From 187e5d3d745117dd5016e2b7cd796dd78ec7b41b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 8 Feb 2017 11:44:13 +0100
Subject: [PATCH 584/899] taskwarrior: patch bug in bash-completion file

The patch was submitted upstream, too.
---
 ...etion-quote-pattern-argument-to-grep.patch | 28 +++++++++++++++++++
 .../applications/misc/taskwarrior/default.nix |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/misc/taskwarrior/0001-bash-completion-quote-pattern-argument-to-grep.patch

diff --git a/pkgs/applications/misc/taskwarrior/0001-bash-completion-quote-pattern-argument-to-grep.patch b/pkgs/applications/misc/taskwarrior/0001-bash-completion-quote-pattern-argument-to-grep.patch
new file mode 100644
index 00000000000..8e5c0139e55
--- /dev/null
+++ b/pkgs/applications/misc/taskwarrior/0001-bash-completion-quote-pattern-argument-to-grep.patch
@@ -0,0 +1,28 @@
+From 0d677475b710b9bb61d4b3ac5435c36b47d3a155 Mon Sep 17 00:00:00 2001
+From: Peter Simons <simons@cryp.to>
+Date: Wed, 8 Feb 2017 11:28:42 +0100
+Subject: [PATCH] bash-completion: quote pattern argument to grep
+
+Without the quotes, bash might expand that pattern based on the contents of the
+current working directory or -- if nullglob is set -- the argument disappears
+outright if no directory entry matches.
+---
+ scripts/bash/task.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/bash/task.sh b/scripts/bash/task.sh
+index e0c7fb03..d15ed3eb 100644
+--- a/scripts/bash/task.sh
++++ b/scripts/bash/task.sh
+@@ -72,7 +72,7 @@ _task_offer_contexts() {
+     COMPREPLY=( $(compgen -W "$($taskcommand _context) define delete list none show" -- $cur) )
+ }
+ 
+-_task_context_alias=$($taskcommand show | grep alias.*context | cut -d' ' -f1 | cut -d. -f2)
++_task_context_alias=$($taskcommand show | grep "alias.*context" | cut -d' ' -f1 | cut -d. -f2)
+ 
+ _task()
+ {
+-- 
+2.11.1
+
diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix
index eea7ffdcaf2..0d8513cd12b 100644
--- a/pkgs/applications/misc/taskwarrior/default.nix
+++ b/pkgs/applications/misc/taskwarrior/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "059a9yc58wcicc6xxsjh1ph7k2yrag0spsahp1wqmsq6h7jwwyyq";
   };
 
+  patches = [ ./0001-bash-completion-quote-pattern-argument-to-grep.patch ];
+
   nativeBuildInputs = [ cmake libuuid gnutls ];
 
   postInstall = ''

From 01fef3f7db4cc208faea31f26c9451b326058781 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 8 Feb 2017 11:44:46 +0100
Subject: [PATCH 585/899] taskwarrior: improve meta.description (taskwarrior
 has nothing to do with GTD)

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

diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix
index 0d8513cd12b..e4938b928da 100644
--- a/pkgs/applications/misc/taskwarrior/default.nix
+++ b/pkgs/applications/misc/taskwarrior/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "GTD (getting things done) implementation";
+    description = "Highly flexible command-line tool to manage TODO lists";
     homepage = http://taskwarrior.org;
     license = licenses.mit;
     maintainers = with maintainers; [ marcweber jgeerds ];

From 9d30099b7f6b7f5bef6abd6dc240ada3a666112c Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Mon, 6 Feb 2017 20:47:25 +0100
Subject: [PATCH 586/899] nixos/systemd: set r-x group permissions on
 /var/log/journal

This allows services such as systemd-journal-gateway to access the
systemd journal.

Closes #22288
---
 nixos/modules/system/boot/systemd.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 0ed3c083f7c..56e21e82439 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -753,7 +753,8 @@ in
 
         # Keep a persistent journal. Note that systemd-tmpfiles will
         # set proper ownership/permissions.
-        mkdir -m 0700 -p /var/log/journal
+        # FIXME: revert to 0700 with systemd v233.
+        mkdir -m 0750 -p /var/log/journal
       '';
 
     users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network;

From afd59811a1f4b2037d77293064a4fee0ac91af6f Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 8 Feb 2017 08:27:59 -0500
Subject: [PATCH 587/899] gstreamer-*: 1.10.2 -> 1.10.3 for multiple CVEs

gst-plugins-bad:
From the Arch Linux advisory:
 - CVE-2017-5843 (arbitrary code execution): A double-free issue has
 been found in gstreamer before 1.10.3, in
 gst_mxf_demux_update_essence_tracks.

- CVE-2017-5848 (denial of service): An out-of-bounds read has been
  found in gstreamer before 1.10.3, in gst_ps_demux_parse_psm.
More: https://lwn.net/Vulnerabilities/713772/

gst-plugins-base:
From the Arch Linux advisory:

- CVE-2017-5837 (denial of service): A floating point exception issue
  has been found in gstreamer before 1.10.3, in
  gst_riff_create_audio_caps.

- CVE-2017-5839 (denial of service): An endless recursion issue
  leading to stack overflow has been found in gstreamer before 1.10.3,
  in gst_riff_create_audio_caps.

- CVE-2017-5842 (arbitrary code execution): An off-by-one write has
  been found in gstreamer before 1.10.3, in
  html_context_handle_element.

- CVE-2017-5844 (denial of service): A floating point exception issue
  has been found in gstreamer before 1.10.3, in
  gst_riff_create_audio_caps.
More: https://lwn.net/Vulnerabilities/713773/

gst-plugins-good:
From the Arch Linux advisory:

- CVE-2016-10198 (denial of service): An invalid memory read flaw has
  been found in gstreamer before 1.10.3, in
  gst_aac_parse_sink_setcaps.

- CVE-2016-10199 (denial of service): An out of bounds read has been
  found in gstreamer before 1.10.3, in qtdemux_tag_add_str_full.

- CVE-2017-5840 (denial of service): An out-of-bounds read has been
  found in gstreamer before 1.10.3, in qtdemux_parse_samples.

- CVE-2017-5841 (denial of service): An out-of-bounds read has been
  found in gstreamer before 1.10.3, in gst_avi_demux_parse_ncdt.

- CVE-2017-5845 (denial of service): An out-of-bounds read has been
  found in gstreamer before 1.10.3, in gst_avi_demux_parse_ncdt.
More: https://lwn.net/Vulnerabilities/713774/

gst-plugins-ugly:
From the Arch Linux advisory:

- CVE-2017-5846 (denial of service): An out-of-bounds read has been
  found in gstreamer before 1.10.3, in
  gst_asf_demux_process_ext_stream_props.

- CVE-2017-5847 (denial of service): An out-of-bounds read has been
  found in gstreamer before 1.10.3, in
  gst_asf_demux_process_ext_content_desc.
More: https://lwn.net/Vulnerabilities/713775/

gstreamer:
From the Arch Linux advisory:

An out of bounds read has been found in gstreamer before 1.10.3, in
gst_date_time_new_from_iso8601_string.
More: https://lwn.net/Vulnerabilities/713776/
---
 pkgs/development/libraries/gstreamer/bad/default.nix      | 4 ++--
 pkgs/development/libraries/gstreamer/base/default.nix     | 4 ++--
 pkgs/development/libraries/gstreamer/core/default.nix     | 4 ++--
 pkgs/development/libraries/gstreamer/ges/default.nix      | 4 ++--
 pkgs/development/libraries/gstreamer/good/default.nix     | 4 ++--
 pkgs/development/libraries/gstreamer/libav/default.nix    | 4 ++--
 pkgs/development/libraries/gstreamer/python/default.nix   | 4 ++--
 pkgs/development/libraries/gstreamer/ugly/default.nix     | 4 ++--
 pkgs/development/libraries/gstreamer/vaapi/default.nix    | 4 ++--
 pkgs/development/libraries/gstreamer/validate/default.nix | 4 ++--
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 7479c153af2..f0e88551169 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -14,7 +14,7 @@ let
   inherit (stdenv.lib) optional optionalString;
 in
 stdenv.mkDerivation rec {
-  name = "gst-plugins-bad-1.10.2";
+  name = "gst-plugins-bad-1.10.3";
 
   meta = with stdenv.lib; {
     description = "Gstreamer Bad Plugins";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
-    sha256 = "0fisnnfpp3s8pbm6hjrfi4wjpq2da8c6w3ns9pjcg7590f9wm587";
+    sha256 = "1rwla1p57yzygb68z2xk5l5kvqzj5w3nxq0davkwk139zd8r6294";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index c3e8f3c65a1..ecb431091ad 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-base-1.10.2";
+  name = "gst-plugins-base-1.10.3";
 
   meta = {
     description = "Base plugins and helper libraries";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz";
-    sha256 = "086yjwmp4fykcqkj6zqhwrk2z49981kl8x545vz2wvblrc7x9h7v";
+    sha256 = "040pifl4cgsqqz2si4s1y5khj3zwm39w21siagxwp805swbrcag6";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 8b27fa7ad3b..72a519ab34f 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gstreamer-1.10.2";
+  name = "gstreamer-1.10.3";
 
   meta = {
     description = "Open source multimedia framework";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gstreamer/${name}.tar.xz";
-    sha256 = "0rcd4ya4k99x6ngm9v78as7ql0rqibkwshc13lb4rjdszs0qw3hm";
+    sha256 = "0gdnxg5igbhnpjhrzp31w1ww95j805byqd6mj3x29wli54dxrfc5";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index a45c190b020..ab3a0c00e03 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gstreamer-editing-services-1.10.2";
+  name = "gstreamer-editing-services-1.10.3";
 
   meta = with stdenv.lib; {
     description = "Library for creation of audio/video non-linear editors";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz";
-    sha256 = "0hx7bwj8li88qq09slvdxlnfq76hr35nyjvd4ixrz5gmkpmrl5fv";
+    sha256 = "0ax3qbi1m4wcii03ysln3lm8nhw3fr2rd35ndfy4mr4vg2nm5gxw";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index fbf67fb34f5..c0d017fcaea 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -10,7 +10,7 @@ let
   inherit (stdenv.lib) optionals optionalString;
 in
 stdenv.mkDerivation rec {
-  name = "gst-plugins-good-1.10.2";
+  name = "gst-plugins-good-1.10.3";
 
   meta = with stdenv.lib; {
     description = "Gstreamer Good Plugins";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz";
-    sha256 = "04rksbhjj2yz32g523cfabwqn2s3byd94dpbxghxr0p9ridk53qr";
+    sha256 = "0mar8ss8bvpz699ql4kgndvna8qsv7kj372py4435ffl6hzfj1sf";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index 447b679898a..32000bb89a0 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -9,7 +9,7 @@
 assert withSystemLibav -> libav != null;
 
 stdenv.mkDerivation rec {
-  name = "gst-libav-1.10.2";
+  name = "gst-libav-1.10.3";
 
   meta = {
     homepage = "http://gstreamer.freedesktop.org";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-libav/${name}.tar.xz";
-    sha256 = "0g778j7w4vpbhwjzyrzpajvr26nxm6vqby84v8g1w1hz44v71pd3";
+    sha256 = "1aajayv63ardkbmcg7pnh2d87r067325a5wzinwihaw6n5jw2sws";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix
index 880b5d734d4..1fd346f6425 100644
--- a/pkgs/development/libraries/gstreamer/python/default.nix
+++ b/pkgs/development/libraries/gstreamer/python/default.nix
@@ -6,14 +6,14 @@
 let
   inherit (pythonPackages) python pygobject3;
 in stdenv.mkDerivation rec {
-  name = "gst-python-1.10.2";
+  name = "gst-python-1.10.3";
 
   src = fetchurl {
     urls = [
       "${meta.homepage}/src/gst-python/${name}.tar.xz"
       "mirror://gentoo/distfiles/${name}.tar.xz"
       ];
-    sha256 = "1sljnqkxf2ix6yzghrapw5irl0rbp8aa8w2hggk7i6d9js10ls71";
+    sha256 = "1sljnqkxf2ix7yzghrapw5irl0rbp8aa8w2hggk7i6d9js10ls71";
   };
 
   patches = [ ./different-path-with-pygobject.patch ];
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index 981a05b4f1f..7220acf2d4d 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-ugly-1.10.2";
+  name = "gst-plugins-ugly-1.10.3";
 
   meta = with stdenv.lib; {
     description = "Gstreamer Ugly Plugins";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz";
-    sha256 = "17gc2zd3v6spmm2d6912sqfcyyv5f2ghdhq31f5kx5mw5r6ds0zk";
+    sha256 = "1lkb8kznc9wxmhbp7k67b50y27nz8jp2x2flb91xzydz7b89f5f9";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index f136df099bf..ec882a2863a 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "gst-vaapi-${version}";
-  version = "1.10.2";
+  version = "1.10.3";
 
   src = fetchurl {
     url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz";
-    sha256 = "1abzaj9kczap1xmalgzid1k3gqcn1ghnn76cn2kclc1gbfwd4ccy";
+    sha256 = "07ing6z7n0ylz5vknk3d2lw54a6szd6m8hqc3px6lahmd832ga6f";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix
index a05bbd3e9a2..6677926eaa9 100644
--- a/pkgs/development/libraries/gstreamer/validate/default.nix
+++ b/pkgs/development/libraries/gstreamer/validate/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-validate-1.10.2";
+  name = "gst-validate-1.10.3";
 
   meta = {
     description = "Integration testing infrastructure for the GStreamer framework";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-validate/${name}.tar.xz";
-    sha256 = "1mwyk3b19aq78mjhmrpc7qqs9flrykrn1j763g5wx546swc489xy";
+    sha256 = "00icav26pj81cxdykf86rp3jw6lb178ydrqhcck43i94jdb4hsxy";
   };
 
   outputs = [ "out" "dev" ];

From 750e7ba0d958a08cdef16a2147263586a55a3e4d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 30 Jan 2017 00:28:37 +0300
Subject: [PATCH 588/899] libglvnd: init at 2016-12-22

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

diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix
new file mode 100644
index 00000000000..07d63c66b78
--- /dev/null
+++ b/pkgs/development/libraries/libglvnd/default.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchFromGitHub, autoreconfHook, python2, pkgconfig, mesa_noglu, libX11, libXext, glproto }:
+
+# Git version is needed for EGL and GLES handling.
+
+stdenv.mkDerivation rec {
+  name = "libglvnd-2016-12-22";
+
+  src = fetchFromGitHub {
+    owner = "NVIDIA";
+    repo = "libglvnd";
+    rev = "dc16f8c337703ad141f83583a4004fcf42e07766";
+    sha256 = "1dbwf1216np77xf1kx3ci3y7hfa1p4vgrrzg71gw36hqxf36vg5f";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig python2 ];
+  buildInputs = [ libX11 libXext glproto ];
+
+  NIX_CFLAGS_COMPILE = [
+    "-UDEFAULT_EGL_VENDOR_CONFIG_DIRS"
+    "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${mesa_noglu.driverLink}/share/glvnd/egl_vendor.d\""
+  ];
+
+  outputs = [ "out" "dev" ];
+
+  meta = with stdenv.lib; {
+    description = "The GL Vendor-Neutral Dispatch library";
+    homepage = "https://github.com/NVIDIA/libglvnd";
+    license = licenses.bsd2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47535f0ac0a..c489085161f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8062,6 +8062,8 @@ with pkgs;
   libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { };
   libgnome_keyring3 = gnome3.libgnome_keyring;
 
+  libglvnd = callPackage ../development/libraries/libglvnd { };
+
   libgnurl = callPackage ../development/libraries/libgnurl { };
 
   libgringotts = callPackage ../development/libraries/libgringotts { };

From 2fd2fcf54d6453a70564bfbf1c8d4fdfb5f9f079 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 30 Jan 2017 00:29:39 +0300
Subject: [PATCH 589/899] linuxPackages.nvidia_x11: refactor, build more from
 source

* Use libglvnd;
* Compile nvidia-settings, nvidia-persistenced from source;
* Generalize builder.
---
 nixos/modules/hardware/video/bumblebee.nix    |   2 +-
 nixos/modules/hardware/video/nvidia.nix       |  17 ++-
 pkgs/os-specific/linux/nvidia-x11/beta.nix    |  68 ----------
 .../linux/nvidia-x11/builder-legacy304.sh     | 104 ---------------
 .../linux/nvidia-x11/builder-legacy340.sh     | 120 -----------------
 pkgs/os-specific/linux/nvidia-x11/builder.sh  | 124 ++++++++----------
 pkgs/os-specific/linux/nvidia-x11/default.nix | 107 ++++++---------
 pkgs/os-specific/linux/nvidia-x11/generic.nix |  81 ++++++++++++
 .../linux/nvidia-x11/legacy173.nix            |   6 +
 .../linux/nvidia-x11/legacy304.nix            |  53 --------
 .../linux/nvidia-x11/legacy340.nix            |  67 ----------
 .../linux/nvidia-x11/persistenced.nix         |  30 +++++
 .../os-specific/linux/nvidia-x11/settings.nix |  51 +++++++
 pkgs/tools/X11/bumblebee/default.nix          |  10 +-
 pkgs/tools/X11/primus/default.nix             |   4 +-
 pkgs/tools/X11/primus/lib.nix                 |  22 +++-
 pkgs/top-level/all-packages.nix               |  16 ++-
 17 files changed, 306 insertions(+), 576 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/nvidia-x11/beta.nix
 delete mode 100755 pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh
 delete mode 100755 pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh
 create mode 100644 pkgs/os-specific/linux/nvidia-x11/generic.nix
 delete mode 100644 pkgs/os-specific/linux/nvidia-x11/legacy304.nix
 delete mode 100644 pkgs/os-specific/linux/nvidia-x11/legacy340.nix
 create mode 100644 pkgs/os-specific/linux/nvidia-x11/persistenced.nix
 create mode 100644 pkgs/os-specific/linux/nvidia-x11/settings.nix

diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix
index fbf3f20885b..3967137fcf8 100644
--- a/nixos/modules/hardware/video/bumblebee.nix
+++ b/nixos/modules/hardware/video/bumblebee.nix
@@ -77,7 +77,7 @@ in
   config = mkIf cfg.enable {
     boot.blacklistedKernelModules = [ "nvidia-drm" "nvidia" "nouveau" ];
     boot.kernelModules = optional useBbswitch "bbswitch";
-    boot.extraModulePackages = optional useBbswitch kernel.bbswitch ++ optional useNvidia kernel.nvidia_x11;
+    boot.extraModulePackages = optional useBbswitch kernel.bbswitch ++ optional useNvidia kernel.nvidia_x11.bin;
 
     environment.systemPackages = [ bumblebee primus ];
 
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index b604d645132..cf723d53269 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -27,6 +27,13 @@ let
   nvidia_x11 = nvidiaForKernel config.boot.kernelPackages;
   nvidia_libs32 = (nvidiaForKernel pkgs_i686.linuxPackages).override { libsOnly = true; kernel = null; };
 
+  nvidiaPackage = nvidia: pkgs:
+    if !nvidia.useGLVND then nvidia
+    else pkgs.buildEnv {
+      name = "nvidia-libs";
+      paths = [ pkgs.libglvnd nvidia.out ];
+    };
+
   enabled = nvidia_x11 != null;
 in
 
@@ -35,19 +42,19 @@ in
   config = mkIf enabled {
 
     services.xserver.drivers = singleton
-      { name = "nvidia"; modules = [ nvidia_x11 ]; libPath = [ nvidia_x11 ]; };
+      { name = "nvidia"; modules = [ nvidia_x11.bin ]; libPath = [ nvidia_x11 ]; };
 
     services.xserver.screenSection =
       ''
         Option "RandRRotation" "on"
       '';
 
-    hardware.opengl.package = nvidia_x11;
-    hardware.opengl.package32 = nvidia_libs32;
+    hardware.opengl.package = nvidiaPackage nvidia_x11 pkgs;
+    hardware.opengl.package32 = nvidiaPackage nvidia_libs32 pkgs_i686;
 
-    environment.systemPackages = [ nvidia_x11 ];
+    environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings nvidia_x11.persistenced ];
 
-    boot.extraModulePackages = [ nvidia_x11 ];
+    boot.extraModulePackages = [ nvidia_x11.bin ];
 
     # nvidia-uvm is required by CUDA applications.
     boot.kernelModules = [ "nvidia-uvm" ];
diff --git a/pkgs/os-specific/linux/nvidia-x11/beta.nix b/pkgs/os-specific/linux/nvidia-x11/beta.nix
deleted file mode 100644
index 6fd5fb6c0b6..00000000000
--- a/pkgs/os-specific/linux/nvidia-x11/beta.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ stdenv, fetchurl, kernel ? null, xorg, zlib, perl
-, gtk, atk, pango, glib, gdk_pixbuf, cairo, nukeReferences
-, # Whether to build the libraries only (i.e. not the kernel module or
-  # nvidia-settings).  Used to support 32-bit binaries on 64-bit
-  # Linux.
-  libsOnly ? false
-}:
-
-with stdenv.lib;
-
-assert (!libsOnly) -> kernel != null;
-
-let
-
-  versionNumber = "349.12";
-
-  # Policy: use the highest stable version as the default (on our master).
-  inherit (stdenv.lib) makeLibraryPath;
-
-in
-
-stdenv.mkDerivation {
-  name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
-
-  builder = ./builder.sh;
-
-  src =
-    if stdenv.system == "i686-linux" then
-      fetchurl {
-        url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "0x9zfw66nxv98zpkdkymlyqzspksk850bhfmza7g7pba4yba085h";
-      }
-    else if stdenv.system == "x86_64-linux" then
-      fetchurl {
-        url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
-        sha256 = "19mfkigzffxsik3h4bsjsl481q410h804fz3rdc7chs86q4bg9h3";
-      }
-    else throw "nvidia-x11 does not support platform ${stdenv.system}";
-
-  inherit versionNumber libsOnly;
-
-  kernel = if libsOnly then null else kernel.dev;
-
-  hardeningDisable = [ "pic" "format" ];
-
-  dontStrip = true;
-
-  glPath      = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr];
-  cudaPath    = makeLibraryPath [zlib stdenv.cc.cc];
-  openclPath  = makeLibraryPath [zlib];
-  allLibPath  = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr zlib stdenv.cc.cc];
-
-  gtkPath = optionalString (!libsOnly) (makeLibraryPath
-    [ gtk atk pango glib gdk_pixbuf cairo ] );
-  programPath = makeLibraryPath [ xorg.libXv ];
-
-  buildInputs = [ perl nukeReferences ];
-
-  disallowedReferences = if libsOnly then [] else [ kernel.dev ];
-
-  meta = with stdenv.lib.meta; {
-    homepage = http://www.nvidia.com/object/unix.html;
-    description = "X.org driver and kernel module for NVIDIA graphics cards";
-    license = licenses.unfreeRedistributable;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.vcunat ];
-  };
-}
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh
deleted file mode 100755
index fe826783141..00000000000
--- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh
+++ /dev/null
@@ -1,104 +0,0 @@
-source $stdenv/setup
-
-dontPatchELF=1 # must keep libXv, $out in RPATH
-
-
-unpackFile() {
-    sh $src -x
-}
-
-
-buildPhase() {
-    if test -z "$libsOnly"; then
-        # Create the module.
-        echo "Building linux driver against kernel: $kernel";
-        cd kernel
-        kernelVersion=$(cd $kernel/lib/modules && ls)
-        sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source)
-        sysOut=$(echo $kernel/lib/modules/$kernelVersion/build)
-        unset src # used by the nv makefile
-        make SYSSRC=$sysSrc SYSOUT=$sysOut module
-        cd ..
-    fi
-}
-
-
-installPhase() {
-
-    # Install libGL and friends.
-    mkdir -p $out/lib/vendors
-
-    for f in \
-      libcuda libGL libnvcuvid libnvidia-cfg libnvidia-compiler \
-      libnvidia-glcore libnvidia-ml libnvidia-opencl \
-      libnvidia-tls libOpenCL libnvidia-tls libvdpau_nvidia
-    do
-      cp -prd $f.* $out/lib/
-      ln -snf $f.so.$versionNumber $out/lib/$f.so
-      ln -snf $f.so.$versionNumber $out/lib/$f.so.1
-    done
-
-    cp -p nvidia.icd $out/lib/vendors/
-    cp -prd tls $out/lib/
-    cp -prd libOpenCL.so.1.0.0 $out/lib/
-    ln -snf libOpenCL.so.1.0.0 $out/lib/libOpenCL.so
-    ln -snf libOpenCL.so.1.0.0 $out/lib/libOpenCL.so.1
-
-    patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.*
-    patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.*
-    patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.*
-
-    if test -z "$libsOnly"; then
-
-        # Install the kernel module.
-        mkdir -p $out/lib/modules/$kernelVersion/misc
-        cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc
-
-        # Install the X driver.
-        mkdir -p $out/lib/xorg/modules
-        cp -p libnvidia-wfb.* $out/lib/xorg/modules/
-        mkdir -p $out/lib/xorg/modules/drivers
-        cp -p nvidia_drv.so $out/lib/xorg/modules/drivers
-        mkdir -p $out/lib/xorg/modules/extensions
-        cp -p libglx.so.* $out/lib/xorg/modules/extensions
-
-        ln -snf libnvidia-wfb.so.$versionNumber $out/lib/xorg/modules/libnvidia-wfb.so.1
-        ln -snf libglx.so.$versionNumber $out/lib/xorg/modules/extensions/libglx.so
-
-        patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.*
-
-        # Install the programs.
-        mkdir -p $out/bin
-
-        for i in nvidia-settings nvidia-xconfig; do
-	    cp $i $out/bin/$i
-	    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-	        --set-rpath $out/lib:$programPath:$glPath $out/bin/$i
-        done
-
-        # Header files etc.
-        mkdir -p $out/include/nvidia
-        cp -p *.h $out/include/nvidia
-
-        mkdir -p $out/share/man/man1
-        cp -p *.1.gz $out/share/man/man1
-
-        mkdir -p $out/share/applications
-        cp -p *.desktop $out/share/applications
-
-        mkdir -p $out/share/pixmaps
-        cp -p nvidia-settings.png $out/share/pixmaps
-
-        # Patch the `nvidia-settings.desktop' file.
-        substituteInPlace $out/share/applications/nvidia-settings.desktop \
-            --replace '__UTILS_PATH__' $out/bin \
-            --replace '__PIXMAP_PATH__' $out/share/pixmaps
-
-        # Move VDPAU libraries to their place
-        mkdir "$out"/lib/vdpau
-        mv "$out"/lib/libvdpau* "$out"/lib/vdpau
-    fi
-}
-
-
-genericBuild
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh
deleted file mode 100755
index 899f12daf6b..00000000000
--- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh
+++ /dev/null
@@ -1,120 +0,0 @@
-source $stdenv/setup
-
-dontPatchELF=1 # must keep libXv, $out in RPATH
-
-
-unpackFile() {
-    skip=$(sed 's/^skip=//; t; d' $src)
-    tail -n +$skip $src | xz -d | tar xvf -
-    sourceRoot=.
-}
-
-
-buildPhase() {
-    if test -z "$libsOnly"; then
-        # Create the module.
-        echo "Building linux driver against kernel: $kernel";
-        cd kernel
-        kernelVersion=$(cd $kernel/lib/modules && ls)
-        sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source)
-        sysOut=$(echo $kernel/lib/modules/$kernelVersion/build)
-        unset src # used by the nv makefile
-        make SYSSRC=$sysSrc SYSOUT=$sysOut module
-        cd uvm
-        make SYSSRC=$sysSrc SYSOUT=$sysOut module
-        cd ..
-        cd ..
-    fi
-}
-
-
-installPhase() {
-
-    if test -z "$libsOnly"; then
-        # Install the kernel module.
-        mkdir -p $out/lib/modules/$kernelVersion/misc
-        cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc
-        cp kernel/uvm/nvidia-uvm.ko $out/lib/modules/$kernelVersion/misc
-
-        # Install the X driver.
-        mkdir -p $out/lib/xorg/modules
-        cp -p libnvidia-wfb.* $out/lib/xorg/modules/
-        mkdir -p $out/lib/xorg/modules/drivers
-        cp -p nvidia_drv.so $out/lib/xorg/modules/drivers
-        mkdir -p $out/lib/xorg/modules/extensions
-        cp -p libglx.so.* $out/lib/xorg/modules/extensions
-
-        #patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.*
-
-        # Install the programs.
-        mkdir -p $out/bin
-
-        for i in nvidia-settings nvidia-smi; do
-            cp $i $out/bin/$i
-            patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-                --set-rpath $out/lib:$programPath:$glPath $out/bin/$i
-        done
-
-        # Header files etc.
-        mkdir -p $out/include/nvidia
-        cp -p *.h $out/include/nvidia
-
-        mkdir -p $out/share/man/man1
-        cp -p *.1.gz $out/share/man/man1
-        rm $out/share/man/man1/nvidia-xconfig.1.gz
-
-        mkdir -p $out/share/applications
-        cp -p *.desktop $out/share/applications
-
-        mkdir -p $out/share/pixmaps
-        cp -p nvidia-settings.png $out/share/pixmaps
-
-        # Patch the `nvidia-settings.desktop' file.
-        substituteInPlace $out/share/applications/nvidia-settings.desktop \
-            --replace '__UTILS_PATH__' $out/bin \
-            --replace '__PIXMAP_PATH__' $out/share/pixmaps
-
-        # Test a bit.
-        $out/bin/nvidia-settings --version
-    fi
-
-
-    # Install libGL and friends.
-    mkdir -p "$out/lib/vendors"
-    cp -p nvidia.icd $out/lib/vendors/
-
-    cp -prd *.so.* tls "$out/lib/"
-    rm "$out"/lib/lib{glx,nvidia-wfb}.so.* # handled separately
-
-    for libname in `find "$out/lib/" -name '*.so.*'`
-    do
-      # I'm lazy to differentiate needed libs per-library, as the closure is the same.
-      # Unfortunately --shrink-rpath would strip too much.
-      patchelf --set-rpath "$out/lib:$allLibPath" "$libname"
-
-      libname_short=`echo -n "$libname" | sed 's/so\..*/so/'`
-
-      # nvidia's EGL stack seems to expect libGLESv2.so.2 to be available
-      if [ $(basename "$libname_short") == "libGLESv2.so" ]; then
-          ln -srnf "$libname" "$libname_short.2"
-      fi
-
-      ln -srnf "$libname" "$libname_short"
-      ln -srnf "$libname" "$libname_short.1"
-    done
-
-    #patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.*
-    #patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.*
-    #patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.*
-    #patchelf --set-rpath $openclPath $out/lib/libnvidia-opencl.so.*.*
-
-    # We distribute these separately in `libvdpau`
-    rm "$out"/lib/libvdpau{.*,_trace.*}
-
-    # Move VDPAU libraries to their place
-    mkdir "$out"/lib/vdpau
-    mv "$out"/lib/libvdpau* "$out"/lib/vdpau
-}
-
-
-genericBuild
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index b739fde15f7..98858c4c985 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -1,17 +1,19 @@
 source $stdenv/setup
 
-dontPatchELF=1 # must keep libXv, $out in RPATH
-
-
-unpackFile() {
+unpackManually() {
     skip=$(sed 's/^skip=//; t; d' $src)
     tail -n +$skip $src | xz -d | tar xvf -
     sourceRoot=.
 }
 
 
+unpackFile() {
+    sh $src -x || unpackManually
+}
+
+
 buildPhase() {
-    if test -z "$libsOnly"; then
+    if [ -n "$bin" ]; then
         # Create the module.
         echo "Building linux driver against kernel: $kernel";
         cd kernel
@@ -25,45 +27,55 @@ buildPhase() {
     fi
 }
 
-
+    
 installPhase() {
     # Install libGL and friends.
-    mkdir -p "$out/etc/OpenCL/vendors"
-    cp -p nvidia.icd $out/etc/OpenCL/vendors/
-
-    mkdir -p "$out/share/vulkan/icd.d"
-    cp -p nvidia_icd.json "$out/share/vulkan/icd.d/"
-
     mkdir -p "$out/lib"
     cp -prd *.so.* tls "$out/lib/"
-    rm "$out"/lib/lib{glx,nvidia-wfb}.so.* # handled separately
+    rm $out/lib/lib{glx,nvidia-wfb}.so.* # handled separately
+    rm -f $out/lib/libnvidia-gtk* # built from source
+    if [ "$useGLVND" = "1" ]; then
+        # Pre-built libglvnd
+        rm $out/lib/lib{GL,GLX,EGL,GLESv1_CM,GLESv2,OpenGL,GLdispatch}.so.*
+    fi
+    # Use ocl-icd instead
+    rm $out/lib/libOpenCL.so*
+    # Move VDPAU libraries to their place
+    mkdir $out/lib/vdpau
+    mv $out/lib/libvdpau* $out/lib/vdpau
 
-    rm $out/lib/libGL.so.1.* # GLVND
-    rm $out/lib/libOpenCL.so* # ocl-icd is used instead
+    # Install ICDs.
+    install -Dm644 nvidia.icd $out/etc/OpenCL/vendors/nvidia.icd
+    if [ -e nvidia_icd.json ]; then
+        install -Dm644 nvidia_icd.json $out/share/vulkan/icd.d/nvidia.json
+    fi
+    if [ "$useGLVND" = "1" ]; then
+        install -Dm644 10_nvidia.json $out/share/glvnd/egl_vendor.d/nvidia.json
+    fi
 
-    if test -z "$libsOnly"; then
+    if [ -n "$bin" ]; then
         # Install the X drivers.
-        mkdir -p $out/lib/xorg/modules
-        cp -p libnvidia-wfb.* $out/lib/xorg/modules/
-        mkdir -p $out/lib/xorg/modules/drivers
-        cp -p nvidia_drv.so $out/lib/xorg/modules/drivers
-        mkdir -p $out/lib/xorg/modules/extensions
-        cp -p libglx.so.* $out/lib/xorg/modules/extensions
+        mkdir -p $bin/lib/xorg/modules
+        cp -p libnvidia-wfb.* $bin/lib/xorg/modules/
+        mkdir -p $bin/lib/xorg/modules/drivers
+        cp -p nvidia_drv.so $bin/lib/xorg/modules/drivers
+        mkdir -p $bin/lib/xorg/modules/extensions
+        cp -p libglx.so.* $bin/lib/xorg/modules/extensions
 
         # Install the kernel module.
-        mkdir -p $out/lib/modules/$kernelVersion/misc
+        mkdir -p $bin/lib/modules/$kernelVersion/misc
         for i in $(find ./kernel -name '*.ko'); do
             nuke-refs $i
-            cp $i $out/lib/modules/$kernelVersion/misc/
+            cp $i $bin/lib/modules/$kernelVersion/misc/
         done
     fi
 
-    # All libs except GUI-only are in $out now, so fixup them.
-    for libname in `find "$out/lib/" -name '*.so.*'`
+    # All libs except GUI-only are installed now, so fixup them.
+    for libname in `find "$out/lib/" -name '*.so.*'` `find "$bin/lib/" -name '*.so.*'`
     do
       # I'm lazy to differentiate needed libs per-library, as the closure is the same.
       # Unfortunately --shrink-rpath would strip too much.
-      patchelf --set-rpath "$out/lib:$allLibPath" "$libname"
+      patchelf --set-rpath "$out/lib:$libPath" "$libname"
 
       libname_short=`echo -n "$libname" | sed 's/so\..*/so/'`
 
@@ -82,55 +94,23 @@ installPhase() {
       fi
     done
 
-    #patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.*
-    #patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.*
-    #patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.*
-    #patchelf --set-rpath $openclPath $out/lib/libnvidia-opencl.so.*.*
-
-    if test -z "$libsOnly"; then
-        # Install headers and /share files etc.
-        mkdir -p $out/include/nvidia
-        cp -p *.h $out/include/nvidia
-
-        mkdir -p $out/share/man/man1
-        cp -p *.1.gz $out/share/man/man1
-        rm $out/share/man/man1/nvidia-xconfig.1.gz
-
-        mkdir -p $out/share/applications
-        cp -p *.desktop $out/share/applications
-
-        mkdir -p $out/share/pixmaps
-        cp -p nvidia-settings.png $out/share/pixmaps
-
-        # Patch the `nvidia-settings.desktop' file.
-        substituteInPlace $out/share/applications/nvidia-settings.desktop \
-            --replace '__UTILS_PATH__' $out/bin \
-            --replace '__PIXMAP_PATH__' $out/share/pixmaps
-
+    if [ -n "$bin" ]; then
+        # Install /share files.
+        mkdir -p $bin/share/man/man1
+        cp -p *.1.gz $bin/share/man/man1
+        rm -f $bin/share/man/man1/{nvidia-xconfig,nvidia-settings,nvidia-persistenced}.1.gz
 
         # Install the programs.
-        mkdir -p $out/bin
-
-        for i in nvidia-settings nvidia-smi; do
-            cp $i $out/bin/$i
-            patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-                --set-rpath $out/lib:$programPath:$glPath $out/bin/$i
+        for i in nvidia-cuda-mps-control nvidia-cuda-mps-server nvidia-smi nvidia-debugdump; do
+            if [ -e "$i" ]; then
+                install -Dm755 $i $bin/bin/$i
+                patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+                    --set-rpath $out/lib:$libPath $bin/bin/$i
+            fi
         done
-
-        patchelf --set-rpath $glPath:$gtkPath $out/lib/libnvidia-gtk2.so.*.*
-
-        # Test a bit.
-        $out/bin/nvidia-settings --version
-    else
-        rm $out/lib/libnvidia-gtk2.*
+        # FIXME: needs PATH and other fixes
+        # install -Dm755 nvidia-bug-report.sh $bin/bin/nvidia-bug-report.sh
     fi
-
-    # For simplicity and dependency reduction, don't support the gtk3 interface.
-    rm $out/lib/libnvidia-gtk3.*
-
-    # Move VDPAU libraries to their place
-    mkdir "$out"/lib/vdpau
-    mv "$out"/lib/libvdpau* "$out"/lib/vdpau
 }
 
 
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 967a98d9566..204ef62138a 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -1,74 +1,43 @@
-{ stdenv, fetchurl, kernel ? null, xorg, zlib, perl
-, gtk2, atk, pango, glib, gdk_pixbuf, cairo, nukeReferences
-, # Whether to build the libraries only (i.e. not the kernel module or
-  # nvidia-settings).  Used to support 32-bit binaries on 64-bit
-  # Linux.
-  libsOnly ? false
-}:
-
-with stdenv.lib;
-
-assert (!libsOnly) -> kernel != null;
+{ callPackage }:
 
 let
-
-  versionNumber = "375.26";
-
-  # Policy: use the highest stable version as the default (on our master).
-  inherit (stdenv.lib) makeLibraryPath;
-
-  nameSuffix = optionalString (!libsOnly) "-${kernel.version}";
-
+  generic = args: callPackage (import ./generic.nix args) { };
 in
-
-stdenv.mkDerivation {
-  name = "nvidia-x11-${versionNumber}${nameSuffix}";
-
-  builder = ./builder.sh;
-
-  src =
-    if stdenv.system == "i686-linux" then
-      fetchurl {
-        url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "0yv19rkz2wzzj0fygfjb1mh21iy769kff3yg2kzk8bsiwnmcyybw";
-      }
-    else if stdenv.system == "x86_64-linux" then
-      fetchurl {
-        url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}.run";
-        sha256 = "1kqy9ayja3g5znj2hzx8pklz8qi0b0l9da7c3ldg3hlxf31v4hjg";
-      }
-    else throw "nvidia-x11 does not support platform ${stdenv.system}";
-
-  inherit versionNumber libsOnly;
-  inherit (stdenv) system;
-
-  kernel = if libsOnly then null else kernel.dev;
-
-  hardeningDisable = [ "pic" "format" ];
-
-  dontStrip = true;
-
-  glPath      = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr];
-  cudaPath    = makeLibraryPath [zlib stdenv.cc.cc];
-  openclPath  = makeLibraryPath [zlib];
-  allLibPath  = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr zlib stdenv.cc.cc];
-
-  gtkPath = optionalString (!libsOnly) (makeLibraryPath
-    [ gtk2 atk pango glib gdk_pixbuf cairo ] );
-  programPath = makeLibraryPath [ xorg.libXv ];
-
-
-
-  buildInputs = [ perl nukeReferences ];
-
-  disallowedReferences = if libsOnly then [] else [ kernel.dev ];
-
-  meta = with stdenv.lib.meta; {
-    homepage = http://www.nvidia.com/object/unix.html;
-    description = "X.org driver and kernel module for NVIDIA graphics cards";
-    license = licenses.unfreeRedistributable;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.vcunat ];
-    priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so"
+{
+  # Policy: use the highest stable version as the default (on our master).
+  stable = generic {
+    version = "375.26";
+    sha256_32bit = "0yv19rkz2wzzj0fygfjb1mh21iy769kff3yg2kzk8bsiwnmcyybw";
+    sha256_64bit = "1kqy9ayja3g5znj2hzx8pklz8qi0b0l9da7c3ldg3hlxf31v4hjg";
+    settingsSha256 = "1s8zf5cfhx8m05fvws0gh1q0wy5zyyg2j510zlwp4hk35y7dic5y";
+    persistencedSha256 = "15r6rbzyk4yaqkpkqs8j00zc7jbhgp8naskv93dwjyw0lnj0wgky";
   };
+
+  beta = generic {
+    version = "378.09";
+    sha256_32bit = "0a1vwvsqi89pn29c9aii53xq8292dxf68sr8lxzx4bpqjqmsbapy";
+    sha256_64bit = "018qqg9zlpwd2cad99vbn18rnrrkrqybs7q65h8dmxirkx4pcvh8";
+    settingsSha256 = "1fjkpqmzdzk46p1chzxqvbj3cpqcwwx4qmv33yjq7z2a5zab9z8v";
+    persistencedSha256 = "1svaa5a0zz0r8qy6pg9lnhy5zmffvw0h120h46qqd01pkb4yv5lc";
+  };
+
+  legacy_340 = generic {
+    version = "340.101";
+    sha256_32bit = "0qmhkvxj6h63sayys9gldpafw5skpv8nsm2gxxb3pxcv7nfdlpjz";
+    sha256_64bit = "02k8j0xzxp2y4vay0kf982q382ny1i4g1kai93f2h5sak6sq3kyj";
+    settingsSha256 = "1mavbhff24n0jn154af152fp04njd505scdlxdm850h1ycb2i3g9";
+    persistencedSha256 = "1396bmmg9b1z805dzljgi2f219ji84wfnnifdbk32dpd5mrywjk0";
+    useGLVND = false;
+  };
+
+  legacy_304 = generic {
+    version = "304.134";
+    sha256_32bit = "178wx0a2pmdnaypa9pq6jh0ii0i8ykz1sh1liad9zfriy4d8kxw4";
+    sha256_64bit = "0pydw7nr4d2dply38kwvjbghsbilbp2q0mas4nfq5ad050d2c550";
+    settingsSha256 = "0q92xw4fr9p5nbhj1plynm50d32881861daxfwrisywszqijhmlf";
+    persistencedSha256 = null;
+    useGLVND = false;
+  };
+
+  legacy_173 = callPackage ./legacy173.nix { };
 }
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
new file mode 100644
index 00000000000..1398dae0e64
--- /dev/null
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -0,0 +1,81 @@
+{ version
+, sha256_32bit
+, sha256_64bit
+, settingsSha256
+, persistencedSha256
+, useGLVND ? true
+, preferGtk2 ? false
+}:
+
+{ stdenv, callPackage, callPackage_i686, buildEnv, fetchurl
+, kernel ? null, xorg, zlib, perl, nukeReferences
+, # Whether to build the libraries only (i.e. not the kernel module or
+  # nvidia-settings).  Used to support 32-bit binaries on 64-bit
+  # Linux.
+  libsOnly ? false
+}:
+
+with stdenv.lib;
+
+assert (!libsOnly) -> kernel != null;
+
+let
+  nameSuffix = optionalString (!libsOnly) "-${kernel.version}";
+  pkgSuffix = optionalString (versionOlder version "304") "-pkg0";
+
+  self = stdenv.mkDerivation {
+    name = "nvidia-x11-${version}${nameSuffix}";
+
+    builder = ./builder.sh;
+
+    src =
+      if stdenv.system == "i686-linux" then
+        fetchurl {
+          url = "http://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run";
+          sha256 = sha256_32bit;
+        }
+      else if stdenv.system == "x86_64-linux" then
+        fetchurl {
+          url = "http://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run";
+          sha256 = sha256_64bit;
+        }
+      else throw "nvidia-x11 does not support platform ${stdenv.system}";
+
+    inherit version useGLVND;
+    inherit (stdenv) system;
+
+    outputs = [ "out" ] ++ optional (!libsOnly) "bin";
+    outputDev = if libsOnly then null else "bin";
+
+    kernel = if libsOnly then null else kernel.dev;
+
+    hardeningDisable = [ "pic" "format" ];
+
+    dontStrip = true;
+    dontPatchELF = true;
+
+    libPath = makeLibraryPath [ xorg.libXext xorg.libX11 xorg.libXv xorg.libXrandr zlib stdenv.cc.cc ];
+
+    nativeBuildInputs = [ perl nukeReferences ];
+
+    disallowedReferences = optional (!libsOnly) [ kernel.dev ];
+
+    passthru = {
+      settings = callPackage (import ./settings.nix self settingsSha256) {
+        withGtk2 = preferGtk2;
+        withGtk3 = !preferGtk2;
+      };
+      persistenced = if persistencedSha256 == null then null else callPackage (import ./persistenced.nix self persistencedSha256) { };
+    };
+
+    meta = with stdenv.lib; {
+      homepage = http://www.nvidia.com/object/unix.html;
+      description = "X.org driver and kernel module for NVIDIA graphics cards";
+      license = licenses.unfreeRedistributable;
+      platforms = platforms.linux;
+      maintainers = [ maintainers.vcunat ];
+      priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so"
+    };
+  };
+
+in self
diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
index d1f6d36a6a7..19199579e77 100644
--- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
@@ -38,6 +38,12 @@ stdenv.mkDerivation {
 
   programPath = stdenv.lib.makeLibraryPath [ gtk2 atk pango glib gdk_pixbuf xorg.libXv ];
 
+  passthru = {
+    settings = null;
+    persistenced = null;
+    useGLVND = false;
+  };
+
   meta = {
     homepage = http://www.nvidia.com/object/unix.html;
     description = "X.org driver and kernel module for Legacy NVIDIA graphics cards";
diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix
deleted file mode 100644
index a6728f40cda..00000000000
--- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ stdenv, fetchurl, kernel ? null, xorg, zlib, perl
-, gtk2, atk, pango, glib, gdk_pixbuf
-, # Whether to build the libraries only (i.e. not the kernel module or
-  # nvidia-settings).  Used to support 32-bit binaries on 64-bit
-  # Linux.
-  libsOnly ? false
-}:
-
-with stdenv.lib;
-
-let versionNumber = "304.134"; in
-
-stdenv.mkDerivation {
-  name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
-
-  builder = ./builder-legacy304.sh;
-
-  src =
-    if stdenv.system == "i686-linux" then
-      fetchurl {
-        url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "178wx0a2pmdnaypa9pq6jh0ii0i8ykz1sh1liad9zfriy4d8kxw4";
-      }
-    else if stdenv.system == "x86_64-linux" then
-      fetchurl {
-        url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
-        sha256 = "0hy4q1v4y7q2jq2j963mwpjhjksqhaiing3xcla861r8rmjkf8a2";
-      }
-    else throw "nvidia-x11 does not support platform ${stdenv.system}";
-
-  inherit versionNumber libsOnly;
-
-  kernel = if libsOnly then null else kernel.dev;
-
-  hardeningDisable = [ "pic" "format" ];
-
-  dontStrip = true;
-
-  glPath = stdenv.lib.makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr];
-
-  cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.cc];
-
-  programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath
-    [ gtk2 atk pango glib gdk_pixbuf xorg.libXv ] );
-
-  buildInputs = [ perl ];
-
-  meta = {
-    homepage = http://www.nvidia.com/object/unix.html;
-    description = "X.org driver and kernel module for NVIDIA graphics cards";
-    license = stdenv.lib.licenses.unfree;
-  };
-}
diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix
deleted file mode 100644
index 5707fc4a1eb..00000000000
--- a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{ stdenv, fetchurl, kernel ? null, xorg, zlib, perl
-, gtk2, atk, pango, glib, gdk_pixbuf
-, # Whether to build the libraries only (i.e. not the kernel module or
-  # nvidia-settings).  Used to support 32-bit binaries on 64-bit
-  # Linux.
-  libsOnly ? false
-}:
-
-with stdenv.lib;
-
-assert (!libsOnly) -> kernel != null;
-
-let
-
-  versionNumber = "340.101";
-  /* This branch is needed for G8x, G9x, and GT2xx GPUs, and motherboard chipsets based on them.
-    Ongoing support for new Linux kernels and X servers, as well as fixes for critical bugs,
-    will be included in 340.* legacy releases through the end of 2019.
-  */
-  inherit (stdenv.lib) makeLibraryPath;
-in
-
-stdenv.mkDerivation {
-  name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
-
-  builder = ./builder-legacy340.sh;
-
-  src =
-    if stdenv.system == "i686-linux" then
-      fetchurl {
-        url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "0qmhkvxj6h63sayys9gldpafw5skpv8nsm2gxxb3pxcv7nfdlpjz";
-      }
-    else if stdenv.system == "x86_64-linux" then
-      fetchurl {
-        url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
-        sha256 = "0ln7fxm78zrzrjk3j5ychi5xxlgkzg2m7anw8nklr3d17c3jxxjy";
-      }
-    else throw "nvidia-x11 does not support platform ${stdenv.system}";
-
-  inherit versionNumber libsOnly;
-
-  kernel = if libsOnly then null else kernel.dev;
-
-  hardeningDisable = [ "pic" "format" ];
-
-  dontStrip = true;
-
-  glPath      = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr];
-  cudaPath    = makeLibraryPath [zlib stdenv.cc.cc];
-  openclPath  = makeLibraryPath [zlib];
-  allLibPath  = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr zlib stdenv.cc.cc];
-
-  programPath = optionalString (!libsOnly) (makeLibraryPath
-    [ gtk2 atk pango glib gdk_pixbuf xorg.libXv ] );
-
-  buildInputs = [ perl ];
-
-  meta = with stdenv.lib.meta; {
-    homepage = http://www.nvidia.com/object/unix.html;
-    description = "X.org driver and kernel module for NVIDIA graphics cards";
-    license = licenses.unfreeRedistributable;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.vcunat ];
-    priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so"
-  };
-}
diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
new file mode 100644
index 00000000000..bc79e0efe63
--- /dev/null
+++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
@@ -0,0 +1,30 @@
+nvidia_x11: sha256:
+
+{ stdenv, lib, fetchurl, m4 }:
+
+stdenv.mkDerivation rec {
+  name = "nvidia-persistenced-${nvidia_x11.version}";
+  inherit (nvidia_x11) version;
+
+  src = fetchurl {
+    url = "ftp://download.nvidia.com/XFree86/nvidia-persistenced/${name}.tar.bz2";
+    inherit sha256;
+  };
+
+  nativeBuildInputs = [ m4 ];
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  postFixup = ''
+    patchelf --set-rpath "$(patchelf --print-rpath $out/bin/nvidia-persistenced):${nvidia_x11}/lib" \
+      $out/bin/nvidia-persistenced
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.nvidia.com/object/unix.html";
+    description = "Settings application for NVIDIA graphics cards";
+    license = licenses.unfreeRedistributable;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix
new file mode 100644
index 00000000000..de60c9ccf4f
--- /dev/null
+++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix
@@ -0,0 +1,51 @@
+nvidia_x11: sha256:
+
+{ stdenv, lib, fetchurl, pkgconfig, m4, gtk2, gtk3, libXv, libvdpau
+, withGtk2 ? false, withGtk3 ? true
+}:
+
+stdenv.mkDerivation rec {
+  name = "nvidia-settings-${nvidia_x11.version}";
+  inherit (nvidia_x11) version;
+
+  src = fetchurl {
+    url = "ftp://download.nvidia.com/XFree86/nvidia-settings/${name}.tar.bz2";
+    inherit sha256;
+  };
+
+  nativeBuildInputs = [ pkgconfig m4 ];
+
+  buildInputs = [ gtk2 gtk3 libXv libvdpau ];
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  preBuild = ''
+    if [ -e src/libXNVCtrl/libXNVCtrl.a ]; then
+      ( cd src/libXNVCtrl
+        make
+      )
+    fi
+  '';
+
+  postInstall = ''
+    ${lib.optionalString (!withGtk2) ''
+      rm -f $out/lib/libnvidia-gtk2.so.*
+    ''}
+    ${lib.optionalString (!withGtk3) ''
+      rm -f $out/lib/libnvidia-gtk3.so.*
+    ''}
+  '';
+
+  postFixup = ''
+    patchelf --set-rpath "$(patchelf --print-rpath $out/bin/nvidia-settings):$out/lib:${nvidia_x11}/lib" \
+      $out/bin/nvidia-settings
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.nvidia.com/object/unix.html";
+    description = "Settings application for NVIDIA graphics cards";
+    license = licenses.unfreeRedistributable;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix
index eac44efdf27..7b725bfeb57 100644
--- a/pkgs/tools/X11/bumblebee/default.nix
+++ b/pkgs/tools/X11/bumblebee/default.nix
@@ -19,12 +19,13 @@
 { stdenv, lib, fetchurl, fetchpatch, pkgconfig, help2man, makeWrapper
 , glib, libbsd
 , libX11, libXext, xorgserver, xkbcomp, kmod, xf86videonouveau
-, nvidia_x11, virtualgl, primusLib
+, nvidia_x11, virtualgl, libglvnd, primusLib
 , automake111x, autoconf
 # The below should only be non-null in a x86_64 system. On a i686
 # system the above nvidia_x11 and virtualgl will be the i686 packages.
 # TODO: Confusing. Perhaps use "SubArch" instead of i686?
 , nvidia_x11_i686 ? null
+, libglvnd_i686 ? null
 , primusLib_i686 ? null
 , useDisplayDevice ? false
 , extraNvidiaDeviceOptions ? ""
@@ -40,7 +41,10 @@ let
 
   primusLibs = lib.makeLibraryPath ([primus] ++ lib.optional (primusLib_i686 != null) primus_i686);
 
-  nvidia_x11s = [nvidia_x11] ++ lib.optional (nvidia_x11_i686 != null) nvidia_x11_i686;
+  nvidia_x11s = [ nvidia_x11 ]
+                ++ lib.optional nvidia_x11.useGLVND libglvnd
+                ++ lib.optionals (nvidia_x11_i686 != null)
+                   ([ nvidia_x11_i686 ] ++ lib.optional nvidia_x11_i686.useGLVND libglvnd_i686);
 
   nvidiaLibs = lib.makeLibraryPath nvidia_x11s;
 
@@ -120,7 +124,7 @@ in stdenv.mkDerivation rec {
     #"CONF_PRIMUS_LD_PATH=${primusLibs}"
   ] ++ lib.optionals useNvidia [
     "CONF_LDPATH_NVIDIA=${nvidiaLibs}"
-    "CONF_MODPATH_NVIDIA=${nvidia_x11}/lib/xorg/modules"
+    "CONF_MODPATH_NVIDIA=${nvidia_x11.bin}/lib/xorg/modules"
   ];
 
   CFLAGS = [
diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix
index 88589a05878..229e228e405 100644
--- a/pkgs/tools/X11/primus/default.nix
+++ b/pkgs/tools/X11/primus/default.nix
@@ -5,6 +5,8 @@
 # Other distributions do the same.
 { stdenv
 , stdenv_i686
+, lib
+, bumblebee
 , primusLib
 , writeScriptBin
 , primusLib_i686 ? null
@@ -18,7 +20,7 @@ let
 
   primus = if useNvidia then primusLib_ else primusLib_.override { nvidia_x11 = null; };
   primus_i686 = if useNvidia then primusLib_i686_ else primusLib_i686_.override { nvidia_x11 = null; };
-  ldPath = stdenv.lib.makeLibraryPath ([primus] ++ stdenv.lib.optional (primusLib_i686 != null) primus_i686);
+  ldPath = lib.makeLibraryPath ([ primus primus.glvnd ] ++ lib.optionals (primusLib_i686 != null) [ primus_i686 primus_i686.glvnd ]);
 
 in writeScriptBin "primusrun" ''
   #!${stdenv.shell}
diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/tools/X11/primus/lib.nix
index fccd01eaead..d30377d0e18 100644
--- a/pkgs/tools/X11/primus/lib.nix
+++ b/pkgs/tools/X11/primus/lib.nix
@@ -1,10 +1,16 @@
 { stdenv, fetchFromGitHub
-, xlibsWrapper, mesa
+, libX11, mesa_noglu
 , nvidia_x11 ? null
-, libX11
+, libglvnd
 }:
 
-stdenv.mkDerivation {
+let
+  aPackage =
+    if nvidia_x11 == null then mesa_noglu
+    else if nvidia_x11.useGLVND then libglvnd
+    else nvidia_x11;
+
+in stdenv.mkDerivation {
   name = "primus-lib-2015-04-28";
 
   src = fetchFromGitHub {
@@ -14,18 +20,20 @@ stdenv.mkDerivation {
     sha256 = "118jm57ccawskb8vjq3a9dpa2gh72nxzvx2zk7zknpy0arrdznj1";
   };
 
-  buildInputs = [ libX11 mesa ];
+  buildInputs = [ libX11 mesa_noglu ];
 
   makeFlags = [ "LIBDIR=$(out)/lib"
-                "PRIMUS_libGLa=${if nvidia_x11 == null then mesa else nvidia_x11}/lib/libGL.so"
-                "PRIMUS_libGLd=${mesa}/lib/libGL.so"
-                "PRIMUS_LOAD_GLOBAL=${mesa}/lib/libglapi.so"
+                "PRIMUS_libGLa=${aPackage}/lib/libGL.so"
+                "PRIMUS_libGLd=${mesa_noglu}/lib/libGL.so"
+                "PRIMUS_LOAD_GLOBAL=${mesa_noglu}/lib/libglapi.so"
               ];
 
   installPhase = ''
     ln -s $out/lib/libGL.so.1 $out/lib/libGL.so
   '';
 
+  passthru.glvnd = if nvidia_x11 != null && nvidia_x11.useGLVND then nvidia_x11 else null;
+
   meta = with stdenv.lib; {
     description = "Low-overhead client-side GPU offloading";
     homepage = "https://github.com/amonakov/primus";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c489085161f..5b0bbfd9db2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11372,12 +11372,13 @@ with pkgs;
 
     nvidiabl = callPackage ../os-specific/linux/nvidiabl { };
 
-    nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { };
-    nvidia_x11_legacy304 = callPackage ../os-specific/linux/nvidia-x11/legacy304.nix { };
-    nvidia_x11_legacy340 = callPackage ../os-specific/linux/nvidia-x11/legacy340.nix { };
-    nvidia_x11_beta      = nvidia_x11; # latest beta is lower version ATM
-                          # callPackage ../os-specific/linux/nvidia-x11/beta.nix { };
-    nvidia_x11           = callPackage ../os-specific/linux/nvidia-x11 { };
+    nvidiaPackages = callPackage ../os-specific/linux/nvidia-x11 { };
+
+    nvidia_x11_legacy173 = nvidiaPackages.legacy_173;
+    nvidia_x11_legacy304 = nvidiaPackages.legacy_304;
+    nvidia_x11_legacy340 = nvidiaPackages.legacy_340;
+    nvidia_x11_beta      = nvidiaPackages.beta;
+    nvidia_x11           = nvidiaPackages.stable;
 
     rtl8723bs = callPackage ../os-specific/linux/rtl8723bs { };
 
@@ -15467,6 +15468,9 @@ with pkgs;
     primusLib_i686 = if system == "x86_64-linux"
       then pkgsi686Linux.primusLib
       else null;
+    libglvnd_i686 = if system == "x86_64-linux"
+      then pkgsi686Linux.libglvnd
+      else null;
   };
 
   vkeybd = callPackage ../applications/audio/vkeybd {};

From a841f6097c3b22df9898dd305342d16350eb0eb7 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 30 Jan 2017 19:21:28 +0300
Subject: [PATCH 590/899] primusLib: fix receiving long library paths

---
 pkgs/tools/X11/primus/lib.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/tools/X11/primus/lib.nix
index d30377d0e18..f3119a1a147 100644
--- a/pkgs/tools/X11/primus/lib.nix
+++ b/pkgs/tools/X11/primus/lib.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ stdenv, fetchFromGitHub, fetchpatch
 , libX11, mesa_noglu
 , nvidia_x11 ? null
 , libglvnd
@@ -20,6 +20,14 @@ in stdenv.mkDerivation {
     sha256 = "118jm57ccawskb8vjq3a9dpa2gh72nxzvx2zk7zknpy0arrdznj1";
   };
 
+  patches = [
+    # Bump buffer size for long library paths.
+    (fetchpatch {
+      url = "https://github.com/abbradar/primus/commit/2f429e232581c556df4f4bf210aee8a0c99c60b7.patch";
+      sha256 = "1da6ynz7r7x98495i329sf821308j1rpy8prcdraqahz7p4c89nc";
+    })
+  ];
+
   buildInputs = [ libX11 mesa_noglu ];
 
   makeFlags = [ "LIBDIR=$(out)/lib"

From 7db1f727f38cfbdc5cab60cc8d19d4573bd81c22 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 8 Feb 2017 09:10:45 -0500
Subject: [PATCH 591/899] moodle: Remove due to continued security issues.

---
 .../web-servers/apache-httpd/moodle.nix       | 198 ------------------
 1 file changed, 198 deletions(-)
 delete mode 100644 nixos/modules/services/web-servers/apache-httpd/moodle.nix

diff --git a/nixos/modules/services/web-servers/apache-httpd/moodle.nix b/nixos/modules/services/web-servers/apache-httpd/moodle.nix
deleted file mode 100644
index d525348d5c7..00000000000
--- a/nixos/modules/services/web-servers/apache-httpd/moodle.nix
+++ /dev/null
@@ -1,198 +0,0 @@
-{ config, lib, pkgs, serverInfo, php, ... }:
-
-with lib;
-
-let
-
-  httpd = serverInfo.serverConfig.package;
-
-  version24 = !versionOlder httpd.version "2.4";
-
-  allGranted = if version24 then ''
-    Require all granted
-  '' else ''
-    Order allow,deny
-    Allow from all
-  '';
-
-  moodleConfig = pkgs.writeText "config.php"
-    ''
-      <?php
-      unset($CFG);
-      global $CFG;
-      $CFG = new stdClass();
-      $CFG->dbtype    = '${config.dbType}';
-      $CFG->dblibrary = 'native';
-      $CFG->dbhost    = '${config.dbHost}';
-      $CFG->dbname    = '${config.dbName}';
-      $CFG->dbuser    = '${config.dbUser}';
-      $CFG->dbpass    = '${config.dbPassword}';
-      $CFG->prefix    = '${config.dbPrefix}';
-      $CFG->dboptions = array(
-          'dbpersist' => false,
-          'dbsocket'  => false,
-          'dbport'    => "${config.dbPort}",
-      );
-      $CFG->wwwroot   = '${config.wwwRoot}';
-      $CFG->dataroot  = '${config.dataRoot}';
-      $CFG->directorypermissions = 02777;
-      $CFG->admin = 'admin';
-      ${optionalString (config.debug.noEmailEver == true) ''
-        $CFG->noemailever = true;
-      ''}
-
-      ${config.extraConfig}
-      require_once(dirname(__FILE__) . '/lib/setup.php'); // Do not edit
-    '';
-  # Unpack Moodle and put the config file in its root directory.
-  moodleRoot = pkgs.stdenv.mkDerivation rec {
-    name= "moodle-2.8.10";
-
-    src = pkgs.fetchurl {
-      url = "https://download.moodle.org/stable28/${name}.tgz";
-      sha256 = "0c3r5081ipcwc9s6shakllnrkd589y2ln5z5m1q09l4h6a7cy4z2";
-    };
-
-    buildPhase =
-      ''
-      '';
-
-    installPhase =
-      ''
-        mkdir -p $out
-        cp -r * $out
-        cp ${moodleConfig} $out/config.php
-      '';
-    # Marked as broken due to needing an update for security issues.
-    # See: https://github.com/NixOS/nixpkgs/issues/18856
-    meta.broken = true;
-
-  };
-
-in
-
-{
-
-  extraConfig =
-  ''
-    # this should be config.urlPrefix instead of /
-    Alias / ${moodleRoot}/
-    <Directory ${moodleRoot}>
-      DirectoryIndex index.php
-    </Directory>
-  '';
-
-  documentRoot = moodleRoot; # TODO: fix this, should be config.urlPrefix
-
-  enablePHP = true;
-
-  options = {
-
-    id = mkOption {
-      default = "main";
-      description = ''
-        A unique identifier necessary to keep multiple Moodle server
-        instances on the same machine apart.
-      '';
-    };
-
-    dbType = mkOption {
-      default = "postgres";
-      example = "mysql";
-      description = "Database type.";
-    };
-
-    dbName = mkOption {
-      default = "moodle";
-      description = "Name of the database that holds the Moodle data.";
-    };
-
-    dbHost = mkOption {
-      default = "localhost";
-      example = "10.0.2.2";
-      description = ''
-        The location of the database server.
-      '';
-    };
-
-    dbPort = mkOption {
-      default = ""; # use the default port
-      example = "12345";
-      description = ''
-        The port that is used to connect to the database server.
-      '';
-    };
-
-    dbUser = mkOption {
-      default = "moodle";
-      description = "The user name for accessing the database.";
-    };
-
-    dbPassword = mkOption {
-      default = "";
-      example = "password";
-      description = ''
-        The password of the database user.  Warning: this is stored in
-        cleartext in the Nix store!
-      '';
-    };
-
-    dbPrefix = mkOption {
-      default = "mdl_";
-      example = "my_other_mdl_";
-      description = ''
-        A prefix for each table, if multiple moodles should run in a single database.
-      '';
-    };
-
-    wwwRoot = mkOption {
-      type = types.string;
-      example = "http://my.machine.com/my-moodle";
-      description = ''
-        The full web address where moodle has been installed.
-      '';
-    };
-
-    dataRoot = mkOption {
-      default = "/var/lib/moodledata";
-      example = "/var/lib/moodledata";
-      description = ''
-        The data directory for moodle. Needs to be writable!
-      '';
-      type = types.path;
-      };
-
-
-    extraConfig = mkOption {
-      type = types.lines;
-      default = "";
-      example =
-        ''
-        '';
-      description = ''
-        Any additional text to be appended to Moodle's
-        configuration file.  This is a PHP script.
-      '';
-    };
-
-    debug = {
-      noEmailEver = mkOption {
-        default = false;
-	example = "true";
-	description = ''
-	  Set this to true to prevent Moodle from ever sending any email.
-	'';
-	};
-    };
-  };
-
-  startupScript = pkgs.writeScript "moodle_startup.sh" ''
-  echo "Checking for existence of ${config.dataRoot}"
-  if [ ! -e "${config.dataRoot}" ]
-  then
-    mkdir -p "${config.dataRoot}"
-    chown ${serverInfo.serverConfig.user}.${serverInfo.serverConfig.group} "${config.dataRoot}"
-  fi
-  '';
-
-}

From c2a963ceaeb4a233086bb16db0f5c76e686eaa4e Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 8 Feb 2017 22:37:46 +0800
Subject: [PATCH 592/899] neovim-qt: works with qt 5.6 and msgpack 2.0

---
 pkgs/top-level/all-packages.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47535f0ac0a..cf63c333090 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15394,10 +15394,7 @@ with pkgs;
 
   neovim = callPackage ../applications/editors/neovim { };
 
-  neovim-qt = callPackage ../applications/editors/neovim/qt.nix {
-    qt5 = qt55;
-    libmsgpack = libmsgpack_1_4;
-  };
+  neovim-qt = callPackage ../applications/editors/neovim/qt.nix { };
 
   neovim-pygui = pythonPackages.neovim_gui;
 

From 45368ed49db8c51ea36ab24e5f9cc336286e02ee Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 8 Feb 2017 17:39:37 +0300
Subject: [PATCH 593/899] haskellPackages.typed-process: disable tests

Networking is required for them.
---
 pkgs/development/haskell-modules/configuration-nix.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 6768b8bba90..bd74e0e6e04 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -384,4 +384,7 @@ self: super: builtins.intersectAttrs super {
     librarySystemDepends = old.librarySystemDepends or [] ++ [ pkgs.systemd ];
   });
 
+  # Needs network in tests.
+  typed-process = dontCheck super.typed-process;
+
 }

From 5eaec77732f441b8612625a6c152c80ecf52eb25 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 8 Feb 2017 22:41:24 +0800
Subject: [PATCH 594/899] wavpack: 4.80.0 -> 5.1.0

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

diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix
index efe64581893..29a27e53f22 100644
--- a/pkgs/development/libraries/wavpack/default.nix
+++ b/pkgs/development/libraries/wavpack/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "wavpack-${version}";
-  version = "4.80.0";
+  version = "5.1.0";
 
   enableParallelBuilding = true;
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://www.wavpack.com/${name}.tar.bz2";
-    sha256 = "1sbbwvqixg87h02avg0d5r64mpjz8cmhcc6j3s9wmlbvbykjw63r";
+    sha256 = "0i19c6krc0p9krwrqy9s5xahaafigqzxcn31piidmlaqadyn4f8r";
   };
 
   meta = with stdenv.lib; {

From 403eb76cc1e78b44ccd2d91b522da54db043fcc7 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 8 Feb 2017 11:28:48 +0100
Subject: [PATCH 595/899] rawtherapee: 5.0 -> 5.0-r1

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

diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix
index 5627faec094..53fdc67cf24 100644
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "5.0";
+  version = "5.0-r1";
   name = "rawtherapee-" + version;
 
   src = fetchFromGitHub {
     owner = "Beep6581";
     repo = "RawTherapee";
-    rev = "9fbbb052eefb739753f0f3d631e45694d659610a";
-    sha256 = "0r8wzxp7q77g3hjz7dr5lh5wih762pgjad3lkzjfhki9lxr7ii7q";
+    rev = "1077c4ba2e2dbe249884e6974c6050db8eb5e9c2";
+    sha256 = "1xqmkwprk3h9nhy6q562mkjdpynyg9ff7a92sdga50k56gi0aj0s";
   };
 
   buildInputs = [

From 827009adb2838d1f2a6f710f554fe1298e59aee2 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 8 Feb 2017 15:40:58 +0100
Subject: [PATCH 596/899] digikam5: 5.3.0 -> 5.4.0

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

diff --git a/pkgs/applications/graphics/digikam/5.nix b/pkgs/applications/graphics/digikam/5.nix
index 3e5d1b7b52e..ca7377c405c 100644
--- a/pkgs/applications/graphics/digikam/5.nix
+++ b/pkgs/applications/graphics/digikam/5.nix
@@ -45,11 +45,11 @@
 
 stdenv.mkDerivation rec {
   name    = "digikam-${version}";
-  version = "5.3.0";
+  version = "5.4.0";
 
   src = fetchurl {
     url = "http://download.kde.org/stable/digikam/${name}.tar.xz";
-    sha256 = "0p1y5kgkz7lzzqpf7qd3mmg59zfdkkz9jg7knldd8dl94wkzlv5k";
+    sha256 = "0dgsgji14l5zvxny36hrfsp889fsfrsbbn9bg57m18404xp903kg";
   };
 
   nativeBuildInputs = [ cmake ecm makeQtWrapper ];

From 3082647e740cd6df15f9515c3c436d1344b52b53 Mon Sep 17 00:00:00 2001
From: Andrew Cann <shum@canndrew.org>
Date: Thu, 9 Feb 2017 00:18:22 +0800
Subject: [PATCH 597/899] trezord: init at 1.2.0 (#22054)

---
 lib/maintainers.nix                         |  1 +
 nixos/modules/module-list.nix               |  1 +
 nixos/modules/services/hardware/trezord.nix | 54 +++++++++++++++++++++
 pkgs/servers/trezord/default.nix            | 51 +++++++++++++++++++
 pkgs/servers/trezord/dynamic-link.patch     | 18 +++++++
 pkgs/top-level/all-packages.nix             |  2 +
 6 files changed, 127 insertions(+)
 create mode 100644 nixos/modules/services/hardware/trezord.nix
 create mode 100644 pkgs/servers/trezord/default.nix
 create mode 100644 pkgs/servers/trezord/dynamic-link.patch

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index bf8eb6c4974..98cbc93bcd5 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -81,6 +81,7 @@
   c0dehero = "CodeHero <codehero@nerdpol.ch>";
   calrama = "Moritz Maxeiner <moritz@ucworks.org>";
   campadrenalin = "Philip Horger <campadrenalin@gmail.com>";
+  canndrew = "Andrew Cann <shum@canndrew.org>";
   carlsverre = "Carl Sverre <accounts@carlsverre.com>";
   cdepillabout = "Dennis Gosnell <cdep.illabout@gmail.com>";
   cfouche = "Chaddaï Fouché <chaddai.fouche@gmail.com>";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index bd427bc679c..ad823c755e2 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -206,6 +206,7 @@
   ./services/hardware/tcsd.nix
   ./services/hardware/tlp.nix
   ./services/hardware/thinkfan.nix
+  ./services/hardware/trezord.nix
   ./services/hardware/udev.nix
   ./services/hardware/udisks2.nix
   ./services/hardware/upower.nix
diff --git a/nixos/modules/services/hardware/trezord.nix b/nixos/modules/services/hardware/trezord.nix
new file mode 100644
index 00000000000..38d0a3a1d75
--- /dev/null
+++ b/nixos/modules/services/hardware/trezord.nix
@@ -0,0 +1,54 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+  cfg = config.services.trezord;
+in {
+  
+  ### interface
+
+  options = {
+    services.trezord = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable Trezor bridge daemon, for use with Trezor hardware bitcoin wallets.
+        '';
+      };
+    };
+  };
+  
+  ### implementation
+
+  config = mkIf cfg.enable {
+    services.udev.packages = lib.singleton (pkgs.writeTextFile {
+      name = "trezord-udev-rules";
+      destination = "/etc/udev/rules.d/51-trezor.rules";
+      text = ''
+        SUBSYSTEM=="usb", ATTR{idVendor}=="534c", ATTR{idProduct}=="0001", MODE="0666", GROUP="dialout", SYMLINK+="trezor%n"
+        KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001",  MODE="0666", GROUP="dialout"
+      '';
+    });
+
+    systemd.services.trezord = {
+      description = "TREZOR Bridge";
+      after = [ "systemd-udev-settle.service" "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      path = [];
+      serviceConfig = {
+        Type = "simple";
+        ExecStart = "${pkgs.trezord}/bin/trezord -f";
+        User = "trezord";
+      };
+    };
+
+    users.users.trezord = {
+      group = "trezord";
+      description = "Trezor bridge daemon user";
+    };
+
+    users.groups.trezord = {};
+  };
+}
+
diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix
new file mode 100644
index 00000000000..0fad00e882d
--- /dev/null
+++ b/pkgs/servers/trezord/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchgit, curl, cmake, boost, gcc5, protobuf, pkgconfig, jsoncpp
+, libusb1, libmicrohttpd
+}:
+
+let
+  version = "1.2.0";
+in
+
+stdenv.mkDerivation rec {
+  name = "trezord-${version}";
+
+  src = fetchgit {
+    url    = "https://github.com/trezor/trezord";
+    rev    = "refs/tags/v${version}";
+    sha256 = "1606j5cfngryk4q21yiga1zvc3zpx4q8vqn6ljrvr679hpvlwni4";
+  };
+
+  meta = with stdenv.lib; {
+    description = "TREZOR Bridge daemon for TREZOR bitcoin hardware wallet";
+    homepage = https://mytrezor.com;
+    license = licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [ canndrew jb55 ];
+    platforms = platforms.linux;
+  };
+
+  patches = [ ./dynamic-link.patch ];
+
+  nativeBuildInputs = [
+    cmake
+    gcc5
+    pkgconfig
+  ];
+
+  buildInputs = [
+    curl
+    boost
+    protobuf
+    libusb1
+    libmicrohttpd
+    jsoncpp
+  ];
+
+  LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ curl ]}";
+  cmakeFlags="-DJSONCPP_LIBRARY='${jsoncpp}/lib/libjsoncpp.so'";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp trezord $out/bin
+  '';
+}
+
diff --git a/pkgs/servers/trezord/dynamic-link.patch b/pkgs/servers/trezord/dynamic-link.patch
new file mode 100644
index 00000000000..0f1f448a3f7
--- /dev/null
+++ b/pkgs/servers/trezord/dynamic-link.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7c0e2cf..0e3f4ac 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,13 +59,6 @@ target_link_libraries(trezord ${OS_LIBRARIES})
+ find_package(CURL REQUIRED)
+ find_package(libmicrohttpd REQUIRED)
+ 
+-# add static libs
+-if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+-  set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+-  set(BUILD_SHARED_LIBS off)
+-  set(Boost_USE_STATIC_LIBS on)
+-  set(CMAKE_FIND_STATIC FIRST)
+-endif(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ find_package(Boost 1.53.0 REQUIRED
+   regex thread system unit_test_framework program_options chrono)
+ find_package(Protobuf 2.5.0 REQUIRED)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47535f0ac0a..04db3d9d5dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4086,6 +4086,8 @@ with pkgs;
 
   tpm-luks = callPackage ../tools/security/tpm-luks { };
 
+  trezord = callPackage ../servers/trezord { };
+
   tthsum = callPackage ../applications/misc/tthsum { };
 
   chaps = callPackage ../tools/security/chaps { };

From 82835f7eb3e0a7ea32889474f1efde1dc5c8e03d Mon Sep 17 00:00:00 2001
From: Matthew Daiter <matthew@nomoko.camera>
Date: Wed, 8 Feb 2017 18:40:32 +0100
Subject: [PATCH 598/899] cudnn51_cudatoolkit80: hash change

---
 .../libraries/science/math/cudnn/8.0-5.1/default.nix            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix b/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix
index 0820897b81d..cf00f780901 100644
--- a/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix
+++ b/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://developer.download.nvidia.com/compute/redist/cudnn/v5.1/cudnn-8.0-linux-x64-v5.1.tgz";
-    sha256 = "a87cb2df2e5e7cc0a05e266734e679ee1a2fadad6f06af82a76ed81a23b102c8";
+    sha256 = "1kj50smlkm347wfbfqvy09ylvad1zapqjc9yqvfykmiddyrij1y1";
   };
 
   installPhase = ''

From d452487db7aa59aab74c20352c7d92e86fae3e58 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 8 Feb 2017 19:27:50 +0100
Subject: [PATCH 599/899] libimobiledevice: use python2

because python 3 isn't supported yet.
---
 pkgs/development/libraries/libimobiledevice/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix
index cfc31c120b4..cef9cc0af6b 100644
--- a/pkgs/development/libraries/libimobiledevice/default.nix
+++ b/pkgs/development/libraries/libimobiledevice/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, fetchpatch, python, pkgconfig, usbmuxd, glib, libgcrypt,
+{ stdenv, fetchurl, fetchpatch, python2, pkgconfig, usbmuxd, glib, libgcrypt,
   libtasn1, libplist, readline, libusbmuxd, openssl }:
 
 stdenv.mkDerivation rec {
   name = "libimobiledevice-1.2.0";
 
-  nativeBuildInputs = [ python libplist.swig pkgconfig ];
+  nativeBuildInputs = [ python2 libplist.swig pkgconfig ];
   buildInputs = [ readline ];
   propagatedBuildInputs = [ libusbmuxd glib libgcrypt libtasn1 libplist openssl ];
 

From c558a5d46cba86b1b365f972d31d028934e49537 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 8 Feb 2017 19:31:35 +0100
Subject: [PATCH 600/899] hexchat: use python2

---
 pkgs/applications/networking/irc/hexchat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix
index 80eea8219be..f8acc180700 100644
--- a/pkgs/applications/networking/irc/hexchat/default.nix
+++ b/pkgs/applications/networking/irc/hexchat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, gtk2, lua, perl, python
+{ stdenv, fetchFromGitHub, pkgconfig, gtk2, lua, perl, python2
 , libtool, pciutils, dbus_glib, libcanberra_gtk2, libproxy
 , libsexy, enchant, libnotify, openssl, intltool
 , desktop_file_utils, hicolor_icon_theme
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    gtk2 lua perl python pciutils dbus_glib libcanberra_gtk2 libproxy
+    gtk2 lua perl python2 pciutils dbus_glib libcanberra_gtk2 libproxy
     libsexy libnotify openssl desktop_file_utils hicolor_icon_theme
   ];
 

From 1900f227607a7c7a9cf1c024e856e2e000964a82 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 8 Feb 2017 21:35:58 +0300
Subject: [PATCH 601/899] jre_headless: add alias

---
 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 04db3d9d5dc..19204822dbf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5182,6 +5182,7 @@ with pkgs;
 
   jdk = if stdenv.isDarwin then jdk7 else jdk8;
   jre = if stdenv.isDarwin then jre7 else jre8;
+  jre_headless = if stdenv.isDarwin then jre7 else jre8_headless;
 
   openshot-qt = callPackage ../applications/video/openshot-qt { };
 

From 576740f7f2387390b0f3caf674205a8aefd6563b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 8 Feb 2017 19:36:05 +0100
Subject: [PATCH 602/899] i3minator: fix for python3

Fixes for when changing to Python 3. Haven't tested the program though.
---
 pkgs/tools/misc/i3minator/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix
index 0b26dbc06e2..7ffab069779 100644
--- a/pkgs/tools/misc/i3minator/default.nix
+++ b/pkgs/tools/misc/i3minator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchurl, pythonPackages, glibcLocales }:
 
 pythonPackages.buildPythonApplication rec {
   name = "i3minator-${version}";
@@ -9,8 +9,13 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "11dn062788kwfs8k2ry4v8zr2gn40r6lsw770s9g2gvhl5n469dw";
   };
 
+  LC_ALL = "en_US.UTF-8";
+  buildInputs = [ glibcLocales ];
   propagatedBuildInputs = [ pythonPackages.pyyaml pythonPackages.i3-py ];
 
+  # No tests
+  doCheck = false;
+
   meta = with stdenv.lib; {
     description = "i3 project manager similar to tmuxinator";
     longDescription = ''

From 504774e22368522e6188c2c812756f0dc14d8153 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 8 Feb 2017 21:36:22 +0300
Subject: [PATCH 603/899] release notes: mention JRE changes and jre_headless

---
 nixos/doc/manual/release-notes/rl-1703.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index be6ad59ac5d..278dc88e1de 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -169,12 +169,24 @@ following incompatible changes:</para>
 <para>Other notable improvements:</para>
 
 <itemizedlist>
+
   <listitem>
     <para>Module type system have a new extensible option types feature that
       allow to extend certain types, such as enum, through multiple option
       declarations of the same option across multiple modules.
     </para>
   </listitem>
+
+  <listitem>
+    <para>
+      <literal>jre</literal> now defaults to GTK+ UI by default. This
+      improves visual consistency and makes Java follow system font style,
+      improving the situation on HighDPI displays. This has a cost of increased
+      closure size; for server and other headless workloads it's recommended to
+      use <literal>jre_headless</literal>.
+    </para>
+  </listitem>
+
 </itemizedlist>
 
 

From e7395434db173da288969222047b9c8bfa7b2825 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 8 Feb 2017 19:38:03 +0100
Subject: [PATCH 604/899] pythonPackages.libclc: use python2

---
 pkgs/development/libraries/libclc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix
index de3f51752b9..e91981c36c5 100644
--- a/pkgs/development/libraries/libclc/default.nix
+++ b/pkgs/development/libraries/libclc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python, llvm, clang }:
+{ stdenv, fetchFromGitHub, python2, llvm, clang }:
 
 stdenv.mkDerivation {
   name = "libclc-2015-08-07";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "10n9qk1dild9yjkjjkzpmp9zid3ysdgvqrad554azcf755frch7g";
   };
 
-  buildInputs = [ python llvm clang ];
+  buildInputs = [ python2 llvm clang ];
 
   postPatch = ''
     sed -i 's,llvm_clang =.*,llvm_clang = "${clang}/bin/clang",' configure.py
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   '';
 
   configurePhase = ''
-    python2 ./configure.py --prefix=$out
+    ${python.interpreter} ./configure.py --prefix=$out
   '';
 
   meta = with stdenv.lib; {

From b620ad24becb670a8da103f945ef9885f55344f7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 8 Feb 2017 19:38:53 +0100
Subject: [PATCH 605/899] libctemplate: use python2

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

diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/development/libraries/libctemplate/default.nix
index d2c202b970a..cdaeb4969ae 100644
--- a/pkgs/development/libraries/libctemplate/default.nix
+++ b/pkgs/development/libraries/libctemplate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python }:
+{ stdenv, fetchurl, python2 }:
 
 stdenv.mkDerivation rec {
   name = "ctemplate-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0mi5g2xlws10z1g4x0cj6kd1r673kkav35pgzyqxa1w47xnwprcr";
   };
 
-  buildInputs = [ python ];
+  buildInputs = [ python2 ];
 
   postPatch = ''
     patchShebangs .

From b469952348f9f6260d7bf0f32391c02e71f3f11a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 8 Feb 2017 19:41:22 +0100
Subject: [PATCH 606/899] liberation_ttf_from_source: use python2

---
 pkgs/data/fonts/redhat-liberation-fonts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
index e914501721b..a3b32ad1ad3 100644
--- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix
+++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fontforge, pythonPackages, python}:
+{stdenv, fetchurl, fontforge, python2}:
 
 stdenv.mkDerivation rec {
   name = "liberation-fonts-2.00.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs";
   };
 
-  buildInputs = [ fontforge pythonPackages.fonttools python ];
+  buildInputs = [ fontforge python2.pkgs.fonttools ];
 
   installPhase = ''
     mkdir -p $out/share/fonts/truetype

From 6f7811143d3086761692be5e06778acfe8ae5983 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 8 Feb 2017 21:42:07 +0300
Subject: [PATCH 607/899] systemd service: don't install systemd-hwdb-update

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

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 56e21e82439..904404e1e47 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -42,7 +42,8 @@ let
       "systemd-udevd.service"
       "systemd-udev-settle.service"
       "systemd-udev-trigger.service"
-      "systemd-hwdb-update.service"
+      # hwdb.bin is managed by NixOS
+      # "systemd-hwdb-update.service"
 
       # Consoles.
       "getty.target"
@@ -61,7 +62,6 @@ let
       # Login stuff.
       "systemd-logind.service"
       "autovt@.service"
-      #"systemd-vconsole-setup.service"
       "systemd-user-sessions.service"
       "dbus-org.freedesktop.login1.service"
       "dbus-org.freedesktop.machine1.service"

From 0673e7b38a0b113f62d3cf8f8582275264d1019e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 8 Feb 2017 19:44:52 +0100
Subject: [PATCH 608/899] libpsl: use python2

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

diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index be77b383cd9..c5e2eac435c 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk_doc, icu
-, libxslt, pkgconfig, python }:
+, libxslt, pkgconfig, python2 }:
 
 let
 
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
   };
 
   buildInputs = [ icu libxslt ];
-  nativeBuildInputs = [ autoreconfHook docbook_xsl gtk_doc pkgconfig python ];
+  nativeBuildInputs = [ autoreconfHook docbook_xsl gtk_doc pkgconfig python2 ];
 
   postPatch = ''
     substituteInPlace src/psl.c --replace bits/stat.h sys/stat.h

From bce69c9cec9f09c3eeb0b3190f1d47c46c5b64a1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 8 Feb 2017 19:48:21 +0100
Subject: [PATCH 609/899] librepo: use python2

python3 support is experimental. Let's wait with changing.
---
 pkgs/tools/package-management/librepo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix
index ceef483c8cc..4b9b593655b 100644
--- a/pkgs/tools/package-management/librepo/default.nix
+++ b/pkgs/tools/package-management/librepo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, python, pkgconfig, expat, glib, pcre, openssl, curl, check, attr, gpgme }:
+{ stdenv, fetchFromGitHub, cmake, python2, pkgconfig, expat, glib, pcre, openssl, curl, check, attr, gpgme }:
 
 stdenv.mkDerivation rec {
   version = "1.7.18";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
       --replace ' ''${PYTHON_INSTALL_DIR}' " $out/lib/python2.7/site-packages"
   '';
 
-  buildInputs = [ cmake python pkgconfig expat glib pcre openssl curl check attr gpgme ];
+  buildInputs = [ cmake python2 pkgconfig expat glib pcre openssl curl check attr gpgme ];
 
   # librepo/fastestmirror.h includes curl/curl.h, and pkg-config specfile refers to others in here
   propagatedBuildInputs = [ curl gpgme expat ];

From 5ff9a2a2cb7a5ba246d745974d8bd2e199c6138a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 8 Feb 2017 21:50:31 +0300
Subject: [PATCH 610/899] kbd service: don't restart systemd-vconsole-setup

Fixes #22470. Also remove non-relevant comment (we don't deviate from upstream
systemd unit anymore).
---
 nixos/modules/tasks/kbd.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix
index e001832ec2e..0af376a90bc 100644
--- a/nixos/modules/tasks/kbd.nix
+++ b/nixos/modules/tasks/kbd.nix
@@ -100,15 +100,12 @@ in
       }
 
       (mkIf (!config.boot.earlyVconsoleSetup) {
-        # This is identical to the systemd-vconsole-setup.service unit
-        # shipped with systemd, except that it uses /dev/tty1 instead of
-        # /dev/tty0 to prevent putting the X server in non-raw mode, and
-        # it has a restart trigger.
         systemd.services."systemd-vconsole-setup" =
           { wantedBy = [ "sysinit.target" ];
             before = [ "display-manager.service" ];
             after = [ "systemd-udev-settle.service" ];
             restartTriggers = [ vconsoleConf kbdEnv ];
+            restartIfChanged = false; # fails when tty is inactive
           };
       })
 

From a805b1206d1a8960863f468ac3dfcff4889ec93c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 8 Feb 2017 19:51:11 +0100
Subject: [PATCH 611/899] mapnik: use python2

because python3 is not yet supported.
---
 pkgs/development/libraries/mapnik/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix
index e5845fee304..661e1270e7f 100644
--- a/pkgs/development/libraries/mapnik/default.nix
+++ b/pkgs/development/libraries/mapnik/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchzip
 , boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff
-, libwebp, libxml2, proj, python, scons, sqlite, zlib
+, libwebp, libxml2, proj, python2, scons, sqlite, zlib
 }:
 
 stdenv.mkDerivation rec {
@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
   # a distinct dev output makes python-mapnik fail
   outputs = [ "out" ];
 
-  nativeBuildInputs = [ python scons ];
+  nativeBuildInputs = [ python2 scons ];
 
   buildInputs =
     [ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff
-      libwebp libxml2 proj python sqlite zlib
+      libwebp libxml2 proj python2 sqlite zlib
     ];
 
   configurePhase = ''

From 4d51b6cda5f0e5c8614dad49292fe553ecb02dd9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 8 Feb 2017 19:53:23 +0100
Subject: [PATCH 612/899] pydb: use python2

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

diff --git a/pkgs/development/tools/pydb/default.nix b/pkgs/development/tools/pydb/default.nix
index 1b5a2ca674f..e71eca0a3fa 100644
--- a/pkgs/development/tools/pydb/default.nix
+++ b/pkgs/development/tools/pydb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, emacs }:
+{ stdenv, fetchurl, python2, emacs }:
 
 stdenv.mkDerivation {
   name = "pydb-1.26";
@@ -8,11 +8,11 @@ stdenv.mkDerivation {
     sha256 = "1wlkz1hd5d4gkzhkjkzcm650c1lchj28hj36jx96mklglm41h4q1";
   };
 
-  buildInputs = [ python emacs /* emacs is optional */ ];
+  buildInputs = [ python2 emacs /* emacs is optional */ ];
 
   preConfigure = ''
     p="$(toPythonPath $out)"
-    configureFlags="$configureFlags --with-python=${python}/bin/python --with-site-packages=$p"
+    configureFlags="$configureFlags --with-python=${python.interpreter} --with-site-packages=$p"
   '';
 
   meta = { 

From 392a57b568f9d474e82b03fb64902ff9c1e0f2f8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 8 Feb 2017 19:54:52 +0100
Subject: [PATCH 613/899] qpid-cpp: use python2

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

diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix
index c03ec8eb7f9..adbf156730e 100644
--- a/pkgs/servers/amqp/qpid-cpp/default.nix
+++ b/pkgs/servers/amqp/qpid-cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, python, boost, libuuid, ruby }:
+{ stdenv, fetchurl, cmake, python2, boost, libuuid, ruby }:
 
 stdenv.mkDerivation rec {
   name = "qpid-cpp-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "07ibwvw5lm7xabv32zai5x03r7l9mxm0zk7h9lbfkzmav0f41w0w";
   };
 
-  buildInputs = [ cmake python boost libuuid ruby ];
+  buildInputs = [ cmake python2 boost libuuid ruby ];
 
   # the subdir managementgen wants to install python stuff in ${python} and
   # the installation tries to create some folders in /var

From 923793f99a50cafc8fe5bbe74fe89c194ebfb0ac Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 8 Feb 2017 19:58:00 +0100
Subject: [PATCH 614/899] xpf: use python2

---
 pkgs/tools/text/xml/xpf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/xml/xpf/default.nix b/pkgs/tools/text/xml/xpf/default.nix
index 7d7cd3c49d9..b35053d362b 100644
--- a/pkgs/tools/text/xml/xpf/default.nix
+++ b/pkgs/tools/text/xml/xpf/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, python, libxml2}:
+{stdenv, fetchurl, python2, libxml2}:
 
 assert libxml2.pythonSupport == true;
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "0ljx91w68rnh4871c0xlq2whlmhqz8dr39wcdczfjjpniqz1fmpz";
   };
   
-  buildInputs = [python libxml2];
+  buildInputs = [ python2 libxml2 ];
 
   meta = {
     description = "XML Pipes and Filters - command line tools for manipulating and querying XML data";

From 4fef9bf8570238394e88f55fe4222e5ca13471b2 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 8 Feb 2017 14:05:13 -0500
Subject: [PATCH 615/899] pythonPackages.ansicolors: add meta

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c7042e46e4f..8c8344f7bbb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -681,6 +681,13 @@ in {
       inherit version;
       sha256 = "02lmh2fbqcwr98cq13l9ql0fvyad1dcb3ap3c5xq9qwjp45m6r3n";
     };
+
+    meta = {
+      homepage = "https://github.com/verigak/colors/";
+      description = "ANSI colors for Python";
+      license = licenses.isc;
+      maintainers = with maintainers; [ copumpkin ];
+    };
   };
 
   asgiref = buildPythonPackage rec {

From 84542bb6f43a4246db05e30e28e28272dec8c3d2 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 8 Feb 2017 14:43:12 -0500
Subject: [PATCH 616/899] pythonPackages.pants: add meta

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8c8344f7bbb..179946f9e8f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8522,7 +8522,7 @@ in {
     '';
 
     # Unnecessary, and causes some really weird behavior around .class files, which
-    # this package bundles. See https://github.com/NixOS/nixpkgs/issues/22520. 
+    # this package bundles. See https://github.com/NixOS/nixpkgs/issues/22520.
     dontStrip = true;
 
     propagatedBuildInputs = with self; [
@@ -8532,6 +8532,13 @@ in {
       setproctitle setuptools six thrift wheel twitter-common-dirutil
       twitter-common-confluence twitter-common-collections
     ];
+
+    meta = {
+      description = "A build system for software projects in a variety of languages";
+      homepage = "http://www.pantsbuild.org/";
+      license = licenses.asl2;
+      maintainers = with maintainers; [ copumpkin ];
+    };
   };
 
   paperwork-backend = buildPythonPackage rec {

From b1b0e9f6abfc1c03c0a4b613918611c813ce5c8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Tue, 7 Feb 2017 07:51:32 +0100
Subject: [PATCH 617/899] dwarfdump: init at 20161124

---
 .../libraries/libdwarf/default.nix            | 59 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  3 +-
 2 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix
index 48853b63c79..a0e72f2b561 100644
--- a/pkgs/development/libraries/libdwarf/default.nix
+++ b/pkgs/development/libraries/libdwarf/default.nix
@@ -1,30 +1,51 @@
 { stdenv, fetchurl, libelf }:
 
-stdenv.mkDerivation rec {
-  name = "libdwarf-20161124";
-
+let
+  version = "20161124";
   src = fetchurl {
-    url = "http://www.prevanders.net/${name}.tar.gz";
+    url = "http://www.prevanders.net/libdwarf-${version}.tar.gz";
     sha512 = "38e480bce5ae8273fd585ec1d8ba94dc3e865a0ef3fcfcf38b5d92fa1ce41f8b"
            + "8c95a7cf8a6e69e7c6f638a3cc56ebbfb37b6317047309725fa17e7929096799";
   };
-
-  configureFlags = [ "--enable-shared" "--disable-nonshared" ];
-
-  preConfigure = ''
-    cd libdwarf
-  '';
-  buildInputs = [ libelf ];
-
-  installPhase = ''
-    mkdir -p $out/lib $out/include
-    cp libdwarf.so.1 $out/lib
-    ln -s libdwarf.so.1 $out/lib/libdwarf.so
-    cp libdwarf.h dwarf.h $out/include
-  '';
-
   meta = {
     homepage = https://www.prevanders.net/dwarf.html;
     platforms = stdenv.lib.platforms.linux;
   };
+
+in rec {
+  libdwarf = stdenv.mkDerivation rec {
+    name = "libdwarf-${version}";
+
+    configureFlags = [ "--enable-shared" "--disable-nonshared" ];
+
+    preConfigure = ''
+      cd libdwarf
+    '';
+    buildInputs = [ libelf ];
+
+    installPhase = ''
+      mkdir -p $out/lib $out/include
+      cp libdwarf.so.1 $out/lib
+      ln -s libdwarf.so.1 $out/lib/libdwarf.so
+      cp libdwarf.h dwarf.h $out/include
+    '';
+
+    inherit meta src;
+  };
+
+  dwarfdump = stdenv.mkDerivation rec {
+    name = "dwarfdump-${version}";
+
+    preConfigure = ''
+      cd dwarfdump
+    '';
+
+    buildInputs = [ libelf libdwarf ];
+
+    installPhase = ''
+      install -m755 -D dwarfdump $out/bin/dwarfdump
+    '';
+
+    inherit meta src;
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47535f0ac0a..bcbb2077fc2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8014,7 +8014,8 @@ with pkgs;
   libdvdread = callPackage ../development/libraries/libdvdread { };
   libdvdread_4_9_9 = callPackage ../development/libraries/libdvdread/4.9.9.nix { };
 
-  libdwarf = callPackage ../development/libraries/libdwarf { };
+  inherit (callPackage ../development/libraries/libdwarf { })
+    libdwarf dwarfdump;
 
   libeatmydata = callPackage ../development/libraries/libeatmydata { };
 

From 825ef235baee02caf22690697a53f33fbe20b40c Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 8 Feb 2017 14:46:05 -0500
Subject: [PATCH 618/899] pythonPackages.pants: fix typo in license

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 179946f9e8f..8889de75acd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8536,7 +8536,7 @@ in {
     meta = {
       description = "A build system for software projects in a variety of languages";
       homepage = "http://www.pantsbuild.org/";
-      license = licenses.asl2;
+      license = licenses.asl20;
       maintainers = with maintainers; [ copumpkin ];
     };
   };

From 939f426906b788e05b14584440bb7e7173f3f43a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 8 Feb 2017 20:46:57 +0100
Subject: [PATCH 619/899] python35: 3.5.2 -> 3.5.3

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

diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index 92f9d66ea52..6e0b7614c7c 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -24,7 +24,7 @@ with stdenv.lib;
 
 let
   majorVersion = "3.5";
-  minorVersion = "2";
+  minorVersion = "3";
   minorVersionSuffix = "";
   pythonVersion = majorVersion;
   version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
@@ -45,7 +45,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
-    sha256 = "0h6a5fr7ram2s483lh0pnmc4ncijb8llnpfdxdcl5dxr01hza400";
+    sha256 = "1c6v1n9nz4mlx9mw1125fxpmbrgniqdbbx9hnqx44maqazb2mzpf";
   };
 
   NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";

From b846a53d2a3cba3002a4d6fb064f579677eac52c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 8 Feb 2017 20:47:14 +0100
Subject: [PATCH 620/899] python34: 3.4.5 -> 3.4.6

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

diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index e081a60c6bc..66bdd2a4227 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -24,7 +24,7 @@ with stdenv.lib;
 
 let
   majorVersion = "3.4";
-  minorVersion = "5";
+  minorVersion = "6";
   minorVersionSuffix = "";
   pythonVersion = majorVersion;
   version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
@@ -45,7 +45,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
-    sha256 = "12l9klp778wklxmckhghniy5hklss8r26995pyd00qbllk4b2r7f";
+    sha256 = "0h2z248hkf8x1ix1z8npkqs9cq62i322sl4rcjdkp7mawsxjhd7i";
   };
 
   NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";

From e012e1240278253fd37135a5688d57c77d2a54cd Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 8 Feb 2017 15:10:49 -0500
Subject: [PATCH 621/899] pythonPackages.pathspec: add meta

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8889de75acd..3cebe662d34 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8585,6 +8585,13 @@ in {
       inherit pname version;
       sha256 = "0a37yrr2jhlg8aiynxivh2xqani7l9j725qxzrm7cm7m4rfcl1bn";
     };
+
+    meta = {
+      description = "Utility library for gitignore-style pattern matching of file paths";
+      homepage = "https://github.com/cpburnz/python-path-specification";
+      license = licenses.mpl20;
+      maintainers = with maintainers; [ copumpkin ];
+    };
   };
 
   pathtools = buildPythonPackage rec {

From 554bfea26f4cc39b4ed1b09459fc8ad49bc81c65 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 8 Feb 2017 15:22:05 -0500
Subject: [PATCH 622/899] pythonPackages.pex: add meta

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3cebe662d34..386b2285b21 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8744,6 +8744,13 @@ in {
 
     # A few more dependencies I don't want to handle right now...
     doCheck = false;
+
+    meta = {
+      description = "A library and tool for generating .pex (Python EXecutable) files";
+      homepage = "https://github.com/pantsbuild/pex";
+      license = licenses.asl20;
+      maintainers = with maintainers; [ copumpkin ];
+    };
   };
 
   pies = buildPythonPackage rec {

From dced724c009a1646475373cc597ada385d46bde6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 6 Feb 2017 15:52:31 +0100
Subject: [PATCH 623/899] linux_3_18: remove due to EOL

---
 pkgs/os-specific/linux/kernel/linux-3.18.nix | 18 ------------------
 pkgs/top-level/all-packages.nix              | 14 --------------
 2 files changed, 32 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-3.18.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix
deleted file mode 100644
index acfd08f2af3..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-3.18.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
-
-import ./generic.nix (args // rec {
-  version = "3.18.47";
-  extraMeta.branch = "3.18";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1d9gcr08i6jlm4h6gxmhkq3hjm2ysd1587wffj10ky7y6428dpdi";
-  };
-
-  kernelPatches = args.kernelPatches;
-
-  features.iwlwifi = true;
-  features.efiBootStub = true;
-  features.needsCifsUtils = true;
-  features.netfilterRPFilter = true;
-} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 19204822dbf..01c268bd696 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11171,8 +11171,6 @@ with pkgs;
     cross = assert targetPlatform != buildPlatform; targetPlatform;
   };
 
-  linuxHeaders_3_18 = callPackage ../os-specific/linux/kernel-headers/3.18.nix { };
-
   linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix { };
 
   # We can choose:
@@ -11232,17 +11230,6 @@ with pkgs;
       ];
   };
 
-  linux_3_18 = callPackage ../os-specific/linux/kernel/linux-3.18.nix {
-    kernelPatches =
-      [ kernelPatches.bridge_stp_helper
-      ]
-      ++ lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
-      ];
-  };
-
   linux_4_1 = callPackage ../os-specific/linux/kernel/linux-4.1.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
@@ -11461,7 +11448,6 @@ with pkgs;
   linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi;
   linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10);
   linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12);
-  linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18);
   linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1);
   linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4);
   linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);

From 65a1762a9bd54bce7d7232a955ec7b151d698d9c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 8 Feb 2017 20:31:16 +0100
Subject: [PATCH 624/899] nginx module: make acme group overrideable easily

---
 nixos/modules/services/web-servers/nginx/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 815769b243f..aa11a5d5e80 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -416,7 +416,7 @@ in
         acmeEnabledVhosts = filter (vhostConfig: vhostConfig.enableACME) vhostsConfigs;
         acmePairs = map (vhostConfig: { name = vhostConfig.serverName; value = {
             user = cfg.user;
-            group = cfg.group;
+            group = lib.mkDefault cfg.group;
             webroot = vhostConfig.acmeRoot;
             extraDomains = genAttrs vhostConfig.serverAliases (alias: null);
             postRun = ''

From 7bb81a5a7b5a2d2ef6afd98de0c3998b1cf6b0f3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 8 Feb 2017 20:32:10 +0100
Subject: [PATCH 625/899] pythonPackages.certifi: 2016.2.28 -> 2017.1.23

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 386b2285b21..20de280ddb2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3669,11 +3669,11 @@ in {
 
   certifi = buildPythonPackage rec {
     name = "certifi-${version}";
-    version = "2016.2.28";
+    version = "2017.1.23";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/c/certifi/${name}.tar.gz";
-      sha256 = "5e8eccf95924658c97b990b50552addb64f55e1e3dfe4880456ac1f287dc79d0";
+      sha256 = "1klrzl3hgvcf2mjk00g0k3kk1p2z27vzwnxivwar4vhjmjvpz1w1";
     };
 
     meta = {

From 4bb27d86224dc610a0ffedb9f76708b31f0fd9f9 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 8 Feb 2017 20:32:37 +0100
Subject: [PATCH 626/899] pythonPackages.ndg-httpsclient: 0.4.0 -> 0.4.2

---
 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 20de280ddb2..32238b30095 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8367,7 +8367,7 @@ in {
   };
 
   ndg-httpsclient = buildPythonPackage rec {
-    version = "0.4.0";
+    version = "0.4.2";
     name = "ndg-httpsclient-${version}";
 
     propagatedBuildInputs = with self; [ pyopenssl ];
@@ -8375,8 +8375,8 @@ in {
     src = pkgs.fetchFromGitHub {
       owner = "cedadev";
       repo = "ndg_httpsclient";
-      rev = "v${version}";
-      sha256 = "1prv4j3wcy9kl5ndd5by543xp4cji9k35qncsl995w6sway34s1a";
+      rev = version;
+      sha256 = "1kk4knv029j0cicfiv23c1rayc1n3f1j3rhl0527gxiv0qv4jw8h";
     };
 
     # uses networking

From de82ce901ee6d99ed040ec9f94a140f64c762aae Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 8 Feb 2017 20:33:04 +0100
Subject: [PATCH 627/899] pythonPackages.flask: 0.11.1 -> 0.12

---
 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 32238b30095..954019452e2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11305,11 +11305,11 @@ in {
   };
 
   flask = buildPythonPackage {
-    name = "flask-0.11.1";
+    name = "flask-0.12";
 
     src = pkgs.fetchurl {
-      url = "mirror://pypi/F/Flask/Flask-0.11.1.tar.gz";
-      sha256 = "03kbfll4sj3v5z7r31c7bhfpi11r1np076d4p1k2kg4yzcmkywdl";
+      url = "mirror://pypi/F/Flask/Flask-0.12.tar.gz";
+      sha256 = "12yasybryp33rdchsqgckf15zj4pjfam7ly5spmn2sijpv6h7s4k";
     };
 
     propagatedBuildInputs = with self; [ itsdangerous click werkzeug jinja2 ];

From 603ca4be35b6d50316452670bb4c4139ce9455c5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 8 Feb 2017 20:33:19 +0100
Subject: [PATCH 628/899] pythonPackages.lxml: 3.7.0 -> 3.7.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 954019452e2..4b763880c95 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13999,11 +13999,11 @@ in {
 
 
   lxml = buildPythonPackage ( rec {
-    name = "lxml-3.7.0";
+    name = "lxml-3.7.2";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/l/lxml/${name}.tar.gz";
-      sha256 = "9c62eb2a1862e1ae285d7e7e3b7dc8772d387b19258086afcec143c6b7b8a5c9";
+      sha256 = "02j1wf3sh2qmswcz3rh0xvsb8jm63ifaiz2bkng93hyvc1iignar";
     };
 
     buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ];

From 2ae5b82cb705819791b0f5579a4ff90a48a71ca5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 8 Feb 2017 20:33:41 +0100
Subject: [PATCH 629/899] pythonPackages.pysocks: 1.5.7 -> 1.6.6

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4b763880c95..969ae8b240a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21057,11 +21057,11 @@ in {
 
   pysocks = buildPythonPackage rec {
     name = "pysocks-${version}";
-    version = "1.5.7";
+    version = "1.6.6";
 
     src = pkgs.fetchurl {
       url    = "mirror://pypi/P/PySocks/PySocks-${version}.tar.gz";
-      sha256 = "124bydbcspzhkb6ynckvgqra1b79rh5mrq98kbyyd202n6a7c775";
+      sha256 = "0h9zwr8z9j6l313ns335irjrkk6qnk4qzvwmjqygrp7mbwi9lh82";
     };
 
     doCheck = false;

From 6d0806d061db5da8fecf62459347db407e23c119 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 8 Feb 2017 20:33:57 +0100
Subject: [PATCH 630/899] pythonPackages.searx: 0.10.0 -> 0.11.0

---
 pkgs/development/python-modules/searx.patch | 26 ---------------------
 pkgs/top-level/python-packages.nix          | 17 ++++++++++----
 2 files changed, 12 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/development/python-modules/searx.patch

diff --git a/pkgs/development/python-modules/searx.patch b/pkgs/development/python-modules/searx.patch
deleted file mode 100644
index 1fd7dcbde6d..00000000000
--- a/pkgs/development/python-modules/searx.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/requirements.txt b/requirements.txt
-index 0d2f61b..46481b3 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -1,12 +1,12 @@
- certifi==2016.2.28
--flask==0.11.1
--flask-babel==0.11.1
--lxml==3.6.0
--ndg-httpsclient==0.4.1
-+flask==0.*
-+flask-babel==0.*
-+lxml==3.*
-+ndg-httpsclient==0.4.*
- pyasn1==0.1.9
- pyasn1-modules==0.0.8
--pygments==2.1.3
-+pygments==2.*
--pyopenssl==0.15.1
-+pyopenssl==16.*
--python-dateutil==2.5.3
-+python-dateutil==2.*
--pyyaml==3.11
-+pyyaml==3.*
--requests[socks]==2.10.0
-+requests[socks]==2.*
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 969ae8b240a..e9f00fbeb24 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28876,20 +28876,27 @@ EOF
 
   searx = buildPythonPackage rec {
     name = "searx-${version}";
-    version = "0.10.0";
+    version = "0.11.0";
 
     src = pkgs.fetchFromGitHub {
       owner = "asciimoo";
       repo = "searx";
       rev = "v${version}";
-      sha256 = "0j9pnifcrm4kzziip43w2fgadsg1sqlcm7dfxhnshdx03nby2dy2";
+      sha256 = "1m6q7yd45lfk19yp30x1jmisff6npa1y348wqc9ixa3ywvb28ky8";
     };
 
-    patches = [ ../development/python-modules/searx.patch ];
+    postPatch = ''
+      substituteInPlace requirements.txt \
+        --replace 'certifi==2016.9.26' 'certifi' \
+        --replace 'pyyaml==3.11' 'pyyaml' \
+        --replace 'lxml==3.7.1' 'lxml' \
+        --replace 'pyopenssl==16.2.0' 'pyopenssl' \
+        --replace 'requests[socks]==2.12.4' 'requests[socks]'
+    '';
 
     propagatedBuildInputs = with self; [
-      pyyaml lxml_3_5 grequests flaskbabel flask requests2
-      gevent speaklater Babel pytz dateutil pygments_2_0
+      pyyaml lxml grequests flaskbabel flask requests2
+      gevent speaklater Babel pytz dateutil pygments
       pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks
     ];
 

From 4494b18fe44c187f493d7be82c1b86fb8d4288a4 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 8 Feb 2017 23:46:05 +0100
Subject: [PATCH 631/899] electricsheep: 2.7b33-598d93d90 -> 2.7b33-2017-02-04

Also some cleanups like removed unused buildInputs.
---
 .../screensavers/electricsheep/default.nix    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix
index 990a25591c6..72fb7b41c69 100644
--- a/pkgs/misc/screensavers/electricsheep/default.nix
+++ b/pkgs/misc/screensavers/electricsheep/default.nix
@@ -1,23 +1,23 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, libtool, wxGTK30, libav, lua5_1, curl,
-  libpng, xorg, pkgconfig, flam3, libgtop, boost, tinyxml, freeglut, mesa, glee }:
+{ stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, libav, lua5_1, curl
+, libpng, xorg, pkgconfig, flam3, libgtop, boost, tinyxml, freeglut, mesa
+, glee }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "electricsheep";
-  version = "2.7b33-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "598d93d90573b69559463567540aac8bc8a5b3f3";
-  
+  version = "2.7b33-2017-02-04";
+
   src = fetchFromGitHub {
-    inherit rev;
     owner = "scottdraves";
-    repo = "${pname}";
-    sha256 = "1zcn6q0dl0ip85b8b4kisc5lqjb1cs0hpzlx4l5995l6mhq9kxis";
+    repo = pname;
+    rev = "12420cd40dfad8c32fb70b88f3d680d84f795c63";
+    sha256 = "1zqry25h6p0y0rg2h8xxda007hx1xdvsgzmjg13xkc8l4zsp5wah";
   };
 
-  nativeBuildInputs = [ autoreconfHook ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
   buildInputs = [
-    libtool wxGTK30 libav lua5_1 curl libpng xorg.libXrender pkgconfig
+    wxGTK30 libav lua5_1 curl libpng xorg.libXrender
     flam3 libgtop boost tinyxml freeglut mesa glee
   ];
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-   "CPPFLAGS=-I${glee}/include/GL"
+    "CPPFLAGS=-I${glee}/include/GL"
   ];
 
   preBuild = ''
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Electric Sheep, a distributed screen saver for evolving artificial organisms";
     homepage = http://electricsheep.org/;
-    maintainers = maintainers.nand0p;
+    maintainers = with maintainers; [ nand0p fpletz ];
     platforms = platforms.linux;
     license = licenses.gpl1;
   };

From b2e7b4b0d7f29b08ec334b460bcaae9bb85d7756 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Thu, 9 Feb 2017 00:12:49 +0100
Subject: [PATCH 632/899] rabbitmq: 3.5.8 -> 3.6.6

Fix CVE-2015-8786.
---
 pkgs/servers/amqp/rabbitmq-server/default.nix | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 62814b351b6..f96f3cc2d14 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, erlang, python, libxml2, libxslt, xmlto
-, docbook_xml_dtd_45, docbook_xsl, zip, unzip
+, docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync
 
 , AppKit, Carbon, Cocoa
 }:
@@ -7,15 +7,15 @@
 stdenv.mkDerivation rec {
   name = "rabbitmq-server-${version}";
 
-  version = "3.5.8";
+  version = "3.6.6";
 
   src = fetchurl {
-    url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/rabbitmq_v3_5_8/rabbitmq-server-3.5.8.tar.gz";
-    sha256 = "0f373zxz15smb0jvfdfsbb924fl2qmp1z2jy3y50gv6b3xsdyqmr";
+    url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/rabbitmq_v3_6_6/rabbitmq-server-3.6.6.tar.xz";
+    sha256 = "13mpnyfxd026w525rsnkcw0f8bcrkbzl7k9g8pnqmm3zyny8jmir";
   };
 
   buildInputs =
-    [ erlang python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip unzip ]
+    [ erlang python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip unzip rsync ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ];
 
   preBuild =
@@ -24,15 +24,8 @@ stdenv.mkDerivation rec {
       patchShebangs .
     '';
 
-  installFlags = "TARGET_DIR=$(out)/libexec/rabbitmq SBIN_DIR=$(out)/sbin MAN_DIR=$(out)/share/man DOC_INSTALL_DIR=$(out)/share/doc";
-
-  preInstall =
-    ''
-      sed -i \
-        -e 's|SYS_PREFIX=|SYS_PREFIX=''${SYS_PREFIX-''${HOME}/.rabbitmq/${version}}|' \
-        -e 's|CONF_ENV_FILE=''${SYS_PREFIX}\(.*\)|CONF_ENV_FILE=\1|' \
-        scripts/rabbitmq-defaults
-    '';
+  installFlags = "PREFIX=$(out) RMQ_ERLAPP_DIR=$(out)";
+  installTargets = "install install-man";
 
   postInstall =
     ''

From 3e7dffd2b355d37678cc7109803eea412bef5b28 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 8 Feb 2017 18:24:34 -0500
Subject: [PATCH 633/899] pythonPackages.twitter-common-*: add meta

I'd like to share the common meta fields across all of them but it didn't
seem worth it.
---
 pkgs/top-level/python-packages.nix | 42 ++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e9f00fbeb24..bafbb2441af 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26063,6 +26063,13 @@ in {
     };
 
     propagatedBuildInputs = with self; [ twitter-common-lang ];
+
+    meta = {
+      description = "Twitter's common collections";
+      homepage    = "https://twitter.github.io/commons/";
+      license     = licenses.asl20;
+      maintainers = with maintainers; [ copumpkin ];
+    };
   };
 
   twitter-common-confluence = buildPythonPackage rec {
@@ -26076,6 +26083,13 @@ in {
     };
 
     propagatedBuildInputs = with self; [ twitter-common-log ];
+
+    meta = {
+      description = "Twitter's API to the confluence wiki";
+      homepage    = "https://twitter.github.io/commons/";
+      license     = licenses.asl20;
+      maintainers = with maintainers; [ copumpkin ];
+    };
   };
 
   twitter-common-dirutil = buildPythonPackage rec {
@@ -26089,6 +26103,13 @@ in {
     };
 
     propagatedBuildInputs = with self; [ twitter-common-lang ];
+
+    meta = {
+      description = "Utilities for manipulating and finding files and directories";
+      homepage    = "https://twitter.github.io/commons/";
+      license     = licenses.asl20;
+      maintainers = with maintainers; [ copumpkin ];
+    };
   };
 
   twitter-common-lang = buildPythonPackage rec {
@@ -26100,6 +26121,13 @@ in {
       inherit pname version;
       sha256 = "1l8fmnsrx7hgg3ivslg588rnl9n1gfjn2w6224fr8rs7zmkd5lan";
     };
+
+    meta = {
+      description = "Twitter's 2.x / 3.x compatibility swiss-army knife";
+      homepage    = "https://twitter.github.io/commons/";
+      license     = licenses.asl20;
+      maintainers = with maintainers; [ copumpkin ];
+    };
   };
 
   twitter-common-log = buildPythonPackage rec {
@@ -26113,6 +26141,13 @@ in {
     };
 
     propagatedBuildInputs = with self; [ twitter-common-options twitter-common-dirutil ];
+
+    meta = {
+      description = "Twitter's common logging library";
+      homepage    = "https://twitter.github.io/commons/";
+      license     = licenses.asl20;
+      maintainers = with maintainers; [ copumpkin ];
+    };
   };
 
   twitter-common-options = buildPythonPackage rec {
@@ -26124,6 +26159,13 @@ in {
       inherit pname version;
       sha256 = "0d1czag5mcxg0vcnlklspl2dvdab9kmznsycj04d3vggi158ljrd";
     };
+
+    meta = {
+      description = "Twitter's optparse wrapper";
+      homepage    = "https://twitter.github.io/commons/";
+      license     = licenses.asl20;
+      maintainers = with maintainers; [ copumpkin ];
+    };
   };
 
   twine = buildPythonPackage rec {

From 02bbf843be37f382ec53c0cb4904a22ea9311eb8 Mon Sep 17 00:00:00 2001
From: Andrew Martin <andrew.thaddeus@gmail.com>
Date: Wed, 8 Feb 2017 19:24:00 -0500
Subject: [PATCH 634/899] set elasticsearch classpath to nix store

---
 pkgs/servers/search/elasticsearch/2.x.nix     |  6 ++-
 .../elasticsearch/es-classpath-2.x.patch      | 38 +++++++++++++++++++
 2 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/servers/search/elasticsearch/es-classpath-2.x.patch

diff --git a/pkgs/servers/search/elasticsearch/2.x.nix b/pkgs/servers/search/elasticsearch/2.x.nix
index 35b6ee92cdc..30beec7b873 100644
--- a/pkgs/servers/search/elasticsearch/2.x.nix
+++ b/pkgs/servers/search/elasticsearch/2.x.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1qjq04sfqb35pf2xpvr8j5p27chfxpjp8ymrp1h5bfk5rbk9444q";
   };
 
-  patches = [ ./es-home-2.x.patch ];
+  patches = [ ./es-home-2.x.patch ./es-classpath-2.x.patch ];
 
   buildInputs = [ makeWrapper jre ] ++
     (if (!stdenv.isDarwin) then [utillinux] else [getopt]);
@@ -22,7 +22,9 @@ stdenv.mkDerivation rec {
 
     # don't want to have binary with name plugin
     mv $out/bin/plugin $out/bin/elasticsearch-plugin
-    wrapProgram $out/bin/elasticsearch ${if (!stdenv.isDarwin)
+    wrapProgram $out/bin/elasticsearch \
+      --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*" \
+      ${if (!stdenv.isDarwin)
         then ''--prefix PATH : "${utillinux}/bin/"''
         else ''--prefix PATH : "${getopt}/bin"''} \
       --set JAVA_HOME "${jre}"
diff --git a/pkgs/servers/search/elasticsearch/es-classpath-2.x.patch b/pkgs/servers/search/elasticsearch/es-classpath-2.x.patch
new file mode 100644
index 00000000000..46a3f0be71b
--- /dev/null
+++ b/pkgs/servers/search/elasticsearch/es-classpath-2.x.patch
@@ -0,0 +1,38 @@
+diff -rupN a/bin/elasticsearch b/bin/elasticsearch
+--- a/bin/elasticsearch	2017-02-08 18:32:28.000298543 -0500
++++ b/bin/elasticsearch	2017-02-08 19:10:45.692916675 -0500
+@@ -81,12 +81,7 @@ ES_HOME=`cd "$ES_HOME"; pwd`
+ # If an include wasn't specified in the environment, then search for one...
+ if [ "x$ES_INCLUDE" = "x" ]; then
+     # Locations (in order) to use when searching for an include file.
+-    for include in /usr/share/elasticsearch/elasticsearch.in.sh \
+-                   /usr/local/share/elasticsearch/elasticsearch.in.sh \
+-                   /opt/elasticsearch/elasticsearch.in.sh \
+-                   ~/.elasticsearch.in.sh \
+-                   "$ES_HOME/bin/elasticsearch.in.sh" \
+-                   "`dirname "$0"`"/elasticsearch.in.sh; do
++    for include in "`dirname "$0"`"/elasticsearch.in.sh; do
+         if [ -r "$include" ]; then
+             . "$include"
+             break
+diff -rupN a/bin/elasticsearch.in.sh b/bin/elasticsearch.in.sh
+--- a/bin/elasticsearch.in.sh	2017-02-08 18:32:28.000298543 -0500
++++ b/bin/elasticsearch.in.sh	2017-02-08 18:33:46.816634599 -0500
+@@ -1,17 +1,5 @@
+ #!/bin/sh
+ 
+-# check in case a user was using this mechanism
+-if [ "x$ES_CLASSPATH" != "x" ]; then
+-    cat >&2 << EOF
+-Error: Don't modify the classpath with ES_CLASSPATH. Best is to add
+-additional elements via the plugin mechanism, or if code must really be
+-added to the main classpath, add jars to lib/ (unsupported).
+-EOF
+-    exit 1
+-fi
+-
+-ES_CLASSPATH="$ES_HOME/lib/elasticsearch-2.4.4.jar:$ES_HOME/lib/*"
+-
+ if [ "x$ES_MIN_MEM" = "x" ]; then
+     ES_MIN_MEM=256m
+ fi

From 05605b41d851db2dd17cad31c766b39d34ddd796 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 9 Feb 2017 02:50:48 +0200
Subject: [PATCH 635/899] autofs: Some cleanup

The --with-openldap and --with-sasl flags passed here are actually wrong
as they don't point to the dev outputs of the packages. Anyway, autoconf
recognizes the packages as they are in buildInputs.

getBin is generally not needed - binaries can always be referred as
${foo}/bin/bar regardless of whether the package is multiple-output.

meta.version is unnecessary.
---
 pkgs/os-specific/linux/autofs/default.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix
index d2d2c4a3988..a3c08b1b785 100644
--- a/pkgs/os-specific/linux/autofs/default.nix
+++ b/pkgs/os-specific/linux/autofs/default.nix
@@ -13,17 +13,17 @@ in stdenv.mkDerivation {
   };
 
   preConfigure = ''
-    configureFlags="--enable-force-shutdown --enable-ignore-busy --with-path=$PATH --with-openldap=${openldap} --with-sasl=${cyrus_sasl}"
+    configureFlags="--enable-force-shutdown --enable-ignore-busy --with-path=$PATH"
     export sssldir="${sssd}/lib/sssd/modules"
     export HAVE_SSS_AUTOFS=1
 
-    export MOUNT=${lib.getBin utillinux}/bin/mount
-    export MOUNT_NFS=${lib.getBin nfs-utils}/bin/mount.nfs
-    export UMOUNT=${lib.getBin utillinux}/bin/umount
-    export MODPROBE=${lib.getBin utillinux}/bin/modprobe
-    export E2FSCK=${lib.getBin e2fsprogs}/bin/fsck.ext2
-    export E3FSCK=${lib.getBin e2fsprogs}/bin/fsck.ext3
-    export E4FSCK=${lib.getBin e2fsprogs}/bin/fsck.ext4
+    export MOUNT=${utillinux}/bin/mount
+    export MOUNT_NFS=${nfs-utils}/bin/mount.nfs
+    export UMOUNT=${utillinux}/bin/umount
+    export MODPROBE=${utillinux}/bin/modprobe
+    export E2FSCK=${e2fsprogs}/bin/fsck.ext2
+    export E3FSCK=${e2fsprogs}/bin/fsck.ext3
+    export E4FSCK=${e2fsprogs}/bin/fsck.ext4
   '';
 
   installPhase = ''
@@ -37,7 +37,6 @@ in stdenv.mkDerivation {
   nativeBuildInputs = [ flex bison ];
 
   meta = {
-    inherit version;
     description = "Kernel-based automounter";
     homepage = http://www.linux-consulting.com/Amd_AutoFS/autofs.html;
     license = stdenv.lib.licenses.gpl2;

From 4ab604b6b86cd18c03ecb73fcc1f92a361a50cf7 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Sun, 29 Jan 2017 18:52:28 -0400
Subject: [PATCH 636/899] mesa: add enableRadv

---
 pkgs/development/libraries/mesa/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index e5cbe8977f0..c4b042545fc 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -4,6 +4,7 @@
 , llvmPackages, libffi, libomxil-bellagio, libva
 , libelf, libvdpau, python2
 , grsecEnabled ? false
+, enableRadv ? false
 , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
 }:
 
@@ -73,7 +74,7 @@ stdenv.mkDerivation {
   ] else [
       "--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,swrast"
       "--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast"
-      "--with-vulkan-drivers=intel"
+      ("--with-vulkan-drivers=intel" + optionalString enableRadv ",radeon")
   ]) ++ [
     (enableFeature enableTextureFloats "texture-float")
     (enableFeature grsecEnabled "glx-rts")

From 379144f54b2fa0e1568f72d58860393a1e09b92d Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 8 Feb 2017 21:24:10 -0500
Subject: [PATCH 637/899] salt: 2016.3.3 -> 2016.11.2 for multiple CVEs

From the Arch Linux advisory:

- CVE-2017-5192 (arbitrary code execution): The
  `LocalClient.cmd_batch()` method client does not accept
  `external_auth` credentials and so access to it from salt-api has
  been removed for now. This vulnerability allows code execution for
  already- authenticated users and is only in effect when running
  salt-api as the `root` user.

- CVE-2017-5200 (arbitrary command execution): Salt-api allows
  arbitrary command execution on a salt-master via Salt's ssh_client.
  Users of Salt-API and salt-ssh could execute a command on the salt
  master via a hole when both systems were enabled.
---
 pkgs/tools/admin/salt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix
index 3386ed86a2a..786e3f64cda 100644
--- a/pkgs/tools/admin/salt/default.nix
+++ b/pkgs/tools/admin/salt/default.nix
@@ -8,11 +8,11 @@
 
 python2Packages.buildPythonApplication rec {
   name = "salt-${version}";
-  version = "2016.3.3";
+  version = "2016.11.2";
 
   src = fetchurl {
     url = "mirror://pypi/s/salt/${name}.tar.gz";
-    sha256 = "1djjglnh6203y8dirziz5w6zh2lgszxp8ivi86nb7fgijj2h61jr";
+    sha256 = "0hrss5x47cr7ffyjl8jlkhf9j88lqvg7c33rjc5bimck8b7x7hzm";
   };
 
   propagatedBuildInputs = with python2Packages; [

From 77e920d874e9c1b4c41ef1250013b19e8fa792c1 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 8 Feb 2017 22:03:11 -0500
Subject: [PATCH 638/899] spice: Patch for CVE-2016-9577, CVE-2016-9578

From the Red Hat advisory:

* A vulnerability was discovered in spice in the server's protocol
  handling. An authenticated attacker could send crafted messages to
  the spice server causing a heap overflow leading to a crash or
  possible code execution. (CVE-2016-9577)

* A vulnerability was discovered in spice in the server's protocol
  handling. An attacker able to connect to the spice server could send
  crafted messages which would cause the process to crash.
  (CVE-2016-9578)
---
 ...lowing-patch-from-http-pkgs.fedorapr.patch | 56 +++++++++++++++++++
 pkgs/development/libraries/spice/default.nix  | 23 +++++++-
 2 files changed, 76 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/spice/0001-Adapting-the-following-patch-from-http-pkgs.fedorapr.patch

diff --git a/pkgs/development/libraries/spice/0001-Adapting-the-following-patch-from-http-pkgs.fedorapr.patch b/pkgs/development/libraries/spice/0001-Adapting-the-following-patch-from-http-pkgs.fedorapr.patch
new file mode 100644
index 00000000000..8098f568e21
--- /dev/null
+++ b/pkgs/development/libraries/spice/0001-Adapting-the-following-patch-from-http-pkgs.fedorapr.patch
@@ -0,0 +1,56 @@
+From 75e8685740199537bfefcbd9996ec3ff9f6342e6 Mon Sep 17 00:00:00 2001
+From: Graham Christensen <graham@grahamc.com>
+Date: Wed, 8 Feb 2017 21:58:43 -0500
+Subject: [PATCH] Adapting the following patch, from
+ http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0003-main-channel-Prevent-overflow-reading-messages-from-.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d
+
+> From: Frediano Ziglio <fziglio@redhat.com>
+> Date: Tue, 29 Nov 2016 16:46:56 +0000
+> Subject: [spice-server 3/3] main-channel: Prevent overflow reading messages
+>  from client
+>
+> Caller is supposed the function return a buffer able to store
+> size bytes.
+>
+> Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
+> Acked-by: Christophe Fergeau <cfergeau@redhat.com>
+> ---
+>  server/main-channel.c | 3 +++
+>  1 file changed, 3 insertions(+)
+>
+> diff --git a/server/main-channel.c b/server/main-channel.c
+> index 24dd448..1124506 100644
+> --- a/server/main-channel.c
+> +++ b/server/main-channel.c
+> @@ -258,6 +258,9 @@ static uint8_t *main_channel_alloc_msg_rcv_buf(RedChannelClient *rcc,
+>
+>      if (type == SPICE_MSGC_MAIN_AGENT_DATA) {
+>          return reds_get_agent_data_buffer(red_channel_get_server(channel), mcc, size);
+> +    } else if (size > sizeof(main_chan->recv_buf)) {
+> +        /* message too large, caller will log a message and close the connection */
+> +        return NULL;
+>      } else {
+>          return main_chan->recv_buf;
+>      }
+> --
+> 2.9.3
+> ---
+ server/main_channel.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/server/main_channel.c b/server/main_channel.c
+index 0ecc9df..1fc3915 100644
+--- a/server/main_channel.c
++++ b/server/main_channel.c
+@@ -1026,6 +1026,9 @@ static uint8_t *main_channel_alloc_msg_rcv_buf(RedChannelClient *rcc,
+
+     if (type == SPICE_MSGC_MAIN_AGENT_DATA) {
+         return reds_get_agent_data_buffer(mcc, size);
++    } else if (size > sizeof(main_chan->recv_buf)) {
++        /* message too large, caller will log a message and close the connection */
++        return NULL;
+     } else {
+         return main_chan->recv_buf;
+     }
+--
+2.10.0
diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix
index c0145f4f776..61952c3b323 100644
--- a/pkgs/development/libraries/spice/default.nix
+++ b/pkgs/development/libraries/spice/default.nix
@@ -1,6 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, pixman, celt, alsaLib, openssl
-, libXrandr, libXfixes, libXext, libXrender, libXinerama, libjpeg, zlib
-, spice_protocol, python, pyparsing, glib, cyrus_sasl, lz4 }:
+{ stdenv, fetchurl, fetchpatch, pkgconfig, pixman, celt, alsaLib
+, openssl, libXrandr, libXfixes, libXext, libXrender, libXinerama
+, libjpeg, zlib, spice_protocol, python, pyparsing, glib, cyrus_sasl
+, lz4 }:
 
 with stdenv.lib;
 
@@ -12,6 +13,22 @@ stdenv.mkDerivation rec {
     sha256 = "0za03i77j8i3g5l2np2j7vy8cqsdbkm9wbv4hjnaqq9xhz2sa0gr";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch";
+      url = "http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d";
+      sha256 = "11x5566lx5zyl7f39glwsgpzkxb7hpcshx8va5ab3imrns07130q";
+    })
+    (fetchpatch {
+      name = "0002-Prevent-integer-overflows-in-capability-checks.patch";
+      url = "http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0002-Prevent-integer-overflows-in-capability-checks.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d";
+      sha256 = "1r1bhq98w93cvvrlrz6jwdfsy261xl3xqs0ppchaa2igyxvxv5z5";
+    })
+    # Originally from http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0003-main-channel-Prevent-overflow-reading-messages-from-.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d
+    # but main-channel.c was renamed to main_channel.c
+    ./0001-Adapting-the-following-patch-from-http-pkgs.fedorapr.patch
+  ];
+
   buildInputs = [ pixman celt alsaLib openssl libjpeg zlib
                   libXrandr libXfixes libXrender libXext libXinerama
                   python pyparsing glib cyrus_sasl lz4 ];

From 8cd4c31d6b8c6432986edf0ec5d00d2fe1c12854 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Wed, 8 Feb 2017 16:43:52 -0500
Subject: [PATCH 639/899] top-level: Allow nixpkgs to take localSystem directly

This is instead of both system and platform, which is kind of ugly.
---
 doc/cross-compilation.xml       | 20 +++++++++++---
 pkgs/top-level/all-packages.nix |  6 +++--
 pkgs/top-level/default.nix      | 47 ++++++++++++---------------------
 pkgs/top-level/impure.nix       | 19 ++++++++++---
 4 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index 32cf198449b..8e981a4318e 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -25,7 +25,7 @@
 <!--============================================================-->
 
 <section xml:id="sec-cross-packaging">
-  <title>Packing in a cross-friendly manner</title>
+  <title>Packaging in a cross-friendly manner</title>
 
   <section>
     <title>Platform parameters</title>
@@ -132,9 +132,23 @@
 
 <section xml:id="sec-cross-usage">
   <title>Cross-building packages</title>
+  <note><para>
+    More information needs to moved from the old wiki, especially <link xlink:href="https://nixos.org/wiki/CrossCompiling" />, for this section.
+  </para></note>
   <para>
-    To be written.
-    This is basically unchanged so see the old wiki for now.
+    Many sources (manual, wiki, etc) probably mention passing <varname>system</varname>, <varname>platform</varname>, and, optionally, <varname>crossSystem</varname> to nixpkgs:
+    <literal>import &lt;nixpkgs&gt; { system = ..; platform = ..; crossSystem = ..; }</literal>.
+    <varname>system</varname> and <varname>platform</varname> together determine the system on which packages are built, and <varname>crossSystem</varname> specifies the platform on which packages are ultimately intended to run, if it is different.
+    This still works, but with more recent changes, one can alternatively pass <varname>localSystem</varname>, containing <varname>system</varname> and <varname>platform</varname>, for symmetry.
+  </para>
+  <para>
+    One would think that <varname>localSystem</varname> and <varname>crossSystem</varname> overlap horribly with the three <varname>*Platforms</varname> (<varname>buildPlatform</varname>, <varname>hostPlatform,</varname> and <varname>targetPlatform</varname>; see <varname>stage.nix</varname> or the manual).
+    Actually, those identifiers are purposefully not used here to draw a subtle but important distinction:
+    While the granularity of having 3 platforms is necessary to properly *build* packages, it is overkill for specifying the user's *intent* when making a build plan or package set.
+    A simple "build vs deploy" dichotomy is adequate: the sliding window principle described in the previous section shows how to interpolate between the these two "end points" to get the 3 platform triple for each bootstrapping stage.
+    That means for any package a given package set, even those not bound on the top level but only reachable via dependencies or <varname>buildPackages</varname>, the three platforms will be defined as one of <varname>localSystem</varname> or <varname>crossSystem</varname>, with the former replacing the latter as one traverses build-time dependencies.
+    A last simple difference then is <varname>crossSystem</varname> should be null when one doesn't want to cross-compile, while the <varname>*Platform</varname>s are always non-null.
+    <varname>localSystem</varname> is always non-null.
   </para>
 </section>
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e066d1ababd..fc6b1e41d53 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18,8 +18,10 @@ with pkgs;
 
   # Override system. This is useful to build i686 packages on x86_64-linux.
   forceSystem = system: kernel: nixpkgsFun {
-    inherit system;
-    platform = platform // { kernelArch = kernel; };
+    localSystem = {
+      inherit system;
+      platform = platform // { kernelArch = kernel; };
+    };
   };
 
   # Used by wine, firefox with debugging version of Flash, ...
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index 3c67d316f7c..3e3ecdeea6c 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -17,8 +17,14 @@
    evaluation is taking place, and the configuration from environment variables
    or dot-files. */
 
-{ # The system (e.g., `i686-linux') for which to build the packages.
-  system
+{ # The system packages will be built on. See the manual for the
+  # subtle division of labor between these two `*System`s and the three
+  # `*Platform`s.
+  localSystem
+
+  # The system packages will ultimately be run on. Null if the two should be the
+  # same.
+, crossSystem ? null
 
 , # Allow a configuration attribute set to be passed in as an argument.
   config ? {}
@@ -27,12 +33,9 @@
   overlays ? []
 
 , # A function booting the final package set for a specific standard
-  # environment. See below for the arguments given to that function,
-  # the type of list it returns.
+  # environment. See below for the arguments given to that function, the type of
+  # list it returns.
   stdenvStages ? import ../stdenv
-
-, crossSystem ? null
-, platform ? assert false; null
 } @ args:
 
 let # Rename the function arguments
@@ -51,10 +54,10 @@ in let
 
   # Allow setting the platform in the config file. Otherwise, let's use a
   # reasonable default.
-  platform =
-    args.platform
-    or ( config.platform
-      or ((import ./platforms.nix).selectPlatformBySystem system) );
+  localSystem =
+    { platform = (import ./platforms.nix).selectPlatformBySystem args.localSystem.system; }
+    // builtins.intersectAttrs { platform = null; } config
+    // args.localSystem;
 
   # A few packages make a new package set to draw their dependencies from.
   # (Currently to get a cross tool chain, or forced-i686 package.) Rather than
@@ -71,7 +74,8 @@ in let
   # To put this in concrete terms, this function is basically just used today to
   # use package for a different platform for the current platform (namely cross
   # compiling toolchains and 32-bit packages on x86_64). In both those cases we
-  # want the provided non-native `system` argument to affect the stdenv chosen.
+  # want the provided non-native `localSystem` argument to affect the stdenv
+  # chosen.
   nixpkgsFun = newArgs: import ./. (args // newArgs);
 
   # Partially apply some arguments for building bootstraping stage pkgs
@@ -83,24 +87,7 @@ in let
   boot = import ../stdenv/booter.nix { inherit lib allPackages; };
 
   stages = stdenvStages {
-    # One would think that `localSystem` and `crossSystem` overlap horribly with
-    # the three `*Platforms` (`buildPlatform`, `hostPlatform,` and
-    # `targetPlatform`; see `stage.nix` or the manual). Actually, those
-    # identifiers I, @Ericson2314, purposefully not used here to draw a subtle
-    # but important distinction:
-    #
-    # While the granularity of having 3 platforms is necessary to properly
-    # *build* packages, it is overkill for specifying the user's *intent* when
-    # making a build plan or package set. A simple "build vs deploy" dichotomy
-    # is adequate: the "sliding window" principle described in the manual shows
-    # how to interpolate between the these two "end points" to get the 3
-    # platform triple for each bootstrapping stage.
-    #
-    # Also, less philosophically but quite practically, `crossSystem` should be
-    # null when one doesn't want to cross-compile, while the `*Platform`s are
-    # always non-null. `localSystem` is always non-null.
-    localSystem = { inherit system platform; };
-    inherit lib crossSystem config overlays;
+    inherit lib localSystem crossSystem config overlays;
   };
 
   pkgs = boot stages;
diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix
index 6999b7428ba..98094e93160 100644
--- a/pkgs/top-level/impure.nix
+++ b/pkgs/top-level/impure.nix
@@ -12,9 +12,11 @@ let
 
 in
 
-{ # Fallback: Assume we are building packages for the current (host, in GNU
-  # Autotools parlance) system.
-  system ? builtins.currentSystem
+{ # We combine legacy `system` and `platform` into `localSystem`, if
+  # `localSystem` was not passed. Strictly speaking, this is pure desugar, but
+  # it is most convient to do so before the impure `localSystem.system` default,
+  # so we do it now.
+  localSystem ? builtins.intersectAttrs { system = null; platform = null; } args
 
 , # Fallback: The contents of the configuration file found at $NIXPKGS_CONFIG or
   # $HOME/.config/nixpkgs/config.nix.
@@ -49,4 +51,13 @@ in
 , ...
 } @ args:
 
-import ./. (args // { inherit system config overlays; })
+# If `localSystem` was explicitly passed, legacy `system` and `platform` should
+# not be passed.
+assert args ? localSystem -> !(args ? system || args ? platform);
+
+import ./. (builtins.removeAttrs args [ "system" "platform" ] // {
+  inherit config overlays;
+  # Fallback: Assume we are building packages on the current (build, in GNU
+  # Autotools parlance) system.
+  localSystem = { system = builtins.currentSystem; } // localSystem;
+})

From 19f23d00fd91c68911c8bf8e7d8dc0e19a3faaaa Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 8 Feb 2017 22:11:25 -0500
Subject: [PATCH 640/899] ntfs3g: patch for CVE-2017-0358

From the Debian advisory:

Jann Horn of Google Project Zero discovered that NTFS-3G, a read-write
NTFS driver for FUSE, does not scrub the environment before executing
modprobe with elevated privileges. A local user can take advantage of
this flaw for local root privilege escalation.
---
 pkgs/tools/filesystems/ntfs-3g/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix
index d5c5456515c..01d9b81d038 100644
--- a/pkgs/tools/filesystems/ntfs-3g/default.nix
+++ b/pkgs/tools/filesystems/ntfs-3g/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, utillinux, libuuid
+{stdenv, fetchurl, fetchpatch, utillinux, libuuid
 , crypto ? false, libgcrypt, gnutls, pkgconfig}:
 
 stdenv.mkDerivation rec {
@@ -14,6 +14,13 @@ stdenv.mkDerivation rec {
     sha256 = "180y5y09h30ryf2vim8j30a2npwz1iv9ly5yjmh3wjdkwh2jrdyp";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/n/ntfs-3g/1:2016.2.22AR.1-4/debian/patches/0003-CVE-2017-0358.patch";
+      sha256 = "0hd05q9q06r18k8pmppvch1sslzqln5fvqj51d5r72g4mnpavpj3";
+    })
+  ];
+
   patchPhase = ''
     substituteInPlace src/Makefile.in --replace /sbin '@sbindir@'
     substituteInPlace ntfsprogs/Makefile.in --replace /sbin '@sbindir@'
@@ -45,4 +52,3 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus; # and (lib)fuse-lite under LGPL2+
   };
 }
-

From 70a7fe9d036e1ec7099d2723073538ca3d2408fa Mon Sep 17 00:00:00 2001
From: Mica Semrick <mica@silentumbrella.com>
Date: Wed, 8 Feb 2017 19:31:31 -0800
Subject: [PATCH 641/899] dateutils: init at 0.4.1

---
 lib/maintainers.nix                   |  1 +
 pkgs/tools/misc/dateutils/default.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 3 files changed, 22 insertions(+)
 create mode 100644 pkgs/tools/misc/dateutils/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 4672dc59d43..6da6110009b 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -358,6 +358,7 @@
   paholg = "Paho Lurie-Gregg <paho@paholg.com>";
   pakhfn = "Fedor Pakhomov <pakhfn@gmail.com>";
   palo = "Ingolf Wanger <palipalo9@googlemail.com>";
+  paperdigits = "Mica Semrick <mica@silentumbrella.com>";
   pashev = "Igor Pashev <pashev.igor@gmail.com>";
   pawelpacana = "Paweł Pacana <pawel.pacana@gmail.com>";
   periklis = "theopompos@gmail.com";
diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix
new file mode 100644
index 00000000000..40d729d063d
--- /dev/null
+++ b/pkgs/tools/misc/dateutils/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "0.4.1";
+  name = "dateutils-${version}";
+
+  src =fetchurl {
+    url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${name}.tar.xz";
+    sha256 = "0y2jsmvilljbid14lzmk3kgvasn4h7hr6y3wwbr3lkgwfn4y9k3c";
+ 	};
+
+  meta = with stdenv.lib; {
+    description = "A bunch of tools that revolve around fiddling with dates and times in the command line";
+    homepage = http://www.fresse.org/dateutils/;
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.paperdigits ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 41e2312f447..1e0f332eebb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -783,6 +783,8 @@ with pkgs;
 
   datefudge = callPackage ../tools/system/datefudge { };
 
+  dateutils = callPackage ../tools/misc/dateutils { };
+
   ddate = callPackage ../tools/misc/ddate { };
 
   dehydrated = callPackage ../tools/admin/dehydrated { };

From 3053e07caa80dfe8ac483ad55b2e619a64937d06 Mon Sep 17 00:00:00 2001
From: Tim Digel <tim.digel@active-group.de>
Date: Thu, 9 Feb 2017 08:26:57 +0100
Subject: [PATCH 642/899] asterisk: add speex codec

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

diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index ff64e83820f..70d4a149505 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, pkgs, lib, fetchurl, fetchgit,
   jansson, libxml2, libxslt, ncurses, openssl, sqlite,
   utillinux, dmidecode, libuuid, binutils, newt,
-  lua,
+  lua, speex,
   srtp, wget, curl,
   subversionClient
 }:
@@ -11,7 +11,7 @@ let
     inherit version;
     name = "asterisk-${version}";
 
-    buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid binutils newt lua srtp wget curl subversionClient ];
+    buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid binutils newt lua speex srtp wget curl subversionClient ];
 
     patches = [
       # We want the Makefile to install the default /var skeleton

From d8da56984b7a2afa00f9deed1de4a300f2694272 Mon Sep 17 00:00:00 2001
From: Tim Digel <tim.digel@active-group.de>
Date: Thu, 9 Feb 2017 08:27:29 +0100
Subject: [PATCH 643/899] asterisk: 14.1.2 -> 14.2.1

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

diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index 70d4a149505..0c9f72f66d5 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -83,8 +83,8 @@ in
   };
 
   asterisk-stable = common {
-    version = "14.1.2";
-    sha256 = "0w9s4334rwvpyxm169grmnb4k9yq0l2al73dyh4cb8769qcs0ij8";
+    version = "14.2.1";
+    sha256 = "193yhyjn0fwrd7hsmr3qwcx3k2pc6cq70v1mnfdwidix4cqm32xj";
     externals = {
       "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255;
     };

From 386ecdcb4da1375b121fe18ff1f8768341774e18 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 9 Feb 2017 08:44:54 +0100
Subject: [PATCH 644/899] rtmpdump: 2015-01-15 -> 2015-12-30

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

diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix
index ce23c5f4193..547700639bb 100644
--- a/pkgs/tools/video/rtmpdump/default.nix
+++ b/pkgs/tools/video/rtmpdump/default.nix
@@ -11,13 +11,13 @@ assert opensslSupport -> openssl != null && !gnutlsSupport;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "rtmpdump-${version}";
-  version = "2015-01-15";
+  version = "2015-12-30";
 
   src = fetchgit {
     url = git://git.ffmpeg.org/rtmpdump;
     # Currently the latest commit is used (a release has not been made since 2011, i.e. '2.4')
-    rev = "a107cef9b392616dff54fabfd37f985ee2190a6f";
-    sha256 = "03x7dy111dk8b23cq2wb5h8ljcv58fzhp0xm0d1myfvzhr9amqqs";
+    rev = "fa8646daeb19dfd12c181f7d19de708d623704c0";
+    sha256 = "17m9rmnnqyyzsnnxcdl8258hjmw16nxbj1n1lr7fj3kmcs189iig";
   };
 
   makeFlags = [ ''prefix=$(out)'' ]

From 5efc5a4ede9f07994f85fe8bec9d86d1943e4a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 9 Feb 2017 08:52:22 +0100
Subject: [PATCH 645/899] pydb, libclc: fixup eval after pinning to python2

---
 pkgs/development/libraries/libclc/default.nix | 2 +-
 pkgs/development/tools/pydb/default.nix       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix
index e91981c36c5..289fa20335a 100644
--- a/pkgs/development/libraries/libclc/default.nix
+++ b/pkgs/development/libraries/libclc/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   '';
 
   configurePhase = ''
-    ${python.interpreter} ./configure.py --prefix=$out
+    ${python2.interpreter} ./configure.py --prefix=$out
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/pydb/default.nix b/pkgs/development/tools/pydb/default.nix
index e71eca0a3fa..e174184835a 100644
--- a/pkgs/development/tools/pydb/default.nix
+++ b/pkgs/development/tools/pydb/default.nix
@@ -12,10 +12,10 @@ stdenv.mkDerivation {
 
   preConfigure = ''
     p="$(toPythonPath $out)"
-    configureFlags="$configureFlags --with-python=${python.interpreter} --with-site-packages=$p"
+    configureFlags="$configureFlags --with-python=${python2.interpreter} --with-site-packages=$p"
   '';
 
-  meta = { 
+  meta = {
     description = "Python debugger with GDB-like commands and Emacs bindings";
     homepage = http://bashdb.sourceforge.net/pydb/;
     license = stdenv.lib.licenses.gpl3;

From b6cc6bd0887c629b519b4481bb44f5e986d4a0e2 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <pascal.wittmann@red6-es.de>
Date: Thu, 9 Feb 2017 09:08:28 +0100
Subject: [PATCH 646/899] yodl: 3.08.01 -> 3.08.02

---
 pkgs/development/tools/misc/yodl/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix
index 9ff9b05b5ed..84e57e267c2 100644
--- a/pkgs/development/tools/misc/yodl/default.nix
+++ b/pkgs/development/tools/misc/yodl/default.nix
@@ -2,12 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "yodl-${version}";
-  version = "3.08.01";
+  version = "3.08.02";
 
-  buildInputs = [ perl icmake ];
+  nativeBuildInputs = [ icmake ];
+
+  buildInputs = [ perl ];
 
   src = fetchFromGitHub {
-    sha256 = "0sks4phdy8qf6lmbjardrk0gl4v7crr4vjdgwpkkc8d5lzvcx7j5";
+    sha256 = "0z4pjrl4bq03fxc50c9h0bnc90vqn5c2dy830mjyzjrn1ms3i003";
     rev = version;
     repo = "yodl";
     owner = "fbb-git";

From 5de04f6d5584ee8f372319636a7397539daad0e5 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <pascal.wittmann@red6-es.de>
Date: Thu, 9 Feb 2017 09:14:51 +0100
Subject: [PATCH 647/899] Revert "ocaml-lablgl: use camlp5"

This reverts commit 7a6aac90763e1c92fea53154c876e05a28067235.
---
 pkgs/development/ocaml-modules/lablgl/default.nix | 4 ++--
 pkgs/top-level/ocaml-packages.nix                 | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix
index 7fd7de1f756..c59f15c57ad 100644
--- a/pkgs/development/ocaml-modules/lablgl/default.nix
+++ b/pkgs/development/ocaml-modules/lablgl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut, camlp5 } :
+{stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut, camlp4 } :
 
 let
   pname = "lablgl";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0qabydd219i4ak7hxgc67496qnnscpnydya2m4ijn3cpbgih7zyq";
   };
 
-  buildInputs = [ ocaml findlib lablgtk freeglut camlp5 ];
+  buildInputs = [ocaml findlib lablgtk freeglut camlp4];
   propagatedBuildInputs = [ mesa ];
 
   patches = [ ./Makefile.config.patch ./META.patch ];
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index bcca2aaf0f8..73669c58b55 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -227,9 +227,7 @@ let
 
     jsonm = callPackage ../development/ocaml-modules/jsonm { };
 
-    lablgl = callPackage ../development/ocaml-modules/lablgl {
-      camlp5 = camlp5_strict;
-    };
+    lablgl = callPackage ../development/ocaml-modules/lablgl { };
 
     lablgtk_2_14 = callPackage ../development/ocaml-modules/lablgtk/2.14.0.nix {
       inherit (pkgs.gnome2) libgnomecanvas libglade gtksourceview;

From 333e36eca06f68c4670925329e6c6da9cd5c00d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 9 Feb 2017 09:40:36 +0100
Subject: [PATCH 648/899] pythonPackages.gst-python: fix hash after afd59811a1f

/cc #22549.
---
 pkgs/development/libraries/gstreamer/default.nix        | 2 ++
 pkgs/development/libraries/gstreamer/python/default.nix | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix
index 3118caffb11..76cffa89dbc 100644
--- a/pkgs/development/libraries/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/default.nix
@@ -27,4 +27,6 @@ rec {
   };
 
   gst-validate = callPackage ./validate { inherit gst-plugins-base; };
+
+  # note: gst-python is in ./python/default.nix - called under pythonPackages
 }
diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix
index 1fd346f6425..7db887e36be 100644
--- a/pkgs/development/libraries/gstreamer/python/default.nix
+++ b/pkgs/development/libraries/gstreamer/python/default.nix
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
       "${meta.homepage}/src/gst-python/${name}.tar.xz"
       "mirror://gentoo/distfiles/${name}.tar.xz"
       ];
-    sha256 = "1sljnqkxf2ix7yzghrapw5irl0rbp8aa8w2hggk7i6d9js10ls71";
+    sha256 = "bdfa2d06dfe0ce68f638b04fed6890db506416c1dcf1279e83458269d719a4e8";
   };
 
   patches = [ ./different-path-with-pygobject.patch ];

From c06b6d944641eb70a67ae30dc00b0d2ea57b5e30 Mon Sep 17 00:00:00 2001
From: Mica Semrick <mica@silentumbrella.com>
Date: Wed, 8 Feb 2017 20:14:47 -0800
Subject: [PATCH 649/899] gimp: 2.8.18 -> 2.8.20

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

diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index 4cb67cde751..8c430435dd7 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -8,7 +8,7 @@ let
   inherit (python2Packages) pygtk wrapPython python;
 in stdenv.mkDerivation rec {
   name = "gimp-${version}";
-  version = "2.8.18";
+  version = "2.8.20";
 
   # This declarations for `gimp-with-plugins` wrapper,
   # (used for determining $out/lib/gimp/${majorVersion}/ paths)
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.gimp.org/pub/gimp/v2.8/${name}.tar.bz2";
-    sha256 = "0halh6sl3d2j9gahyabj6h6r3yyldcy7sfb4qrfazpkqqr3j5p9r";
+    sha256 = "939ca1df70be865c672ffd654f4e20f188121d01601c5c90237214101533c805";
   };
 
   buildInputs =

From da5eaa3c214d4ccf03836c1a0e18fcebb298d304 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 9 Feb 2017 10:41:55 +0100
Subject: [PATCH 650/899] bind: 9.10.4-P5 -> 9.10.4-P6 for CVE-2017-3135

See https://kb.isc.org/article/AA-01453.

cc #22549
---
 pkgs/servers/dns/bind/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index fb8c9da5f8e..0741603b3ec 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, fetchurl, openssl, libtool, perl, libxml2
 , libseccomp ? null }:
 
-let version = "9.10.4-P5"; in
+let version = "9.10.4-P6"; in
 
 stdenv.mkDerivation rec {
   name = "bind-${version}";
 
   src = fetchurl {
     url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
-    sha256 = "1sqg7wg05h66vdjc8j215r04f8pg7lphkb93nsqxvzhk6r0ppi49";
+    sha256 = "0rgffdm0h6dks0np4h9q4kd8nyb3azrdxw2skqnjzd8ws78vzpx1";
   };
 
   outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];

From a4d952178cd1c22c8165f91fd998055dda41df8b Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 7 Feb 2017 19:35:52 -0800
Subject: [PATCH 651/899] mlterm: 3.7.2 -> 3.8.0

---
 pkgs/applications/misc/mlterm/default.nix     | 21 +++++----------
 .../misc/mlterm/x_shortcut.c.patch            | 26 -------------------
 2 files changed, 7 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/applications/misc/mlterm/x_shortcut.c.patch

diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix
index 9da087d4969..1317c035792 100644
--- a/pkgs/applications/misc/mlterm/default.nix
+++ b/pkgs/applications/misc/mlterm/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   name = "mlterm-${version}";
-  version = "3.7.2";
+  version = "3.8.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz";
-    sha256 = "1b24w8hfck1ylfkdz9z55vlmsb36q9iyfr0i9q9y98dfk0f0rrw8";
+    sha256 = "00dzx5rqsp73shgvn2jvgk85v3lirby06wxkqjcm1i1xwigidq3b";
   };
 
   nativeBuildInputs = [ pkgconfig autoconf ];
@@ -20,17 +20,15 @@ stdenv.mkDerivation rec {
     harfbuzz fribidi m17n_lib openssl libssh2
   ];
 
-  patches = [ ./x_shortcut.c.patch ]; #fixes numlock in 3.7.2. should be safe to remove by 3.7.3 since it's already in the trunk: https://bitbucket.org/arakiken/mlterm/commits/4820d42c7abfe1760a5ea35492c83be469c642b3
-
   #bad configure.ac and Makefile.in everywhere
   preConfigure = ''
     sed -ie 's;-L/usr/local/lib -R/usr/local/lib;;g' \
-      xwindow/libtype/Makefile.in \
       main/Makefile.in \
       tool/mlfc/Makefile.in \
       tool/mlimgloader/Makefile.in \
       tool/mlconfig/Makefile.in \
-      xwindow/libotl/Makefile.in
+      uitoolkit/libtype/Makefile.in \
+      uitoolkit/libotl/Makefile.in
     sed -ie 's;cd ..srcdir. && rm -f ...lang..gmo.*;;g' \
       tool/mlconfig/po/Makefile.in.in
     #utmp and mlterm-fb
@@ -68,14 +66,9 @@ stdenv.mkDerivation rec {
  ];
 
   postInstall = ''
-    mkdir -p "$out/share/icons/hicolor/scalable/apps"
-    cp contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg"
-
-    mkdir -p "$out/share/icons/hicolor/48x48/apps"
-    cp contrib/icon/mlterm-icon-gnome2.png "$out/share/icons/hicolor/48x48/apps/mlterm.png"
-
-    mkdir -p "$out/share/applications"
-    cp $desktopItem/share/applications/* $out/share/applications
+    install -D contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg"
+    install -D contrib/icon/mlterm-icon-gnome2.png "$out/share/icons/hicolor/48x48/apps/mlterm.png"
+    install -D -t $out/share/applications $desktopItem/share/applications/*
   '';
 
   desktopItem = makeDesktopItem rec {
diff --git a/pkgs/applications/misc/mlterm/x_shortcut.c.patch b/pkgs/applications/misc/mlterm/x_shortcut.c.patch
deleted file mode 100644
index f0f929b7965..00000000000
--- a/pkgs/applications/misc/mlterm/x_shortcut.c.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- mlterm-3.7.2/xwindow/x_shortcut.c
-+++ mlterm-3.7.2/xwindow/x_shortcut.c
-@@ -292,6 +292,11 @@
- 	/* ingoring except these masks */
- 	state &= (ModMask|ControlMask|ShiftMask|CommandMask|button_mask) ;
- 
-+	if( state & button_mask)
-+	{
-+		state &= ~Mod2Mask ;	/* XXX NumLock */
-+	}
-+
- 	if( shortcut->map[func].ksym == ksym &&
- 	    shortcut->map[func].state ==
- 	      ( state |
-@@ -318,6 +323,11 @@
- 	/* ingoring except these masks */
- 	state &= (ModMask|ControlMask|ShiftMask|CommandMask|button_mask) ;
- 
-+	if( state & button_mask)
-+	{
-+		state &= ~Mod2Mask ;	/* XXX NumLock */
-+	}
-+
- 	for( count = 0 ; count < shortcut->str_map_size ; count ++)
- 	{
-                 if( shortcut->str_map[count].ksym == ksym &&

From 60246cedc5a5c3bfd6869db722d0ecc75d6c96bb Mon Sep 17 00:00:00 2001
From: Pradeep Chhetri <pradeep@barricade.io>
Date: Thu, 9 Feb 2017 15:53:25 +0530
Subject: [PATCH 652/899] terraform: 0.8.5 -> 0.8.6 (#22584)

---
 pkgs/applications/networking/cluster/terraform/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index f9521a4dc17..8db066516c2 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "terraform-${version}";
-  version = "0.8.5";
+  version = "0.8.6";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/terraform";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "hashicorp";
     repo = "terraform";
-    sha256 = "1cxwv3652fpsbm2zk1akw356cd7w7vhny1623ighgbz9ha8gvg09";
+    sha256 = "1yrsb940xx4iqjz4s6c4dbmxzmqzffrxn6if7ywixg4dgpi279mx";
   };
 
   postInstall = ''

From bfee52a96753e6f81a9c6f6494fbc6b3bc97c7b0 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 9 Feb 2017 12:15:35 +0100
Subject: [PATCH 653/899] epiphany: 3.22.5 -> 3.22.6 for security issue

From https://bugzilla.gnome.org/show_bug.cgi?id=752738:

  The page http://whatever.com has access to saved passwords of
  https://whatever.com. This was a very bad idea: it makes it easy to
  intercept passwords stored on secure websites, especially since we
  don't require any user interaction to fill in the password.

No CVE has been assigned as of now.

cc #22549
---
 pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix b/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix
index dbb162dc432..2ec9189964a 100644
--- a/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "epiphany-3.22.5";
+  name = "epiphany-3.22.6";
 
   src = fetchurl {
     url = mirror://gnome/sources/epiphany/3.22/epiphany-3.22.5.tar.xz;
-    sha256 = "e9c307b3f53a77c16ca698fb62fbb8d9b16773702d8163d83699bd623afa6745";
+    sha256 = "0ib7z8x65gcr6vc6709df1rngcfrp3xn5ywqlrnc2xrsynrhghz9";
   };
 }

From 4b6692a510bc2993f0e6422b9ab604c4e138c0e2 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 9 Feb 2017 07:21:07 -0500
Subject: [PATCH 654/899] graphicsmagick: patch for CVE-2016-9830

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

diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index 651bfafcead..4b75d0ccc6b 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -38,6 +38,10 @@ stdenv.mkDerivation {
       url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8684.patch";
       sha256 = "1p36gpz904wnmbz1n64x4pdpg8lp9zs3gx0awklxqdvgl8m82vvy";
     })
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-7/debian/patches/CVE-2016-9830.patch";
+      sha256 = "0qh15sd7nx7vf9sld4453iml951bwsx2fx84hxc7plhds2k3gjpa";
+    })
   ];
 
   configureFlags = [

From 72af039a4d86c264adce28c4e02cc16b3718684a Mon Sep 17 00:00:00 2001
From: Pradeep Chhetri <pradeep.chhetri89@gmail.com>
Date: Thu, 9 Feb 2017 15:30:39 +0530
Subject: [PATCH 655/899] wuzz: 2017-02-05 -> 2017-02-09

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

diff --git a/pkgs/tools/networking/wuzz/default.nix b/pkgs/tools/networking/wuzz/default.nix
index 7a6e72e0f12..87b962b9154 100644
--- a/pkgs/tools/networking/wuzz/default.nix
+++ b/pkgs/tools/networking/wuzz/default.nix
@@ -2,15 +2,15 @@
 
 buildGoPackage rec {
   name = "wuzz-${version}";
-  version = "2017-02-05";
+  version = "2017-02-09";
 
   goPackagePath = "https://github.com/asciimoo/wuzz";
 
   src = fetchFromGitHub {
     owner = "asciimoo";
     repo = "wuzz";
-    rev = "45b6a64e667b3647216af68e06e253958b81b3c4";
-    sha256 = "0jjdyqh1jvfg1dg5fwwavcvkn8fkm1a44gyv35c1g5cd9gxwj8nw";
+    rev = "dd696dc6e014e08b6042a71dca600356eb3156c2";
+    sha256 = "0m7jcb6rk0cb3giz1cbfhy3h4nzjl6qrk2k6czhn9267688rznpx";
   };
 
   goDeps = ./deps.nix;

From c517e54328036ea53ab4d3db1344b145c3f36ac4 Mon Sep 17 00:00:00 2001
From: Brandon Dimcheff <bdimchef-git@wieldim.com>
Date: Wed, 8 Feb 2017 11:33:07 -0500
Subject: [PATCH 656/899] astroid: fix crash due to missing icons

Astroid was unable to run in a pure environment because it couldn't find
the necessary icons.  This fixes that issue, and was tested with
`nix-shell --pure`
---
 pkgs/applications/networking/mailreaders/astroid/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix
index 31cad15296c..173bb81fbbe 100644
--- a/pkgs/applications/networking/mailreaders/astroid/default.nix
+++ b/pkgs/applications/networking/mailreaders/astroid/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     wrapProgram "$out/bin/astroid" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:${gnome3.adwaita-icon-theme}/share"
   '';
 
   meta = {

From 92d2d74c4040a26c3a72e577c53f6e76e1198646 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 9 Feb 2017 14:44:04 +0100
Subject: [PATCH 657/899] astroid: 0.6 -> 0.7, use wrapGAppsHook

cc @bdimcheff #22559
---
 .../mailreaders/astroid/default.nix           | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix
index 173bb81fbbe..96b1b7d285e 100644
--- a/pkgs/applications/networking/mailreaders/astroid/default.nix
+++ b/pkgs/applications/networking/mailreaders/astroid/default.nix
@@ -1,31 +1,28 @@
 { stdenv, fetchFromGitHub, scons, pkgconfig, gnome3, gmime, webkitgtk24x
-  , libsass, notmuch, boost, makeWrapper }:
+, libsass, notmuch, boost, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "astroid-${version}";
-  version = "0.6";
+  version = "0.7";
 
   src = fetchFromGitHub {
     owner = "astroidmail";
     repo = "astroid";
     rev = "v${version}";
-    sha256 = "0zashjmqv8ips9q8ckyhgm9hfyf01wpgs6g21cwl05q5iklc5x7r";
+    sha256 = "0r3hqwwr68bjhqaa1r3l9brbmvdp11pf8vhsjlvm5zv520z5y1rf";
   };
 
   patches = [ ./propagate-environment.patch ];
 
-  buildInputs = [ scons pkgconfig gnome3.gtkmm gmime webkitgtk24x libsass
-                  gnome3.libpeas notmuch boost gnome3.gsettings_desktop_schemas
-                  makeWrapper ];
+  nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ];
+
+  buildInputs = [ gnome3.gtkmm gmime webkitgtk24x libsass gnome3.libpeas
+                  notmuch boost gnome3.gsettings_desktop_schemas
+                  gnome3.adwaita-icon-theme ];
 
   buildPhase = "scons --prefix=$out build";
   installPhase = "scons --prefix=$out install";
 
-  preFixup = ''
-    wrapProgram "$out/bin/astroid" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:${gnome3.adwaita-icon-theme}/share"
-  '';
-
   meta = {
     homepage = "https://astroidmail.github.io/";
     description = "GTK+ frontend to the notmuch mail system";

From 60cae1c173fdd8cfbcb4257681ed154128e3333e Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 8 Feb 2017 21:25:38 +0800
Subject: [PATCH 658/899] syncthing: 0.14.21 -> 0.14.23

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

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 59c0f6d92b0..864acacaa9f 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -6,14 +6,14 @@ let
   '';
 
 in stdenv.mkDerivation rec {
-  version = "0.14.21";
+  version = "0.14.23";
   name = "syncthing-${version}";
 
   src = fetchFromGitHub {
     owner  = "syncthing";
     repo   = "syncthing";
     rev    = "v${version}";
-    sha256 = "0gxv4r7zg2rxjj0q8iiq3p5s75kwshcy6drjv65k8p2778bbvcjl";
+    sha256 = "1himf8yhfpjsv5m068y2f6f696d7ip0jq7jmg69kn7035zlxicis";
   };
 
   buildInputs = [ go ];

From 5f3fa24a2035a43d9b77e20c08a7f07e2b45d18e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 9 Feb 2017 15:06:49 +0100
Subject: [PATCH 659/899] cygwin-iso: fix the most obvious parts of bit rot

Still doesn't build though. Is anyone still using it?
---
 .../vm/windows/cygwin-iso/default.nix             | 15 ++++++++-------
 .../vm/windows/cygwin-iso/mkclosure.py            |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix
index 625071c9c33..01884f48878 100644
--- a/pkgs/build-support/vm/windows/cygwin-iso/default.nix
+++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, runCommand, python, perl, cdrkit, pathsFromGraph
+{ stdenv, fetchurl, runCommand, python, perl, xorriso, pathsFromGraph
 , arch ? "x86_64"
 }:
 
@@ -10,10 +10,10 @@
 let
   cygPkgList = if arch == "x86_64" then fetchurl {
     url = "${mirror}/x86_64/setup.ini";
-    sha256 = "0ljsxdkx9s916wp28kcvql3bjx80zzzidan6jicby7i9s3sm96n9";
+    sha256 = "0arrxvxbl85l82iy648snx5cl952w791p45p0dfg1xpiaf96cbkj";
   } else fetchurl {
     url = "${mirror}/x86/setup.ini";
-    sha256 = "1slyj4qha7x649ggwdski9spmyrbs04z2d46vgk8krllg0kppnjv";
+    sha256 = "1fayx34868vd5h2nah7chiw65sl3i9qzrwvs7lrlv2h8k412vb69";
   };
 
   cygwinCross = (import ../../../../.. {
@@ -25,23 +25,24 @@ let
       inherit arch;
       config = "${arch}-w64-mingw32";
     };
-  }).windows.cygwinSetup.crossDrv;
+  }).windows.cygwinSetup;
 
   makeCygwinClosure = { packages, packageList }: let
     expr = import (runCommand "cygwin.nix" { buildInputs = [ python ]; } ''
       python ${./mkclosure.py} "${packages}" ${toString packageList} > "$out"
     '');
-    gen = { url, md5 }: {
+    gen = { url, hash }: {
       source = fetchurl {
         url = "${mirror}/${url}";
-        inherit md5;
+        sha512 = hash;
       };
       target = url;
     };
   in map gen expr;
 
 in import ../../../../../nixos/lib/make-iso9660-image.nix {
-  inherit stdenv perl cdrkit pathsFromGraph;
+  inherit stdenv perl xorriso pathsFromGraph;
+  syslinux = null;
   contents = [
     { source = "${cygwinCross}/bin/setup.exe";
       target = "setup.exe";
diff --git a/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py b/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py
index 48d569a6bd3..4c0d67c43ba 100644
--- a/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py
+++ b/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py
@@ -63,12 +63,12 @@ def main():
         if install_line is None:
             continue
 
-        url, size, md5 = install_line.split(' ', 2)
+        url, size, hash = install_line.split(' ', 2)
 
         pack = [
             '  {',
             '    url = "{0}";'.format(url),
-            '    md5 = "{0}";'.format(md5),
+            '    hash = "{0}";'.format(hash),
             '  }',
         ];
         sys.stdout.write('\n'.join(pack) + '\n')

From f800a4b1976e90f41e67eb3e7a89c25890ea7b11 Mon Sep 17 00:00:00 2001
From: Stefan Siegl <stesie@brokenpipe.de>
Date: Thu, 9 Feb 2017 15:17:35 +0100
Subject: [PATCH 660/899] tomboy: init at 1.15.7 (#22589)

---
 lib/maintainers.nix                       |  1 +
 pkgs/applications/misc/tomboy/default.nix | 41 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 3 files changed, 44 insertions(+)
 create mode 100644 pkgs/applications/misc/tomboy/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 98cbc93bcd5..50b6d032a52 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -461,6 +461,7 @@
   SShrike = "Severen Redwood <severen@shrike.me>";
   stephenmw = "Stephen Weinberg <stephen@q5comm.com>";
   sternenseemann = "Lukas Epple <post@lukasepple.de>";
+  stesie = "Stefan Siegl <stesie@brokenpipe.de>";
   steveej = "Stefan Junker <mail@stefanjunker.de>";
   swarren83 = "Shawn Warren <shawn.w.warren@gmail.com>";
   swistak35 = "Rafał Łasocha <me@swistak35.com>";
diff --git a/pkgs/applications/misc/tomboy/default.nix b/pkgs/applications/misc/tomboy/default.nix
new file mode 100644
index 00000000000..5d03989a39e
--- /dev/null
+++ b/pkgs/applications/misc/tomboy/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, itstool, intltool, pkgconfig
+, libxml2, gnome2, atk, gtk2, glib
+, mono, mono-addins, dbus-sharp-2_0, dbus-sharp-glib-2_0, gnome-sharp, gtk-sharp-2_0
+, makeWrapper, lib}:
+
+let
+  version = "1.15.7";
+in
+
+stdenv.mkDerivation {
+  name = "tomboy-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/tomboy-notes/tomboy/releases/download/${version}/tomboy-${version}.tar.xz";
+    sha256 = "1i6sv6w2ms2x0nkgxq11agljiyg0yl4x2rzmcyvs2hxyf574hd1y";
+  };
+
+  buildInputs = [ itstool intltool pkgconfig
+    libxml2 gnome2.GConf atk gtk2
+    mono mono-addins dbus-sharp-2_0 dbus-sharp-glib-2_0 gnome-sharp gtk-sharp-2_0
+    makeWrapper ];
+
+  postInstall = ''
+    makeWrapper "${mono}/bin/mono" "$out/bin/tomboy" \
+      --add-flags "$out/lib/tomboy/Tomboy.exe" \
+      --prefix MONO_GAC_PREFIX : ${dbus-sharp-2_0} \
+      --prefix MONO_GAC_PREFIX : ${dbus-sharp-glib-2_0} \
+      --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \
+      --prefix MONO_GAC_PREFIX : ${gnome-sharp} \
+      --prefix MONO_GAC_PREFIX : ${mono-addins} \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gtk-sharp-2_0 gtk-sharp-2_0.gtk gnome2.GConf ]}
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://wiki.gnome.org/Apps/Tomboy";
+    description = "A simple note-taking application with synchronization";
+    platforms = platforms.linux;
+    license = stdenv.lib.licenses.lgpl2;
+    maintainers = with maintainers; [ stesie ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b8719d7a739..f8fff78335a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18030,6 +18030,8 @@ with pkgs;
 
   tomb = callPackage ../os-specific/linux/tomb {};
 
+  tomboy = callPackage ../applications/misc/tomboy {};
+
   imatix_gsl = callPackage ../development/tools/imatix_gsl {};
 
   iterm2 = callPackage ../applications/misc/iterm2 {};

From 768c970c8d339f76947976c31ad2c8723247a8f3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 9 Feb 2017 15:11:34 +0100
Subject: [PATCH 661/899] python-requests2: use system-wide CA bundle rather
 than our own

This allows the library to interact gracefully with additional certificates
users might have configured in /etc/ssl/certs/ca-certificates.crt via NixOS.
---
 ...y-use-system-wide-cert-bundle-from-N.patch | 43 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 +-
 2 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/python-modules/requests/0001-requests-certs.py-use-system-wide-cert-bundle-from-N.patch

diff --git a/pkgs/development/python-modules/requests/0001-requests-certs.py-use-system-wide-cert-bundle-from-N.patch b/pkgs/development/python-modules/requests/0001-requests-certs.py-use-system-wide-cert-bundle-from-N.patch
new file mode 100644
index 00000000000..e27a7783955
--- /dev/null
+++ b/pkgs/development/python-modules/requests/0001-requests-certs.py-use-system-wide-cert-bundle-from-N.patch
@@ -0,0 +1,43 @@
+From f04105df552309880ede3176c48930762843ea8d Mon Sep 17 00:00:00 2001
+From: Peter Simons <simons@cryp.to>
+Date: Thu, 9 Feb 2017 15:06:36 +0100
+Subject: [PATCH] requests/certs.py: use system-wide cert bundle from NixOS
+ rather than our own
+
+---
+ requests/certs.py | 17 ++++-------------
+ 1 file changed, 4 insertions(+), 13 deletions(-)
+
+diff --git a/requests/certs.py b/requests/certs.py
+index f922b99d..0209ecc2 100644
+--- a/requests/certs.py
++++ b/requests/certs.py
+@@ -5,21 +5,12 @@
+ requests.certs
+ ~~~~~~~~~~~~~~
+ 
+-This module returns the preferred default CA certificate bundle.
+-
+-If you are packaging Requests, e.g., for a Linux distribution or a managed
+-environment, you can change the definition of where() to return a separately
+-packaged CA bundle.
++This module returns the preferred default CA certificate bundle (for NixOS).
+ """
+-import os.path
+ 
+-try:
+-    from certifi import where
+-except ImportError:
+-    def where():
+-        """Return the preferred certificate bundle."""
+-        # vendored bundle inside Requests
+-        return os.path.join(os.path.dirname(__file__), 'cacert.pem')
++def where():
++    """Return the preferred certificate bundle."""
++    return "/etc/ssl/certs/ca-certificates.crt"
+ 
+ if __name__ == '__main__':
+     print(where())
+-- 
+2.11.1
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bafbb2441af..f0093ea3cd9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22082,7 +22082,6 @@ in {
     };
   };
 
-
   requests = buildPythonPackage rec {
     name = "requests-1.2.3";
     disabled = !pythonOlder "3.4";
@@ -22098,7 +22097,6 @@ in {
     };
   };
 
-
   requests2 = buildPythonPackage rec {
     name = "requests-${version}";
     version = "2.13.0";
@@ -22108,6 +22106,8 @@ in {
       sha256 = "5722cd09762faa01276230270ff16af7acf7c5c45d623868d9ba116f15791ce8";
     };
 
+    patches = [../development/python-modules/requests/0001-requests-certs.py-use-system-wide-cert-bundle-from-N.patch];
+
     nativeBuildInputs = [ self.pytest ];
     # sadly, tests require networking
     doCheck = false;

From d58a20aa67cb23823b44a70b382dcfba2c813393 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Thu, 9 Feb 2017 22:29:42 +0800
Subject: [PATCH 662/899] dropbox: 18.4.32 -> 19.4.13 (#22545)

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

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 60bcadf7463..a083b17dcb0 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -23,11 +23,11 @@
 let
   # NOTE: When updating, please also update in current stable,
   # as older versions stop working
-  version = "18.4.32";
+  version = "19.4.13";
   sha256 =
     {
-      "x86_64-linux" = "0rm91gic6qwlvkclhwpw9mhsb1l9qdxqi7kyvn5ij6a978c70k5r";
-      "i686-linux"   = "0xzk4hxykacvrym8ls8q4zv2277adg6b5m7zmncmfwb6igx4ipap";
+      "x86_64-linux" = "06lgmjj204xpid35cqrp2msasg4s4w6lf1zpz1lnk3f9x6q10254";
+      "i686-linux"   = "1kdj3c5s8s4smd52p2mqbzjsk68a9cd5f8x92xgsx9zzdzjqmagl";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =

From c86b781c08a1f88ba1b1f9e8bd11f658deb66398 Mon Sep 17 00:00:00 2001
From: mingchuan <sifmelcara@users.noreply.github.com>
Date: Thu, 9 Feb 2017 08:35:17 -0600
Subject: [PATCH 663/899] opencc: 1.0.4 -> 1.0.5 (#22516)

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

diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix
index 0e2cac36f76..7fc84e6ec74 100644
--- a/pkgs/tools/text/opencc/default.nix
+++ b/pkgs/tools/text/opencc/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, cmake, python }:
 
 stdenv.mkDerivation {
-  name = "opencc-1.0.4";
+  name = "opencc-1.0.5";
   src = fetchurl {
-    url = "https://github.com/BYVoid/OpenCC/archive/ver.1.0.4.tar.gz";
-    sha256 = "0553b7461ebd379d118d45d7f40f8a6e272750115bdbc49267595a05ee3481ac";
+    url = "https://github.com/BYVoid/OpenCC/archive/ver.1.0.5.tar.gz";
+    sha256 = "1ce1649ba280cfc88bb76e740be5f54b29a9c034400c97a3ae211c37d7030705";
   };
 
   buildInputs = [ cmake python ];

From 9cd3e57cc66312e353b673153541ba6ab66adef9 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <nixpkgs-git@spam.works>
Date: Thu, 9 Feb 2017 15:44:36 +0100
Subject: [PATCH 664/899] obname: 1.20.2 -> 1.21

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

diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix
index ef7299966a7..06c44aa2cd9 100644
--- a/pkgs/tools/backup/obnam/default.nix
+++ b/pkgs/tools/backup/obnam/default.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "obnam-${version}";
-  version = "1.20.2";
+  version = "1.21";
 
   src = fetchurl rec {
     url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz";
-    sha256 = "0r8gngjir9pinj5vp2aq326g74wnhv075n8y9i0hgc5cfvckjjmq";
+    sha256 = "0qlipsq50hca71zc0dp1mg9zs12qm0sbblw7qfzl0hj6mk2rv1by";
   };
 
   buildInputs = [ pythonPackages.sphinx attr ];
@@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec {
   doCheck = false;
 
   meta = {
-    homepage = http://liw.fi/obnam/;
+    homepage = http://obnam.org;
     description = "Backup program supporting deduplication, compression and encryption";
     maintainers = [ stdenv.lib.maintainers.rickynils ];
     platforms = stdenv.lib.platforms.linux;

From 7c435a82ceed77fd6121ff6ef86e4399a748d201 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 8 Feb 2017 22:38:25 +0800
Subject: [PATCH 665/899] dropbox: works with qt 5.6

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8fff78335a..ddfb0c42e59 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14996,7 +14996,7 @@ with pkgs;
   bittorrentSync14 = callPackage ../applications/networking/bittorrentsync/1.4.x.nix { };
   bittorrentSync20 = callPackage ../applications/networking/bittorrentsync/2.0.x.nix { };
 
-  dropbox = qt55.callPackage ../applications/networking/dropbox { };
+  dropbox = qt5.callPackage ../applications/networking/dropbox { };
 
   dropbox-cli = callPackage ../applications/networking/dropbox-cli { };
 

From 487229654ed2dde979ffdd8c19580d47c425a1a3 Mon Sep 17 00:00:00 2001
From: Fernando J Pando <fernando.pando@stelligent.com>
Date: Thu, 9 Feb 2017 10:08:32 -0500
Subject: [PATCH 666/899] incremental: init 16.10.1

Tested on NixOS unstable
---
 .../python-modules/incremental/default.nix    | 19 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/python-modules/incremental/default.nix

diff --git a/pkgs/development/python-modules/incremental/default.nix b/pkgs/development/python-modules/incremental/default.nix
new file mode 100644
index 00000000000..b8565a8b758
--- /dev/null
+++ b/pkgs/development/python-modules/incremental/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, buildPythonPackage, fetchurl }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "incremental";
+  version = "16.10.1";
+
+  src = fetchurl {
+    url = "mirror://pypi/i/${pname}/${name}.tar.gz";
+    sha256 = "0hh382gsj5lfl3fsabblk2djngl4n5yy90xakinasyn41rr6pb8l";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://github.com/twisted/treq;
+    description = "Incremental is a small library that versions your Python projects";
+    license = licenses.mit;
+    maintainers = with maintainers; [ nand0p ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 84971210b6c..40fda8e7a8b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -31906,6 +31906,8 @@ EOF
     };
   };
 
+  incremental = callPackage ../development/python-modules/incremental { };
+
 });
 
 in fix' (extends overrides packages)

From 6fc34fd48a01840fb6b11f6927145509736ec716 Mon Sep 17 00:00:00 2001
From: Fernando J Pando <fernando.pando@stelligent.com>
Date: Mon, 6 Feb 2017 15:27:24 -0500
Subject: [PATCH 667/899] treq: init 16.12.1

Tested on NixOS unstable
---
 .../python-modules/treq/default.nix           | 51 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/development/python-modules/treq/default.nix

diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix
new file mode 100644
index 00000000000..37f9e3324c7
--- /dev/null
+++ b/pkgs/development/python-modules/treq/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, buildPythonPackage, service-identity, requests2,
+  six, mock, twisted, incremental, coreutils, gnumake, pep8, sphinx,
+  openssl, pyopenssl }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "treq";
+  version = "16.12.0";
+
+  src = fetchurl {
+    url = "mirror://pypi/t/${pname}/${name}.tar.gz";
+    sha256 = "1aci3f3rmb5mdf4s6s4k4kghmnyy784cxgi3pz99m5jp274fs25h";
+  };
+
+  buildInputs = [
+    pep8
+    mock
+  ];
+
+  propagatedBuildInputs = [
+    service-identity
+    requests2
+    twisted
+    incremental
+    sphinx
+    six
+    openssl
+    pyopenssl
+  ];
+
+  checkPhase = ''
+    ${pep8}/bin/pep8 --ignore=E902 treq
+    trial treq
+  '';
+
+  doCheck = false;
+  # Failure: twisted.web._newclient.RequestTransmissionFailed: [<twisted.python.failure.Failure OpenSSL.SSL.Error: [('SSL routines', 'ssl3_get_server_certificate', 'certificate verify failed')]>]
+
+  postBuild = ''
+    ${coreutils}/bin/mkdir -pv treq
+    ${coreutils}/bin/echo "${version}" | ${coreutils}/bin/tee treq/_version
+    cd docs && ${gnumake}/bin/make html && cd ..
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://github.com/twisted/treq;
+    description = "A requests-like API built on top of twisted.web's Agent";
+    license = licenses.mit;
+    maintainers = with maintainers; [ nand0p ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 40fda8e7a8b..4e0d235caa5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -31908,6 +31908,8 @@ EOF
 
   incremental = callPackage ../development/python-modules/incremental { };
 
+  treq = callPackage ../development/python-modules/treq { };
+
 });
 
 in fix' (extends overrides packages)

From ae33b4673de75b0555d3981e675415ebc2231987 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Mon, 30 Jan 2017 02:31:25 +0100
Subject: [PATCH 668/899] wine: 1.8.6 -> 2.0

---
 pkgs/misc/emulators/wine/sources.nix | 45 +++++++++++-----------------
 1 file changed, 18 insertions(+), 27 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 6a87ff395b3..e86c6bef05a 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -6,34 +6,11 @@ let fetchurl = args@{url, sha256, ...}:
 in rec {
 
   stable = fetchurl rec {
-    version = "1.8.6";
-    url = "https://dl.winehq.org/wine/source/1.8/wine-${version}.tar.bz2";
-    sha256 = "1lq6770pkv3342ss2ih18s2hw6i1srbcfg3mljwalqrvxfb7hydi";
+    version = "2.0";
+    url = "https://dl.winehq.org/wine/source/2.0/wine-${version}.tar.bz2";
+    sha256 = "1ik6q0h3ph3jizmp7bxhf6kcm1pzrdrn2m0yf2x86slv2aigamlp";
 
     ## see http://wiki.winehq.org/Gecko
-    gecko32 = fetchurl rec {
-      version = "2.40";
-      url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86.msi";
-      sha256 = "00nkaxhb9dwvf53ij0q75fb9fh7pf43hmwx6rripcax56msd2a8s";
-    };
-    gecko64 = fetchurl rec {
-      version = "2.40";
-      url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86_64.msi";
-      sha256 = "0c4jikfzb4g7fyzp0jcz9fk2rpdl1v8nkif4dxcj28nrwy48kqn3";
-    };
-    ## see http://wiki.winehq.org/Mono
-    mono = fetchurl rec {
-      version = "4.6.3";
-      url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi";
-      sha256 = "1f98xwgv665zb9cwc5zphcdbffyh3sm26h62hzca6zlcwy5fi0zq";
-    };
-  };
-
-  unstable = fetchurl rec {
-    version = "2.0-rc3";
-    url = "https://dl.winehq.org/wine/source/2.0/wine-${version}.tar.bz2";
-    sha256 = "0sq8li7p30h2a5bbpv27vxpzihr8h890qm78nq21fnh0zflg8x8y";
-    inherit (stable) mono;
     gecko32 = fetchurl rec {
       version = "2.47";
       url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86.msi";
@@ -44,11 +21,25 @@ in rec {
       url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86_64.msi";
       sha256 = "0zaagqsji6zaag92fqwlasjs8v9hwjci5c2agn9m7a8fwljylrf5";
     };
+
+    ## see http://wiki.winehq.org/Mono
+    mono = fetchurl rec {
+      version = "4.6.4";
+      url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi";
+      sha256 = "0lj1rhp9s8aaxd6764mfvnyswwalafaanz80vxg3badrfy0xbdwi";
+    };
+  };
+
+  unstable = fetchurl rec {
+    version = "2.0";
+    url = "https://dl.winehq.org/wine/source/2.0/wine-${version}.tar.bz2";
+    sha256 = "1ik6q0h3ph3jizmp7bxhf6kcm1pzrdrn2m0yf2x86slv2aigamlp";
+    inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "1nk8s54nrlws0d8wpyj1vv2z0l2jansn990xw73v15wzwc3j9p6l";
+    sha256 = "02jrdm49zlc0f357m0z65pilmg4lxh16va32ll3p4y8vr13nwawk";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";

From a9c347b9e378de79fb3b901a9cbdb42e83a1c408 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 8 Feb 2017 04:09:48 +0100
Subject: [PATCH 669/899] tinycc: 20160525 -> 20170108

Per
https://www.mail-archive.com/tinycc-devel@nongnu.org/msg07274.html
http://repo.or.cz/tinycc.git/commit/77d7ea04acb56f839031993c102366e30cad5c25
onward ought to be fairly stable.
---
 pkgs/development/compilers/tinycc/default.nix | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix
index 446db73bacc..d9f33bcc6b2 100644
--- a/pkgs/development/compilers/tinycc/default.nix
+++ b/pkgs/development/compilers/tinycc/default.nix
@@ -1,14 +1,11 @@
 { stdenv, fetchFromRepoOrCz, perl, texinfo }:
-
-assert (stdenv.isGlibc);
-
 with stdenv.lib;
 
 let
-  date = "20160525";
+  date = "20170108";
   version = "0.9.27pre-${date}";
-  rev = "1ca685f887310b5cbdc415cdfc3a578dbc8d82d8";
-  sha256 = "149s847jkg2zdmk09h0cp0q69m8kxxci441zyw8b08fy9b87ayd8";
+  rev = "5420bb8a67f5f782ac49c90afb7da178a60c448a";
+  sha256 = "0gf1ys4vv5qfkh6462fkdv44mz5chhrchlvgcl0m44f8mm8cjwa3";
 in
 
 stdenv.mkDerivation rec {
@@ -20,8 +17,6 @@ stdenv.mkDerivation rec {
     inherit sha256;
   };
 
-  outputs = [ "bin" "dev" "out" ];
-
   nativeBuildInputs = [ perl texinfo ];
 
   hardeningDisable = [ "fortify" ];
@@ -32,17 +27,20 @@ stdenv.mkDerivation rec {
   '';
 
   preConfigure = ''
-    configureFlagsArray+=("--elfinterp=$(cat $NIX_CC/nix-support/dynamic-linker)")
-    configureFlagsArray+=("--crtprefix=${stdenv.glibc.out}/lib")
-    configureFlagsArray+=("--sysincludepaths=${stdenv.glibc.dev}/include:{B}/include")
-    configureFlagsArray+=("--libpaths=${stdenv.glibc.out}/lib")
+    echo ${version} > VERSION
+
+    configureFlagsArray+=("--cc=cc")
+    configureFlagsArray+=("--elfinterp=$(< $NIX_CC/nix-support/dynamic-linker)")
+    configureFlagsArray+=("--crtprefix=${getLib stdenv.cc.libc}/lib")
+    configureFlagsArray+=("--sysincludepaths=${getDev stdenv.cc.libc}/include:{B}/include")
+    configureFlagsArray+=("--libpaths=${getLib stdenv.cc.libc}/lib")
   '';
 
   doCheck = true;
   checkTarget = "test";
 
   postFixup = ''
-    paxmark m $bin/bin/tcc
+    paxmark m $out/bin/tcc
   '';
 
   meta = {

From 28b5cc7dca44db6f229f5c9b8926275865446025 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 8 Feb 2017 05:16:30 +0100
Subject: [PATCH 670/899] grsecurity test: adapt to changes in tinycc outputs

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

diff --git a/nixos/tests/grsecurity.nix b/nixos/tests/grsecurity.nix
index ee9e0709e5e..d4a419fd0e3 100644
--- a/nixos/tests/grsecurity.nix
+++ b/nixos/tests/grsecurity.nix
@@ -36,7 +36,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     # paxmark actually works (otherwise, the process should be terminated)
     subtest "tcc", sub {
       $machine->execute("echo -e '#include <stdio.h>\nint main(void) { puts(\"hello\"); return 0; }' >main.c");
-      $machine->succeed("${pkgs.tinycc.bin}/bin/tcc -run main.c");
+      $machine->succeed("${pkgs.tinycc}/bin/tcc -run main.c");
     };
 
     subtest "RBAC", sub {

From 3d9017602b0f0dbe8e4c0706cda32e8f8b38311b Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 9 Feb 2017 16:21:20 +0100
Subject: [PATCH 671/899] grsecurity: overrideDerivation -> overrideAttrs

---
 pkgs/build-support/grsecurity/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix
index ccd46e20654..f1310446964 100644
--- a/pkgs/build-support/grsecurity/default.nix
+++ b/pkgs/build-support/grsecurity/default.nix
@@ -1,6 +1,4 @@
 { stdenv
-, lib
-, overrideDerivation
 
 # required for gcc plugins
 , gmp, libmpc, mpfr
@@ -19,17 +17,22 @@
 
 assert (kernel.version == grsecPatch.kver);
 
-overrideDerivation (kernel.override {
+(kernel.override {
   inherit modDirVersion;
-  kernelPatches = lib.unique ([ grsecPatch ] ++ kernelPatches ++ (kernel.kernelPatches or []));
+  # TODO: unique is a work-around
+  kernelPatches = stdenv.lib.unique ([ grsecPatch ] ++ kernelPatches ++ (kernel.kernelPatches or []));
   extraConfig = ''
     GRKERNSEC y
     PAX y
     ${extraConfig}
   '';
+
+  # Enabling grsecurity/PaX deselects several other options implicitly,
+  # causing the configfile checker to fail (when it finds that options
+  # expected to be enabled are not).
   ignoreConfigErrors = true;
-}) (attrs: {
-  nativeBuildInputs = (lib.chooseDevOutputs [ gmp libmpc mpfr ]) ++ (attrs.nativeBuildInputs or []);
+}).overrideAttrs (attrs: {
+  nativeBuildInputs = (stdenv.lib.chooseDevOutputs [ gmp libmpc mpfr ]) ++ (attrs.nativeBuildInputs or []);
   preConfigure = ''
     echo ${localver} >localversion-grsec
     ${attrs.preConfigure or ""}

From 9d8248517e7987b8ce3927dfafffb386ff7e8a71 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 9 Feb 2017 16:27:16 +0100
Subject: [PATCH 672/899] linux: 4.4.47 -> 4.4.48

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index a342f0c44f5..db5aa849f1e 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.47";
+  version = "4.4.48";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1rsdz7bqqc3vzh24ii74rwphgi317f9nadxdr2dkxfipdw0w02nf";
+    sha256 = "09c0rfm9ycyjyz0nsz34fa1cvfzx8pyzcmxhyz0dqiw6x4fqal3w";
   };
 
   kernelPatches = args.kernelPatches;

From 9dec33dc4fad68a251ace1d27fc4b17d4f885328 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 9 Feb 2017 16:27:29 +0100
Subject: [PATCH 673/899] linux: 4.9.8 -> 4.9.9

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 884adc77fd1..ac51cb73a91 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.8";
+  version = "4.9.9";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0i8f1gn7jsl0gcpa54yb3yg24j2a542qvkcc3g9baja8vprbf2qm";
+    sha256 = "1vnr6688gg8njmivdzlx21v1f3w02ahca194bjvm15apajcccd96";
   };
 
   kernelPatches = args.kernelPatches;

From 4d18d3bd879d599ff8b98152cb02633de0210977 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 9 Feb 2017 17:22:38 +0100
Subject: [PATCH 674/899] Revert "python-requests2: use system-wide CA bundle"

This reverts commit 768c970c8d339f76947976c31ad2c8723247a8f3.
Moved to staging, as it causes ~16k rebuilds.
---
 ...y-use-system-wide-cert-bundle-from-N.patch | 43 -------------------
 pkgs/top-level/python-packages.nix            |  4 +-
 2 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100644 pkgs/development/python-modules/requests/0001-requests-certs.py-use-system-wide-cert-bundle-from-N.patch

diff --git a/pkgs/development/python-modules/requests/0001-requests-certs.py-use-system-wide-cert-bundle-from-N.patch b/pkgs/development/python-modules/requests/0001-requests-certs.py-use-system-wide-cert-bundle-from-N.patch
deleted file mode 100644
index e27a7783955..00000000000
--- a/pkgs/development/python-modules/requests/0001-requests-certs.py-use-system-wide-cert-bundle-from-N.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From f04105df552309880ede3176c48930762843ea8d Mon Sep 17 00:00:00 2001
-From: Peter Simons <simons@cryp.to>
-Date: Thu, 9 Feb 2017 15:06:36 +0100
-Subject: [PATCH] requests/certs.py: use system-wide cert bundle from NixOS
- rather than our own
-
----
- requests/certs.py | 17 ++++-------------
- 1 file changed, 4 insertions(+), 13 deletions(-)
-
-diff --git a/requests/certs.py b/requests/certs.py
-index f922b99d..0209ecc2 100644
---- a/requests/certs.py
-+++ b/requests/certs.py
-@@ -5,21 +5,12 @@
- requests.certs
- ~~~~~~~~~~~~~~
- 
--This module returns the preferred default CA certificate bundle.
--
--If you are packaging Requests, e.g., for a Linux distribution or a managed
--environment, you can change the definition of where() to return a separately
--packaged CA bundle.
-+This module returns the preferred default CA certificate bundle (for NixOS).
- """
--import os.path
- 
--try:
--    from certifi import where
--except ImportError:
--    def where():
--        """Return the preferred certificate bundle."""
--        # vendored bundle inside Requests
--        return os.path.join(os.path.dirname(__file__), 'cacert.pem')
-+def where():
-+    """Return the preferred certificate bundle."""
-+    return "/etc/ssl/certs/ca-certificates.crt"
- 
- if __name__ == '__main__':
-     print(where())
--- 
-2.11.1
-
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e843588d930..3c5a9a6a57b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22082,6 +22082,7 @@ in {
     };
   };
 
+
   requests = buildPythonPackage rec {
     name = "requests-1.2.3";
     disabled = !pythonOlder "3.4";
@@ -22097,6 +22098,7 @@ in {
     };
   };
 
+
   requests2 = buildPythonPackage rec {
     name = "requests-${version}";
     version = "2.13.0";
@@ -22106,8 +22108,6 @@ in {
       sha256 = "5722cd09762faa01276230270ff16af7acf7c5c45d623868d9ba116f15791ce8";
     };
 
-    patches = [../development/python-modules/requests/0001-requests-certs.py-use-system-wide-cert-bundle-from-N.patch];
-
     nativeBuildInputs = [ self.pytest ];
     # sadly, tests require networking
     doCheck = false;

From d680f541bf7a1e369cd9faade3ed5618b5917087 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Thu, 9 Feb 2017 11:21:07 -0500
Subject: [PATCH 675/899] top-level: Hack around Nix's --arg logic not handling
 unnamed params

---
 pkgs/top-level/impure.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix
index 98094e93160..61ef729fa10 100644
--- a/pkgs/top-level/impure.nix
+++ b/pkgs/top-level/impure.nix
@@ -18,6 +18,11 @@ in
   # so we do it now.
   localSystem ? builtins.intersectAttrs { system = null; platform = null; } args
 
+, # These are needed only because nix's `--arg` command-line logic doesn't work
+  # with unnamed parameters allowed by ...
+  system ? localSystem.system
+, platform ? localSystem.platform
+
 , # Fallback: The contents of the configuration file found at $NIXPKGS_CONFIG or
   # $HOME/.config/nixpkgs/config.nix.
   config ? let

From 7a32b9669734ea5d284592f61ec922daf487ac97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Wed, 1 Feb 2017 14:31:19 +0100
Subject: [PATCH 676/899] redsocks module: initialize

redsocks module: use separate user for redsocks daemon
---
 nixos/modules/module-list.nix                 |   1 +
 .../modules/services/networking/redsocks.nix  | 270 ++++++++++++++++++
 2 files changed, 271 insertions(+)
 create mode 100644 nixos/modules/services/networking/redsocks.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 5cdcca29c89..515c732b64f 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -441,6 +441,7 @@
   ./services/networking/radicale.nix
   ./services/networking/radvd.nix
   ./services/networking/rdnssd.nix
+  ./services/networking/redsocks.nix
   ./services/networking/rpcbind.nix
   ./services/networking/sabnzbd.nix
   ./services/networking/searx.nix
diff --git a/nixos/modules/services/networking/redsocks.nix b/nixos/modules/services/networking/redsocks.nix
new file mode 100644
index 00000000000..a47a78f1005
--- /dev/null
+++ b/nixos/modules/services/networking/redsocks.nix
@@ -0,0 +1,270 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+  cfg = config.services.redsocks;
+in
+{
+  ##### interface
+  options = {
+    services.redsocks = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable redsocks.";
+      };
+
+      log_debug = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Log connection progress.";
+      };
+
+      log_info = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Log start and end of client sessions.";
+      };
+
+      log = mkOption {
+        type = types.str;
+        default = "stderr";
+        description =
+          ''
+            Where to send logs.
+
+            Possible values are:
+              - stderr
+              - file:/path/to/file
+              - syslog:FACILITY where FACILITY is any of "daemon", "local0",
+              etc.
+          '';
+      };
+
+      chroot = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description =
+          ''
+            Chroot under which to run redsocks. Log file is opened before
+            chroot, but if logging to syslog /etc/localtime may be required.
+          '';
+      };
+
+      redsocks = mkOption {
+        description =
+          ''
+            Local port to proxy associations to be performed.
+
+            The example shows how to configure a proxy to handle port 80 as HTTP
+            relay, and all other ports as HTTP connect.
+          '';
+        example = [
+          { port = 23456; proxy = "1.2.3.4:8080"; type = "http-relay";
+            redirectCondition = "--dport 80";
+            doNotRedirect = [ "-d 1.2.0.0/16" ];
+          }
+          { port = 23457; proxy = "1.2.3.4:8080"; type = "http-connect";
+            redirectCondition = true;
+            doNotRedirect = [ "-d 1.2.0.0/16" ];
+          }
+        ];
+        type = types.listOf (types.submodule { options = {
+          ip = mkOption {
+            type = types.str;
+            default = "127.0.0.1";
+            description =
+              ''
+                IP on which redsocks should listen. Defaults to 127.0.0.1 for
+                security reasons.
+              '';
+          };
+
+          port = mkOption {
+            type = types.int;
+            default = 12345;
+            description = "Port on which redsocks should listen.";
+          };
+
+          proxy = mkOption {
+            type = types.str;
+            description =
+              ''
+                Proxy through which redsocks should forward incoming traffic.
+                Example: "example.org:8080"
+              '';
+          };
+
+          type = mkOption {
+            type = types.enum [ "socks4" "socks5" "http-connect" "http-relay" ];
+            description = "Type of proxy.";
+          };
+
+          login = mkOption {
+            type = with types; nullOr str;
+            default = null;
+            description = "Login to send to proxy.";
+          };
+
+          password = mkOption {
+            type = with types; nullOr str;
+            default = null;
+            description =
+              ''
+                Password to send to proxy. WARNING, this will end up
+                world-readable in the store! Awaiting
+                https://github.com/NixOS/nix/issues/8 to be able to fix.
+              '';
+          };
+
+          disclose_src = mkOption {
+            type = types.enum [ "false" "X-Forwarded-For" "Forwarded_ip"
+                                "Forwarded_ipport" ];
+            default = "false";
+            description =
+              ''
+                Way to disclose client IP to the proxy.
+                  - "false": do not disclose
+                http-connect supports the following ways:
+                  - "X-Forwarded-For": add header "X-Forwarded-For: IP"
+                  - "Forwarded_ip": add header "Forwarded: for=IP" (see RFC7239)
+                  - "Forwarded_ipport": add header 'Forwarded: for="IP:port"'
+              '';
+          };
+
+          redirectInternetOnly = mkOption {
+            type = types.bool;
+            default = true;
+            description = "Exclude all non-globally-routable IPs from redsocks";
+          };
+
+          doNotRedirect = mkOption {
+            type = with types; listOf str;
+            default = [];
+            description =
+              ''
+                Iptables filters that if matched will get the packet off of
+                redsocks.
+              '';
+            example = [ "-d 1.2.3.4" ];
+          };
+
+          redirectCondition = mkOption {
+            type = with types; either bool str;
+            default = false;
+            description =
+              ''
+                Conditions to make outbound packets go through this redsocks
+                instance.
+
+                If set to false, no packet will be forwarded. If set to true,
+                all packets will be forwarded (except packets excluded by
+                redirectInternetOnly).
+
+                If set to a string, this is an iptables filter that will be
+                matched against packets before getting them into redsocks. For
+                example, setting it to "--dport 80" will only send
+                packets to port 80 to redsocks. Note "-p tcp" is always
+                implicitly added, as udp can only be proxied through redudp or
+                the like.
+              '';
+          };
+        };});
+      };
+
+      # TODO: Add support for redudp and dnstc
+    };
+  };
+
+  ##### implementation
+  config = let
+    redsocks_blocks = concatMapStrings (block:
+      let proxy = splitString ":" block.proxy; in
+      ''
+        redsocks {
+          local_ip = ${block.ip};
+          local_port = ${toString block.port};
+
+          ip = ${elemAt proxy 0};
+          port = ${elemAt proxy 1};
+          type = ${block.type};
+
+          ${optionalString (block.login != null) "login = \"${block.login}\";"}
+          ${optionalString (block.password != null) "password = \"${block.password}\";"}
+
+          disclose_src = ${block.disclose_src};
+        }
+      '') cfg.redsocks;
+    configfile = pkgs.writeText "redsocks.conf"
+      ''
+        base {
+          log_debug = ${if cfg.log_debug then "on" else "off" };
+          log_info = ${if cfg.log_info then "on" else "off" };
+          log = ${cfg.log};
+
+          daemon = off;
+          redirector = iptables;
+
+          user = redsocks;
+          group = redsocks;
+          ${optionalString (cfg.chroot != null) "chroot = ${cfg.chroot};"}
+        }
+
+        ${redsocks_blocks}
+      '';
+    internetOnly = [ # TODO: add ipv6-equivalent
+      "-d 0.0.0.0/8"
+      "-d 10.0.0.0/8"
+      "-d 127.0.0.0/8"
+      "-d 169.254.0.0/16"
+      "-d 172.16.0.0/12"
+      "-d 192.168.0.0/16"
+      "-d 224.168.0.0/4"
+      "-d 240.168.0.0/4"
+    ];
+    redCond = block:
+      optionalString (isString block.redirectCondition) block.redirectCondition;
+    iptables = concatImapStrings (idx: block:
+      let chain = "REDSOCKS${toString idx}"; doNotRedirect =
+        concatMapStringsSep "\n"
+          (f: "ip46tables -t nat -A ${chain} ${f} -j RETURN 2>/dev/null || true")
+          (block.doNotRedirect ++ (optionals block.redirectInternetOnly internetOnly));
+      in
+      optionalString (block.redirectCondition != false)
+        ''
+          ip46tables -t nat -F ${chain} 2>/dev/null || true
+          ip46tables -t nat -N ${chain} 2>/dev/null || true
+          ${doNotRedirect}
+          ip46tables -t nat -A ${chain} -p tcp -j REDIRECT --to-ports ${toString block.port}
+
+          # TODO: show errors, when it will be easily possible by a switch to
+          # iptables-restore
+          ip46tables -t nat -A OUTPUT -p tcp ${redCond block} -j ${chain} 2>/dev/null || true
+        ''
+    ) cfg.redsocks;
+  in
+    mkIf cfg.enable {
+      users.groups.redsocks = {};
+      users.users.redsocks = {
+        description = "Redsocks daemon";
+        group = "redsocks";
+        isSystemUser = true;
+      };
+
+      systemd.services.redsocks = {
+        description = "Redsocks";
+        after = [ "network.target" ];
+        wantedBy = [ "multi-user.target" ];
+        script = "${pkgs.redsocks}/bin/redsocks -c ${configfile}";
+      };
+
+      networking.firewall.extraCommands = iptables;
+
+      networking.firewall.extraStopCommands =
+        concatImapStringsSep "\n" (idx: block:
+          let chain = "REDSOCKS${toString idx}"; in
+          optionalString (block.redirectCondition != false)
+            "ip46tables -t nat -D OUTPUT -p tcp ${redCond block} -j ${chain} 2>/dev/null || true"
+        ) cfg.redsocks;
+    };
+}

From a0505989c98580867286cc0674f0aac58a8c3bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 9 Feb 2017 18:38:01 +0100
Subject: [PATCH 677/899] Xfce docs nitpicks

- fix validity
- XFCE -> Xfce, as that seems to be upstream preference
---
 nixos/doc/manual/configuration/xfce.xml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml
index d406616bae0..7b60493e9df 100644
--- a/nixos/doc/manual/configuration/xfce.xml
+++ b/nixos/doc/manual/configuration/xfce.xml
@@ -4,10 +4,10 @@
          version="5.0"
          xml:id="sec-xfce">
 
-    <title>XFCE Desktop Environment</title>
+    <title>Xfce Desktop Environment</title>
 
     <para>
-        To enable the XFCE Desktop Environment, set
+        To enable the Xfce Desktop Environment, set
         <programlisting>
             services.xserver.desktopManager = {
                 xfce.enable = true;
@@ -31,15 +31,16 @@
     </para>
 
     <para>
-        XFCE programs are not installed automatically.
+        Some Xfce programs are not installed automatically.
         To install them manually (system wide), put them into your
-        <literal>environment.systemPackages</literal>-
-    <para>
+        <literal>environment.systemPackages</literal>.
+	</para>
 
     <para>
-        NixOS’s default <emphasis>display manager</emphasis> (the
-        program that provides a graphical login prompt and manages the X
-        server) is SLiM. You can, for example, select KDE’s
+		NixOS’s default <emphasis>display manager</emphasis>is SLiM.
+		(DM is the program that provides a graphical login prompt
+		 and manages the X server.)
+	   	You can, for example, select KDE’s
         <command>kdm</command> instead:
         <programlisting>
             services.xserver.displayManager.kdm.enable = true;
@@ -66,7 +67,7 @@
 
         <para>
             There is no authentication agent automatically installed alongside
-            XFCE. To allow mounting of local (non-removable) filesystems, you
+            Xfce. To allow mounting of local (non-removable) filesystems, you
             will need to install one.
 
             Installing <emphasis>polkit_gnome</emphasis>, a rebuild, logout and

From ce1a3e3242f9d00d68c1c973ba902a3b6cda6218 Mon Sep 17 00:00:00 2001
From: Josef Kemetmueller <josef.kemetmueller@aon.at>
Date: Thu, 9 Feb 2017 20:38:05 +0100
Subject: [PATCH 678/899] armadillo: 7.200.2 -> 7.700.0

This release fixes compatibility with cmake 3.7.1.
Additionally I found out that armadillo only needs the hdf5-C library
and not the C++ layer.
---
 pkgs/development/libraries/armadillo/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
index 62b5ddf8011..7f173b21156 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5-cpp }:
+{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }:
 
 stdenv.mkDerivation rec {
-  version = "7.200.2";
+  version = "7.700.0";
   name = "armadillo-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
-    sha256 = "1yvx75caks477jqwx5gspi6946jialddk00wdvg6dnh5wdi2xasm";
+    sha256 = "152x274hd3f59xgd27k9d3ikwb3w62v1v5hpw4lp1yzdyy8980pr";
   };
 
-  buildInputs = [ cmake openblasCompat superlu hdf5-cpp ];
+  buildInputs = [ cmake openblasCompat superlu hdf5 ];
 
   cmakeFlags = [ "-DDETECT_HDF5=ON" ];
 
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     homepage = http://arma.sourceforge.net;
     license = licenses.mpl20;
     platforms = platforms.unix;
-    maintainers = [ maintainers.juliendehos ];
+    maintainers = with maintainers; [ juliendehos knedlsepp ];
   };
 }

From 3c9d73f100f310a5b44497b66f391422a258d41e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Thu, 9 Feb 2017 21:16:20 +0100
Subject: [PATCH 679/899] nixos, doc: named nylons

---
 nixos/doc/manual/release-notes/rl-1703.xml | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 278dc88e1de..7b288515506 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -117,6 +117,36 @@ following incompatible changes:</para>
    </para>
   </listitem>
 
+  <listitem>
+    <para>
+      <literal>service.nylon</literal> is now declared using named instances.
+      As an example:
+
+<programlisting>
+  services.nylon = {
+    enable = true;
+    acceptInterface = "br0";
+    bindInterface = "tun1";
+    port = 5912;
+  };
+</programlisting>
+
+      should be replaced with:
+
+<programlisting>
+  services.nylon.myvpn = {
+    enable = true;
+    acceptInterface = "br0";
+    bindInterface = "tun1";
+    port = 5912;
+  };
+</programlisting>
+
+      this enables you to declare a SOCKS proxy for each uplink.
+
+    </para>
+  </listitem>
+
   <listitem>
     <para><literal>overridePackages</literal> function no longer exists.
     It is replaced by <link

From 7d8a6ef1fddac18c2bdfd1d2552492c3598b14d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Thu, 9 Feb 2017 21:16:56 +0100
Subject: [PATCH 680/899] kodiPlugins.exodus: 2.0.12 -> 3.0.5

---
 pkgs/applications/video/kodi/plugins.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index c31b97bd5c5..41298269a18 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -111,11 +111,11 @@ in
 
     plugin = "exodus";
     namespace = "plugin.video.exodus";
-    version = "2.0.12";
+    version = "3.0.5";
 
     src = fetchurl {
       url = "https://offshoregit.com/${plugin}/${namespace}/${namespace}-${version}.zip";
-      sha256 = "02cdyvyxay6jiw9xj8hqnkp5w6drqj67pkh243znrsc06f26qkql";
+      sha256 = "0di34sp6y3v72l6gfhj7cvs1vljs9vf0d0x2giix3jk433cj01j0";
     };
 
     meta = with stdenv.lib; {

From bf92c7700176a9e143735ed3a5ed9f338781763e Mon Sep 17 00:00:00 2001
From: David Terry <davidterry@posteo.de>
Date: Thu, 9 Feb 2017 21:35:02 +0100
Subject: [PATCH 681/899] vscode: 1.9.0 -> 1.9.1

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

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index d1794363975..816a310f758 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,24 +2,24 @@
   makeWrapper, libXScrnSaver }:
 
 let
-  version = "1.9.0";
-  rev = "27240e71ef390bf2d66307e677c2a333cebf75af";
+  version = "1.9.1";
+  rev = "f9d0c687ff2ea7aabd85fb9a43129117c0ecf519";
   channel = "stable";
 
   # The revision can be obtained with the following command (see https://github.com/NixOS/nixpkgs/issues/22465):
   # curl -w "%{url_effective}\n" -I -L -s -S https://vscode-update.azurewebsites.net/latest/linux-x64/stable -o /dev/null
 
-  sha256 = if stdenv.system == "i686-linux"    then "05f1sk2lq2skp8fxq6q229kf89vi2sq3zz6lywq7nk81pwvp8jap"
-      else if stdenv.system == "x86_64-linux"  then "0wj17lwq8f88xvfa6wfbqm580kp0470ib2yxn15j9mv0iw7nzqry"
-      else if stdenv.system == "x86_64-darwin" then "1k067h099j6fv820nn6h4i8ax35yvd1h8f4h5216dm66cpikv7nd"
+  sha256 = if stdenv.system == "i686-linux"    then "03lv792rkb1hgn1knd8kpic7q07cd194cr4fw1bimnjblrvyy586"
+      else if stdenv.system == "x86_64-linux"  then "1vrcb4y2y83bhxx9121afwbzm8yddfin4zy3nyxfi805pjmszwjm"
+      else if stdenv.system == "x86_64-darwin" then "0s92ing4m2qyqdkpmkhl2zj40hcdsr5x764sb6zprwwhfv4npymr"
       else throw "Unsupported system: ${stdenv.system}";
 
   urlBase = "https://az764295.vo.msecnd.net/${channel}/${rev}/";
 
   urlStr = if stdenv.system == "i686-linux" then
-        urlBase + "code-${channel}-code_${version}-1486024310_i386.tar.gz"
+        urlBase + "code-${channel}-code_${version}-1486596246_i386.tar.gz"
       else if stdenv.system == "x86_64-linux" then
-        urlBase + "code-${channel}-code_${version}-1486023356_amd64.tar.gz"
+        urlBase + "code-${channel}-code_${version}-1486597190_amd64.tar.gz"
       else if stdenv.system == "x86_64-darwin" then
         urlBase + "VSCode-darwin-${channel}.zip"
       else throw "Unsupported system: ${stdenv.system}";

From 2f5fdaefec9e09b4e4f727afe9f3fb55a63aaae3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Thu, 9 Feb 2017 22:22:46 +0100
Subject: [PATCH 682/899] nixos, doc: dictd dbs move

---
 nixos/doc/manual/release-notes/rl-1703.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 7b288515506..ae8aeb6e707 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -97,6 +97,15 @@ following incompatible changes:</para>
     </para>
   </listitem>
 
+  <listitem>
+    <para>
+      Two lone top-level dict dbs moved into <literal>dictdDBs</literal>. This
+      affects: <literal>dictdWordnet</literal> which is now at
+      <literal>dictdDBs.wordnet</literal> and <literal>dictdWiktionary</literal>
+      which is now at <literal>dictdDBs.wiktionary</literal>
+    </para>
+  </listitem>
+
   <listitem>
     <para>
       Parsoid service now uses YAML configuration format.

From 3455bd6f366279fbc5f7765bc58978f60d294fcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Thu, 9 Feb 2017 12:29:47 +0100
Subject: [PATCH 683/899] android-udev-rules: 20170202 -> 20170208

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

diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix
index 51c5e3b7565..0d62f99e1e7 100644
--- a/pkgs/os-specific/linux/android-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/android-udev-rules/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "android-udev-rules-${version}";
-  version = "20170202";
+  version = "20170208";
 
   src = fetchFromGitHub {
     owner = "M0Rf30";
     repo = "android-udev-rules";
     rev = version;
-    sha256 = "0apl22i27kgwld670wrlf5lv6iknx57grjbw0x0h4q0il2k4nmn7";
+    sha256 = "0bqwb2xwwihyj8sw084qpyi8d4xx9sn7jlza6hfc57qnj4dha76w";
   };
 
   installPhase = ''

From f153a86a306ff6775a92f12b7b9f983070a97cd4 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 9 Feb 2017 22:29:03 +0100
Subject: [PATCH 684/899] postgresql: upgrades

See: https://www.postgresql.org/about/news/1733/
---
 pkgs/servers/sql/postgresql/default.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index d5ffd5361e4..a94d8d101d2 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -89,33 +89,33 @@ in {
   };
 
   postgresql92 = common {
-    version = "9.2.19";
+    version = "9.2.20";
     psqlSchema = "9.2";
-    sha256 = "1bfvx1h1baxp40y4xi88974p43vazz13mwc0h8scq3sr9wxdfa8x";
+    sha256 = "09lgvl996py3mciybnlv0hycfwfxr41n0wksb2jvxjh0hjpbv2hb";
   };
 
   postgresql93 = common {
-    version = "9.3.15";
+    version = "9.3.16";
     psqlSchema = "9.3";
-    sha256 = "0kswvs4rzcmjz12hhyi61w5x2wh4dxskar8v7rgajfm98qabmz59";
+    sha256 = "0wv8qsi0amdhcl1qvkvas3lm37w6zsi818f5fxm6n0ngr155wpw4";
   };
 
   postgresql94 = common {
-    version = "9.4.10";
+    version = "9.4.11";
     psqlSchema = "9.4";
-    sha256 = "1kvfhalf3rs59887b5qa14zp85zcnsc6pislrs0wd08rxn5nfqbh";
+    sha256 = "08wxrk8wdhnz0756dsa8jkj0pqanjfpw7w715lyv10618p853sz3";
   };
 
   postgresql95 = common {
-    version = "9.5.5";
+    version = "9.5.6";
     psqlSchema = "9.5";
-    sha256 = "157kf6mdazmxfmd11f0akya2xcz6sfgprn7yqc26dpklps855ih2";
+    sha256 = "0bz1b9r249ffjfvldaiah2g78ccwq30ddh8hdvlq61z26inmz7mv";
   };
 
   postgresql96 = common {
-    version = "9.6.1";
+    version = "9.6.2";
     psqlSchema = "9.6";
-    sha256 = "1k8zwnabsl8f7vlp3azm4lrklkb9jkaxmihqf0mc27ql9451w475";
+    sha256 = "1jahzqqw5inyvmacic2ihhj5f8z50lapci2fwws91h719ccbb1q1";
   };
 
 }

From eff30adc0daefb09690c0af5f65093a91df56487 Mon Sep 17 00:00:00 2001
From: terretta <terretta+git@gmail.com>
Date: Thu, 9 Feb 2017 17:41:55 -0500
Subject: [PATCH 685/899] awscli: 1.11.35 -> 1.11.45, botocore: 1.4.92 -> 1.5.8

Updating both at once as users expect these to stay in sync.
---
 pkgs/top-level/python-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3c5a9a6a57b..e15611d225a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1554,11 +1554,11 @@ in {
 
   awscli = buildPythonPackage rec {
     name = "awscli-${version}";
-    version = "1.11.35";
+    version = "1.11.45";
       namePrefix = "";
       src = pkgs.fetchurl {
       url = "mirror://pypi/a/awscli/${name}.tar.gz";
-      sha256 = "0k6y8cg311bqak5x9pilg80w6f76dcbzm6xcdrw6rjnk6v4xwy70";
+      sha256 = "0sv9dw4zsra8fm7ddbnwhlh80w534z4h8llz2p8asssaaj5nq2ya";
     };
 
     # No tests included
@@ -3136,11 +3136,11 @@ in {
   };
 
   botocore = buildPythonPackage rec {
-    version = "1.4.92"; # This version is required by awscli
+    version = "1.5.8"; # This version is required by awscli
     name = "botocore-${version}";
     src = pkgs.fetchurl {
       url = "mirror://pypi/b/botocore/${name}.tar.gz";
-      sha256 = "08rpsfqd2g4iqvi1id8yhmyz2mc299dnr4aikkwjm24rih75p9aj";
+      sha256 = "1qhrq2l9kvhi3gnrgwqhvy42aqbsk93j8mfr4ixqx18yqgbnylvz";
     };
 
     propagatedBuildInputs =

From b85c13a643995df92adca203121690707ec98e07 Mon Sep 17 00:00:00 2001
From: Luis Pedro Coelho <luis@luispedro.org>
Date: Tue, 3 Jan 2017 22:46:57 +0100
Subject: [PATCH 686/899] pythonPackages.jug: 1.3.0 -> 1.4.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e15611d225a..18d3b30351a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7853,7 +7853,7 @@ in {
   };
 
   jug = buildPythonPackage rec {
-    version = "1.3.0";
+    version = "1.4.0";
     name = "jug-${version}";
     buildInputs = with self; [ nose numpy ];
     propagatedBuildInputs = with self; [
@@ -7867,7 +7867,7 @@ in {
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/J/Jug/Jug-${version}.tar.gz";
-      sha256 = "1262v63f1jljfd3rqvavzc2xfcray1m7vhqav3p6wlymgd342wrl";
+      sha256 = "0s9m34k8w59k32sjcg74qqdz8r492sxhsdmlhca1z7jazdk56dzb";
     };
 
     meta = {

From efa0efa79668097de24d7dbf22b7cb454ee5f640 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 9 Feb 2017 18:22:55 -0500
Subject: [PATCH 687/899] atom: 1.13.1 -> 1.14.1

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

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 3acb64559fd..c91028b7fe4 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.13.1";
+  version = "1.14.1";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "0nkd0nrnnmln5fjs1c97dligzqp744j4y6lqanfbs9vrxms6mnq3";
+    sha256 = "0dmzqz1j2nfcm459zgfzqym26kmbspdn9lipf77aawbbn2y36xqp";
     name = "${name}.deb";
   };
 

From a5e041ac085f8b4d3aec2f68ad8fd3e96becd108 Mon Sep 17 00:00:00 2001
From: afranchuk <alex.franchuk@gmail.com>
Date: Thu, 9 Feb 2017 18:53:44 -0500
Subject: [PATCH 688/899] libreswan service: make EnvironmentFile optional
 (#22591)

Recent versions of libreswan seem to omit this file, but it may be added/changed in the future. It is silly to have the service fail because a file is missing that only enriches the environment.
---
 nixos/modules/services/networking/libreswan.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/libreswan.nix b/nixos/modules/services/networking/libreswan.nix
index 3866b216f8e..c87e738d2a2 100644
--- a/nixos/modules/services/networking/libreswan.nix
+++ b/nixos/modules/services/networking/libreswan.nix
@@ -102,7 +102,7 @@ in
       serviceConfig = {
         Type = "simple";
         Restart = "always";
-        EnvironmentFile = "${pkgs.libreswan}/etc/sysconfig/pluto";
+        EnvironmentFile = "-${pkgs.libreswan}/etc/sysconfig/pluto";
         ExecStartPre = [
           "${libexec}/addconn --config ${configFile} --checkconfig"
           "${libexec}/_stackmanager start"

From 400048926602dfe559207123267b183ac7e97c6b Mon Sep 17 00:00:00 2001
From: Adam Beckmeyer <adam_git@thebeckmeyers.xyz>
Date: Thu, 9 Feb 2017 20:27:13 +0100
Subject: [PATCH 689/899] olm: init at 2.2.1

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

diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix
new file mode 100644
index 00000000000..db4a8229064
--- /dev/null
+++ b/pkgs/development/libraries/olm/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "olm-${version}";
+  version = "2.2.1";
+
+  meta = {
+    description = "Implements double cryptographic ratchet and Megolm ratchet";
+    license = stdenv.lib.licenses.asl20;
+    homepage = "https://matrix.org/git/olm/about";
+  };
+
+  src = fetchurl {
+    url = "https://matrix.org/git/olm/snapshot/${name}.tar.gz";
+    sha256 = "1spgsjmsw8afm2hg1mrq9c7cli3p17wl0ns7qbzn0h6ksh193709";
+  };
+
+  doCheck = true;
+  checkTarget = "test";
+
+  installFlags = "PREFIX=$(out)";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8dcd5373cec..18918b7700f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8947,6 +8947,8 @@ with pkgs;
 
   ogrepaged = callPackage ../development/libraries/ogrepaged { };
 
+  olm = callPackage ../development/libraries/olm { };
+
   oniguruma = callPackage ../development/libraries/oniguruma { };
 
   openal = self.openalSoft;

From 7001a125d2411cb2e0ba1c92c2466eaaa33aaf6a Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 10 Feb 2017 03:16:10 +0100
Subject: [PATCH 690/899] lf: 2016-10-02 -> 2017-02-04

---
 pkgs/tools/misc/lf/default.nix | 9 ++++-----
 pkgs/tools/misc/lf/deps.nix    | 8 ++++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix
index 80b8457f07f..c54f8ebec0d 100644
--- a/pkgs/tools/misc/lf/default.nix
+++ b/pkgs/tools/misc/lf/default.nix
@@ -2,17 +2,16 @@
 
 buildGoPackage rec {
   name = "lf-unstable-${version}";
-  version = "2016-10-02";
-
-  goPackagePath = "github.com/gokcehan/lf";
+  version = "2017-02-04";
 
   src = fetchFromGitHub {
     owner = "gokcehan";
     repo = "lf";
-    rev = "7a851f6c720380a6b9f715542906a56334e7e98b"; # nightly
-    sha256 = "0hdxcibly3algz0hgy65xr3dxchf4aarpxdgxsgc67m1knizksjr";
+    rev = "c55c4bf254d59c4e943d5559cd6e062652751e36"; # nightly
+    sha256 = "0jq85pfhpzdplv083mxbys7pp8igcvhp4daa9dh0yn4xbd8x821d";
   };
 
+  goPackagePath = "github.com/gokcehan/lf";
   goDeps = ./deps.nix;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix
index ebd11853291..d3aff8de33c 100644
--- a/pkgs/tools/misc/lf/deps.nix
+++ b/pkgs/tools/misc/lf/deps.nix
@@ -4,8 +4,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/nsf/termbox-go";
-      rev = "b6acae516ace002cb8105a89024544a1480655a5"; # master
-      sha256 = "0zf95qdd5bif9rw03hqk87x7d905p373bvsj0bl4gi16spqjbdil";
+      rev = "abe82ce5fb7a42fbd6784a5ceb71aff977e09ed8"; # master
+      sha256 = "156i8apkga8b3272kjhapyqwspgcfkrr9kpqwc5lii43k4swghpv";
     };
   }
   {
@@ -13,8 +13,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mattn/go-runewidth";
-      rev = "d6bea18f789704b5f83375793155289da36a3c7f"; # v0.0.1
-      sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs";
+      rev = "9e777a8366cce605130a531d2cd6363d07ad7317"; # v0.0.2
+      sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb";
     };
   }
 ]

From b12564cc1b8319b317d98df03fec8ba4bbf71877 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 9 Feb 2017 21:25:03 -0500
Subject: [PATCH 691/899] nixos: update default cases from KDM/KDE4 to
 SDDM/KDE5

---
 nixos/doc/manual/configuration/modularity.xml |  5 +-
 nixos/doc/manual/configuration/x-windows.xml  |  6 +--
 nixos/doc/manual/configuration/xfce.xml       |  4 +-
 .../development/option-declarations.xml       | 48 +++++++++----------
 .../installer/tools/nixos-generate-config.pl  |  4 +-
 nixos/modules/profiles/graphical.nix          |  4 +-
 nixos/modules/services/hardware/bluetooth.nix |  2 +-
 .../services/x11/display-managers/default.nix |  2 +-
 .../modules/services/x11/terminal-server.nix  | 14 +-----
 nixos/release.nix                             |  4 +-
 nixos/tests/phabricator.nix                   |  2 +-
 nixos/tests/trac.nix                          |  2 +-
 12 files changed, 43 insertions(+), 54 deletions(-)

diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml
index 59a4e3b33ba..30da064ac57 100644
--- a/nixos/doc/manual/configuration/modularity.xml
+++ b/nixos/doc/manual/configuration/modularity.xml
@@ -36,9 +36,8 @@ latter might look like this:
 { config, pkgs, ... }:
 
 { services.xserver.enable = true;
-  services.xserver.displayManager.kdm.enable = true;
-  services.xserver.desktopManager.kde4.enable = true;
-  environment.systemPackages = [ pkgs.kde4.kscreensaver ];
+  services.xserver.displayManager.sddm.enable = true;
+  services.xserver.desktopManager.kde5.enable = true;
 }
 </programlisting>
 
diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml
index 3040839861c..93d10d19b20 100644
--- a/nixos/doc/manual/configuration/x-windows.xml
+++ b/nixos/doc/manual/configuration/x-windows.xml
@@ -25,7 +25,7 @@ Otherwise, you can only log into a plain undecorated
 <command>xterm</command> window.  Thus you should pick one or more of
 the following lines:
 <programlisting>
-services.xserver.desktopManager.kde4.enable = true;
+services.xserver.desktopManager.kde5.enable = true;
 services.xserver.desktopManager.xfce.enable = true;
 services.xserver.windowManager.xmonad.enable = true;
 services.xserver.windowManager.twm.enable = true;
@@ -35,9 +35,9 @@ services.xserver.windowManager.icewm.enable = true;
 
 <para>NixOS’s default <emphasis>display manager</emphasis> (the
 program that provides a graphical login prompt and manages the X
-server) is SLiM.  You can select KDE’s <command>kdm</command> instead:
+server) is SLiM.  You can select KDE’s <command>sddm</command> instead:
 <programlisting>
-services.xserver.displayManager.kdm.enable = true;
+services.xserver.displayManager.sddm.enable = true;
 </programlisting>
 </para>
 
diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml
index 7b60493e9df..af6278e9c92 100644
--- a/nixos/doc/manual/configuration/xfce.xml
+++ b/nixos/doc/manual/configuration/xfce.xml
@@ -41,9 +41,9 @@
 		(DM is the program that provides a graphical login prompt
 		 and manages the X server.)
 	   	You can, for example, select KDE’s
-        <command>kdm</command> instead:
+        <command>sddm</command> instead:
         <programlisting>
-            services.xserver.displayManager.kdm.enable = true;
+            services.xserver.displayManager.sddm.enable = true;
         </programlisting>
     </para>
 
diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml
index ce432a7fa6c..cab721f2e55 100644
--- a/nixos/doc/manual/development/option-declarations.xml
+++ b/nixos/doc/manual/development/option-declarations.xml
@@ -65,22 +65,22 @@ options = {
 
 </para>
 
-<section xml:id="sec-option-declarations-eot"><title>Extensible Option 
+<section xml:id="sec-option-declarations-eot"><title>Extensible Option
     Types</title>
 
-  <para>Extensible option types is a feature that allow to extend certain types 
+  <para>Extensible option types is a feature that allow to extend certain types
     declaration through multiple module files.
-    This feature only work with a restricted set of types, namely 
+    This feature only work with a restricted set of types, namely
     <literal>enum</literal> and <literal>submodules</literal> and any composed
     forms of them.</para>
 
-  <para>Extensible option types can be used for <literal>enum</literal> options 
-    that affects multiple modules, or as an alternative to related 
+  <para>Extensible option types can be used for <literal>enum</literal> options
+    that affects multiple modules, or as an alternative to related
     <literal>enable</literal> options.</para>
 
   <para>As an example, we will take the case of display managers. There is a
     central display manager module for generic display manager options and a
-    module file per display manager backend (slim, kdm, gdm ...).
+    module file per display manager backend (slim, sddm, gdm ...).
   </para>
 
   <para>There are two approach to this module structure:
@@ -96,7 +96,7 @@ options = {
   </para>
 
   <para>Both approachs have problems.</para>
-    
+
   <para>Making backends independent can quickly become hard to manage. For
     display managers, there can be only one enabled at a time, but the type
     system can not enforce this restriction as there is no relation between
@@ -108,18 +108,18 @@ options = {
     central module will require to change the central module option every time
     a new backend is added or removed.</para>
 
-  <para>By using extensible option types, it is possible to create a placeholder 
-    option in the central module (<xref linkend='ex-option-declaration-eot-service' 
-      />), and to extend it in each backend module (<xref 
-      linkend='ex-option-declaration-eot-backend-slim' />, <xref 
-      linkend='ex-option-declaration-eot-backend-kdm' />).</para>
- 
+  <para>By using extensible option types, it is possible to create a placeholder
+    option in the central module (<xref linkend='ex-option-declaration-eot-service'
+      />), and to extend it in each backend module (<xref
+      linkend='ex-option-declaration-eot-backend-slim' />, <xref
+      linkend='ex-option-declaration-eot-backend-sddm' />).</para>
+
   <para>As a result, <literal>displayManager.enable</literal> option values can
   be added without changing the main service module file and the type system
   automatically enforce that there can only be a single display manager
   enabled.</para>
 
-<example xml:id='ex-option-declaration-eot-service'><title>Extensible type 
+<example xml:id='ex-option-declaration-eot-service'><title>Extensible type
     placeholder in the service module</title>
 <screen>
 services.xserver.displayManager.enable = mkOption {
@@ -127,29 +127,29 @@ services.xserver.displayManager.enable = mkOption {
   type = with types; nullOr (enum [ ]);
 };</screen></example>
 
-<example xml:id='ex-option-declaration-eot-backend-slim'><title>Extending 
-    <literal>services.xserver.displayManager.enable</literal> in the 
+<example xml:id='ex-option-declaration-eot-backend-slim'><title>Extending
+    <literal>services.xserver.displayManager.enable</literal> in the
     <literal>slim</literal> module</title>
 <screen>
 services.xserver.displayManager.enable = mkOption {
   type = with types; nullOr (enum [ "slim" ]);
 };</screen></example>
 
-<example xml:id='ex-option-declaration-eot-backend-kdm'><title>Extending 
-    <literal>services.foo.backend</literal> in the <literal>kdm</literal> 
+<example xml:id='ex-option-declaration-eot-backend-sdm'><title>Extending
+    <literal>services.foo.backend</literal> in the <literal>sdm</literal>
     module</title>
 <screen>
 services.xserver.displayManager.enable = mkOption {
-  type = with types; nullOr (enum [ "kdm" ]);
+  type = with types; nullOr (enum [ "sddm" ]);
 };</screen></example>
 
-<para>The placeholder declaration is a standard <literal>mkOption</literal> 
-  declaration, but it is important that extensible option declarations only use 
+<para>The placeholder declaration is a standard <literal>mkOption</literal>
+  declaration, but it is important that extensible option declarations only use
   the <literal>type</literal> argument.</para>
 
-<para>Extensible option types work with any of the composed variants of 
-  <literal>enum</literal> such as 
-  <literal>with types; nullOr (enum [ "foo" "bar" ])</literal> 
+<para>Extensible option types work with any of the composed variants of
+  <literal>enum</literal> such as
+  <literal>with types; nullOr (enum [ "foo" "bar" ])</literal>
   or <literal>with types; listOf (enum [ "foo" "bar" ])</literal>.</para>
 
 </section>
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index c920a2b52d8..48f6cc76e4a 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -607,8 +607,8 @@ $bootLoaderConfig
   # services.xserver.xkbOptions = "eurosign:e";
 
   # Enable the KDE Desktop Environment.
-  # services.xserver.displayManager.kdm.enable = true;
-  # services.xserver.desktopManager.kde4.enable = true;
+  # services.xserver.displayManager.sddm.enable = true;
+  # services.xserver.desktopManager.kde5.enable = true;
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
   # users.extraUsers.guest = {
diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix
index 8ee1628f876..73dd2d4bc9f 100644
--- a/nixos/modules/profiles/graphical.nix
+++ b/nixos/modules/profiles/graphical.nix
@@ -6,8 +6,8 @@
 {
   services.xserver = {
     enable = true;
-    displayManager.kdm.enable = true;
-    desktopManager.kde4.enable = true;
+    displayManager.sddm.enable = true;
+    desktopManager.kde5.enable = true;
     synaptics.enable = true; # for touchpad support on many laptops
   };
 
diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix
index f6cf2d01d80..ef2fce613f2 100644
--- a/nixos/modules/services/hardware/bluetooth.nix
+++ b/nixos/modules/services/hardware/bluetooth.nix
@@ -22,7 +22,7 @@ in
   };
 
   ###### implementation
-  
+
   config = mkIf config.hardware.bluetooth.enable {
 
     environment.systemPackages = [ bluez-bluetooth pkgs.openobex pkgs.obexftp ];
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index c0daf30d04e..98d2d0ea834 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -1,5 +1,5 @@
 # This module declares the options to define a *display manager*, the
-# program responsible for handling X logins (such as xdm, kdm, gdb, or
+# program responsible for handling X logins (such as xdm, gdb, or
 # SLiM).  The display manager allows the user to select a *session
 # type*.  When the user logs in, the display manager starts the
 # *session script* ("xsession" below) to launch the selected session
diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix
index 785394d9648..09a7f386876 100644
--- a/nixos/modules/services/x11/terminal-server.nix
+++ b/nixos/modules/services/x11/terminal-server.nix
@@ -16,18 +16,8 @@ with lib;
     services.xserver.enable = true;
     services.xserver.videoDrivers = [];
 
-    # Enable KDM.  Any display manager will do as long as it supports XDMCP.
-    services.xserver.displayManager.kdm.enable = true;
-    services.xserver.displayManager.kdm.enableXDMCP = true;
-    services.xserver.displayManager.kdm.extraConfig =
-      ''
-        [General]
-        # We're headless, so don't bother starting an X server.
-        StaticServers=
-
-        [Xdmcp]
-        Xaccess=${pkgs.writeText "Xaccess" "localhost"}
-      '';
+    # Enable GDM.  Any display manager will do as long as it supports XDMCP.
+    services.xserver.displayManager.gdm.enable = true;
 
     systemd.sockets.terminal-server =
       { description = "Terminal Server Socket";
diff --git a/nixos/release.nix b/nixos/release.nix
index 2d78a4db973..0f298188c6c 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -325,8 +325,8 @@ in rec {
 
     kde = makeClosure ({ pkgs, ... }:
       { services.xserver.enable = true;
-        services.xserver.displayManager.kdm.enable = true;
-        services.xserver.desktopManager.kde4.enable = true;
+        services.xserver.displayManager.sddm.enable = true;
+        services.xserver.desktopManager.kde5.enable = true;
       });
 
     xfce = makeClosure ({ pkgs, ... }:
diff --git a/nixos/tests/phabricator.nix b/nixos/tests/phabricator.nix
index 3bf83ab6665..85faafd5689 100644
--- a/nixos/tests/phabricator.nix
+++ b/nixos/tests/phabricator.nix
@@ -54,7 +54,7 @@ import ./make-test.nix ({ pkgs, ... }: {
     client =
       { config, pkgs, ... }:
       { imports = [ ./common/x11.nix ];
-        services.xserver.desktopManager.kde4.enable = true;
+        services.xserver.desktopManager.kde5.enable = true;
       };
   };
 
diff --git a/nixos/tests/trac.nix b/nixos/tests/trac.nix
index e7d9759ae0c..0d56c564e18 100644
--- a/nixos/tests/trac.nix
+++ b/nixos/tests/trac.nix
@@ -45,7 +45,7 @@ import ./make-test.nix ({ pkgs, ... }: {
     client =
       { config, pkgs, ... }:
       { imports = [ ./common/x11.nix ];
-        services.xserver.desktopManager.kde4.enable = true;
+        services.xserver.desktopManager.kde5.enable = true;
       };
   };
 

From 742db3fd84e91050f6bec7e44ddc877cc23e792c Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Fri, 10 Feb 2017 01:29:24 +0100
Subject: [PATCH 692/899] pypy: enable dbm support in db dependency

fixes test breakage introduced by #21049 dca3a4e3f46a76120049aea0f16c6e45b92a6732
---
 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 18918b7700f..a6d60b776c6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5880,6 +5880,7 @@ with pkgs;
   pypy27 = callPackage ../development/interpreters/python/pypy/2.7 {
     self = pypy27;
     python = python27.override{x11Support=true;};
+    db = db.override { dbmSupport = true; };
   };
 
   python2nix = callPackage ../tools/package-management/python2nix { };

From 1fbab53a80c1a2086a1865bf0256d290aea56f39 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Thu, 9 Feb 2017 19:31:40 -0800
Subject: [PATCH 693/899] matrix-synapse: 0.19.0 -> 0.19.1

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

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index f7890aa8e3c..587ec52c421 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -24,13 +24,13 @@ let
   };
 in pythonPackages.buildPythonApplication rec {
   name = "matrix-synapse-${version}";
-  version = "0.19.0";
+  version = "0.19.1";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "02zbyfnkc8a0bmaz3ylcwc8010cy0c1vrr7k2yywv5wd3ril4cp6";
+    sha256 = "1jjfa3vigghnk201zkhp97mh25cx17gic0cjn0fgn7yxs83wrh5c";
   };
 
   patches = [ ./matrix-synapse.patch ];

From a848643709884b63441055842acf4c242f49e61a Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 8 Feb 2017 18:54:08 +0000
Subject: [PATCH 694/899] pythonPackages.lmdb: fix on python 3 and add meta

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e15611d225a..5ce0222a2cd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8175,6 +8175,16 @@ in {
       inherit pname version;
       sha256 = "01nw6r08jkipx6v92kw49z34wmwikrpvc5j9xawdiyg1n2526wrx";
     };
+
+    # Some sort of mysterious failure with lmdb.tool
+    doCheck = !isPy3k;
+
+    meta = {
+      description = "Universal Python binding for the LMDB 'Lightning' Database";
+      homepage = "https://github.com/dw/py-lmdb";
+      license = licenses.openldap;
+      maintainers = with maintainers; [ copumpkin ];
+    };
   };
 
   logilab_astng = buildPythonPackage rec {

From 03cab2d923afec294e068a30c8bdb4a851415880 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Fri, 10 Feb 2017 04:33:48 +0000
Subject: [PATCH 695/899] ecs-agent: init at 1.14.0

---
 .../virtualization/ecs-agent/default.nix      | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/applications/virtualization/ecs-agent/default.nix

diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix
new file mode 100644
index 00000000000..5b3610243be
--- /dev/null
+++ b/pkgs/applications/virtualization/ecs-agent/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, buildGoPackage }:
+
+buildGoPackage rec {
+  name    = "${pname}-${version}";
+  pname   = "amazon-ecs-agent";
+  version = "1.14.0";
+
+  goPackagePath = "github.com/aws/${pname}";
+  subPackages   = [ "agent" ];
+
+  src = fetchFromGitHub {
+    rev    = "v${version}";
+    owner  = "aws";
+    repo   = pname;
+    sha256 = "12c8l0x8pm883rlbdr1m07r0kjkzggkfz35cjqz8pzyr5ymjdrc3";
+  };
+
+  meta = with stdenv.lib; {
+    description = "The agent that runs on AWS EC2 container instances and starts containers on behalf of Amazon ECS";
+    homepage    = "https://github.com/aws/amazon-ecs-agent";
+    license     = licenses.asl20;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ copumpkin ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 18918b7700f..7aa49e26747 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12894,6 +12894,8 @@ with pkgs;
 
   eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { });
 
+  ecs-agent = callPackage ../applications/virtualization/ecs-agent { };
+
   ed = callPackage ../applications/editors/ed { };
 
   edbrowse = callPackage ../applications/editors/edbrowse { };

From a0ebb1497f46b9487c7148bb5528d21f81c82894 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Fri, 10 Feb 2017 05:37:36 +0000
Subject: [PATCH 696/899] ecs-agent NixOS module: init

A very simple skeleton for now that doesn't attempt to model any of
the agent configuration, but we can grow it later. Tested and works
on an EC2 instance with ECS.
---
 nixos/modules/module-list.nix              |  1 +
 nixos/modules/virtualisation/ecs-agent.nix | 42 ++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 nixos/modules/virtualisation/ecs-agent.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index d2d7203119a..afaaccb0156 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -645,6 +645,7 @@
   ./virtualisation/container-config.nix
   ./virtualisation/containers.nix
   ./virtualisation/docker.nix
+  ./virtualisation/ecs-agent.nix
   ./virtualisation/libvirtd.nix
   ./virtualisation/lxc.nix
   ./virtualisation/lxcfs.nix
diff --git a/nixos/modules/virtualisation/ecs-agent.nix b/nixos/modules/virtualisation/ecs-agent.nix
new file mode 100644
index 00000000000..5e28d8379cb
--- /dev/null
+++ b/nixos/modules/virtualisation/ecs-agent.nix
@@ -0,0 +1,42 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.ecs-agent;
+in {
+  options.services.ecs-agent = {
+    enable = mkEnableOption "Amazon ECS agent";
+
+    package = mkOption {
+      type = types.path;
+      description = "The ECS agent package to use";
+      default = pkgs.ecs-agent;
+    };
+
+    extra-environment = mkOption {
+      type = types.attrsOf types.str;
+      description = "The environment the ECS agent should run with. See the ECS agent documentation for keys that work here.";
+      default = {};
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    systemd.services.ecs-agent = {
+      inherit (cfg.package.meta) description;
+      after    = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      environment = cfg.extra-environment;
+
+      script = ''
+        if [ ! -z "$ECS_DATADIR" ]; then
+          echo "FOOOO"
+          mkdir -p "$ECS_DATADIR"
+        fi
+        ${cfg.package.bin}/bin/agent
+      '';
+    };
+  };
+}
+

From fc54ece4709d39a9feaa61600d23a0490ce49bd1 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 10 Feb 2017 06:48:56 +0100
Subject: [PATCH 697/899] Revert "grsecurity: overrideDerivation ->
 overrideAttrs"

This reverts commit 3d9017602b0f0dbe8e4c0706cda32e8f8b38311b.

This didn't quite work as I had expected ... While it seemed okay at
first, it fails to propagate all the attributes it used to (notably
features).  I'll revisit this later but reverting for now.
---
 pkgs/build-support/grsecurity/default.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix
index f1310446964..ccd46e20654 100644
--- a/pkgs/build-support/grsecurity/default.nix
+++ b/pkgs/build-support/grsecurity/default.nix
@@ -1,4 +1,6 @@
 { stdenv
+, lib
+, overrideDerivation
 
 # required for gcc plugins
 , gmp, libmpc, mpfr
@@ -17,22 +19,17 @@
 
 assert (kernel.version == grsecPatch.kver);
 
-(kernel.override {
+overrideDerivation (kernel.override {
   inherit modDirVersion;
-  # TODO: unique is a work-around
-  kernelPatches = stdenv.lib.unique ([ grsecPatch ] ++ kernelPatches ++ (kernel.kernelPatches or []));
+  kernelPatches = lib.unique ([ grsecPatch ] ++ kernelPatches ++ (kernel.kernelPatches or []));
   extraConfig = ''
     GRKERNSEC y
     PAX y
     ${extraConfig}
   '';
-
-  # Enabling grsecurity/PaX deselects several other options implicitly,
-  # causing the configfile checker to fail (when it finds that options
-  # expected to be enabled are not).
   ignoreConfigErrors = true;
-}).overrideAttrs (attrs: {
-  nativeBuildInputs = (stdenv.lib.chooseDevOutputs [ gmp libmpc mpfr ]) ++ (attrs.nativeBuildInputs or []);
+}) (attrs: {
+  nativeBuildInputs = (lib.chooseDevOutputs [ gmp libmpc mpfr ]) ++ (attrs.nativeBuildInputs or []);
   preConfigure = ''
     echo ${localver} >localversion-grsec
     ${attrs.preConfigure or ""}

From 53a5117cde14e1905cbe67e294f9b2b974dbe09a Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Thu, 9 Feb 2017 23:39:16 -0500
Subject: [PATCH 698/899] ycmd: use vendored python libs

YouCompleteMe needs the packages to be available in ycmd's third_party
directory, and things start getting pretty complicated when we try to
use our package libs instead of the vendored ones. We can revisit this
at a later time, but we'll need to ensure that we don't break the vim
plugin.

Tested in vim.
---
 .../tools/misc/ycmd/2-ycm-cmake.patch         | 40 +++++++++++++++++
 pkgs/development/tools/misc/ycmd/default.nix  | 43 +++++++++----------
 pkgs/top-level/all-packages.nix               |  5 ++-
 3 files changed, 64 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/tools/misc/ycmd/2-ycm-cmake.patch

diff --git a/pkgs/development/tools/misc/ycmd/2-ycm-cmake.patch b/pkgs/development/tools/misc/ycmd/2-ycm-cmake.patch
new file mode 100644
index 00000000000..76b996ec2cc
--- /dev/null
+++ b/pkgs/development/tools/misc/ycmd/2-ycm-cmake.patch
@@ -0,0 +1,40 @@
+diff --git a/cpp/ycm/CMakeLists.txt b/cpp/ycm/CMakeLists.txt
+index 2074c58e..9ecd6e57 100644
+--- a/cpp/ycm/CMakeLists.txt
++++ b/cpp/ycm/CMakeLists.txt
+@@ -366,35 +366,6 @@ if( LIBCLANG_TARGET )
+       POST_BUILD
+       COMMAND ${CMAKE_COMMAND} -E copy "${LIBCLANG_TARGET}" "$<TARGET_FILE_DIR:${PROJECT_NAME}>"
+     )
+-
+-    if( APPLE )
+-      # In OS X El Capitan, Apple introduced System Integrity Protection.
+-      # Amongst other things, this introduces features to the dynamic loader
+-      # (dyld) which cause it to "sanitise" (and complain about) embedded
+-      # LC_RPATH entries which contain @executable_path when then are loaded
+-      # into "restricted" binaries.  For our purposes, "restricted" here means
+-      # "supplied by Apple" and includes the system versions of python.  For
+-      # unknown reasons, the libclang.dylib that comes from llvm.org includes an
+-      # LC_RPATH entry '@executable_path/../lib' which causes the OS X dynamic
+-      # loader to print a cryptic warning to stderr of the form:
+-      #
+-      #    dyld: warning, LC_RPATH @executable_path/../lib in
+-      #    /path/to/ycmd/libclang.dylib being ignored in restricted program
+-      #    because of @executable_path
+-      #
+-      # In order to prevent this harmless and annoying message appearing, we
+-      # simply strip the rpath entry from the dylib.  There's no way any
+-      # @executable_path that python might have could be in any way useful to
+-      # libclang.dylib, so this seems perfectly safe.
+-      get_filename_component( LIBCLANG_TAIL ${LIBCLANG_TARGET} NAME )
+-      add_custom_command( TARGET ${PROJECT_NAME}
+-                          POST_BUILD
+-                          COMMAND install_name_tool
+-                          "-delete_rpath"
+-                          "@executable_path/../lib"
+-                          "$<TARGET_FILE_DIR:${PROJECT_NAME}>/${LIBCLANG_TAIL}"
+-                        )
+-    endif()
+   endif()
+ endif()
+ 
diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index 2153305953e..9ac227ac006 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -1,16 +1,13 @@
-{ stdenv, lib, fetchgit, cmake, llvmPackages, boost, python2Packages
+{ stdenv, lib, fetchgit, cmake, llvmPackages, boost, python
 , gocode ? null
 , godef ? null
 , rustracerd ? null
+, Cocoa ? null
 }:
 
-let
-  inherit (python2Packages) python mkPythonDerivation waitress frozendict bottle future argparse requests;
-  pathFixup =  "import os; os.environ['PATH'] = ('{0}:{1}' if os.getenv('PATH', '') != '' else '{1}').format('$program_PATH', os.getenv('PATH', ''))";
-in mkPythonDerivation rec {
+stdenv.mkDerivation rec {
   name = "ycmd-${version}";
   version = "2017-02-03";
-  namePrefix = "";
 
   src = fetchgit {
     url = "git://github.com/Valloric/ycmd.git";
@@ -18,30 +15,32 @@ in mkPythonDerivation rec {
     sha256 = "0rzxgqqqmmrv9r4k2ji074iprhw6sb0jkvh84wvi45yfyphsh0xi";
   };
 
-  buildInputs = [ cmake boost ];
-
-  propagatedBuildInputs = [ waitress frozendict bottle future argparse requests ];
+  buildInputs = [ cmake boost ]  ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
 
   buildPhase = ''
     export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped}
     ${python.interpreter} build.py --clang-completer --system-boost
   '';
 
+  patches = [ ./2-ycm-cmake.patch ];
+
   configurePhase = ":";
 
   # remove the tests
   #
-  # make __main__.py executable so mkPythonDerivation's postFixup modifies the
-  # executable (e.g. fixup PYTHONPATH)
+  # make __main__.py executable and add shebang
   #
-  # add a shebang (will be rewritten by postFixup)
+  # copy over third-party libs
+  # note: if we switch to using our packaged libs, we'll need to symlink them
+  # into the same spots, as YouCompleteMe (the vim plugin) expects those paths
+  # to be available
   #
   # symlink completion backends where ycmd expects them
   installPhase = ''
     rm -rf ycmd/tests
 
     chmod +x ycmd/__main__.py
-    sed -i "1i #!/usr/bin/env python\
+    sed -i "1i #!${python.interpreter}\
     " ycmd/__main__.py
 
     mkdir -p $out/lib/ycmd
@@ -51,7 +50,12 @@ in mkPythonDerivation rec {
     ln -s $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd
 
     mkdir -p $out/lib/ycmd/third_party/{gocode,godef,racerd/target/release}
-    cp -r third_party/JediHTTP/ $out/lib/ycmd/third_party
+
+    cp -r third_party/JediHTTP $out/lib/ycmd/third_party
+    for p in waitress frozendict bottle python-future argparse requests; do
+      cp -r third_party/$p $out/lib/ycmd/third_party
+    done
+
   '' + lib.optionalString (gocode != null) ''
     ln -s ${gocode}/bin/gocode $out/lib/ycmd/third_party/gocode
   '' + lib.optionalString (godef != null) ''
@@ -60,16 +64,9 @@ in mkPythonDerivation rec {
     ln -s ${rustracerd}/bin/racerd $out/lib/ycmd/third_party/racerd/target/release
   '';
 
-  # mkPythonDerivation will attempt to create a wrapper script (written in bash)
-  # but we don't want the indirection as several editor plugins want to invoke
-  # ycmd as `python path/to/ycmd`, which will obviously fail in that case -
-  # so we move the original file back over
-  #
-  # also fixup the argv[0] and replace __file__ with the corresponding path so
+  # fixup the argv[0] and replace __file__ with the corresponding path so
   # python won't be thrown off by argv[0]
   postFixup = ''
-    mv $out/lib/ycmd/ycmd/{.__main__.py-wrapped,__main__.py}
-
     substituteInPlace $out/lib/ycmd/ycmd/__main__.py \
       --replace $out/lib/ycmd/ycmd/__main__.py \
                 $out/bin/ycmd \
@@ -81,7 +78,7 @@ in mkPythonDerivation rec {
     description = "A code-completion and comprehension server";
     homepage = https://github.com/Valloric/ycmd;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ rasendubi ];
+    maintainers = with maintainers; [ rasendubi cstrahan ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a5f4639f016..d5a369be954 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6785,7 +6785,10 @@ with pkgs;
 
   yacc = bison;
 
-  ycmd = callPackage ../development/tools/misc/ycmd { };
+  ycmd = callPackage ../development/tools/misc/ycmd {
+    inherit (darwin.apple_sdk.frameworks) Cocoa;
+    python = python2;
+  };
 
   yodl = callPackage ../development/tools/misc/yodl { };
 

From 176a96782e62cfb3502dbd30c03223faaec453bf Mon Sep 17 00:00:00 2001
From: Remy Goldschmidt <taktoa@gmail.com>
Date: Fri, 10 Feb 2017 01:10:16 -0500
Subject: [PATCH 699/899] pdf2htmlEX: init at 0.14.6 (#22480)

---
 .../pdf2htmlEX/add-glib-cmake.patch           | 17 +++++++
 pkgs/tools/typesetting/pdf2htmlEX/default.nix | 46 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 65 insertions(+)
 create mode 100644 pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch
 create mode 100644 pkgs/tools/typesetting/pdf2htmlEX/default.nix

diff --git a/pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch b/pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch
new file mode 100644
index 00000000000..8e1d9dfc191
--- /dev/null
+++ b/pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3fdabb0..378621a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,6 +59,12 @@ include_directories(${FONTFORGE_INCLUDE_DIRS})
+ link_directories(${FONTFORGE_LIBRARY_DIRS})
+ set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} ${FONTFORGE_LIBRARIES})
+ 
++# add glib dependency
++pkg_check_modules(GLIB REQUIRED glib-2.0)
++include_directories(${GLIB_INCLUDE_DIRS})
++link_directories(${GLIB_INCLUDE_DIRS})
++set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} ${GLIB_LIBRARIES})
++
+ # debug build flags (overwrite default cmake debug flags)
+ set(CMAKE_C_FLAGS_DEBUG "-ggdb -pg")
+ set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -pg")
diff --git a/pkgs/tools/typesetting/pdf2htmlEX/default.nix b/pkgs/tools/typesetting/pdf2htmlEX/default.nix
new file mode 100644
index 00000000000..b214e986be9
--- /dev/null
+++ b/pkgs/tools/typesetting/pdf2htmlEX/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, poppler, xlibs, pcre, python, glib, fontforge-gtk, cairo, pango, openjdk8
+}:
+
+stdenv.mkDerivation rec {
+  name = "pdf2htmlEX-0.14.6";
+
+  src = fetchFromGitHub {
+    repo   = "pdf2htmlEX";
+    owner  = "coolwanglu";
+    rev    = "v0.14.6";
+    sha256 = "1nh0ab8f11fsyi4ldknlkmdzcfvm1dfh8b9bmprjgq6q0vjj7f78";
+  };
+
+  patches = [ ./add-glib-cmake.patch ];
+
+  cmakeFlags = [ "-DENABLE_SVG=ON" ];
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [
+    cmake
+    pkgconfig
+  ];
+
+  buildInputs = [
+    xlibs.libpthreadstubs
+    xlibs.libXdmcp
+    pcre
+    python
+    glib
+    cairo
+    pango
+    (poppler.override { withData = true; })
+    fontforge-gtk
+    openjdk8
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Render PDF files to beautiful HTML";
+    homepage    = "https://github.com/coolwanglu/pdf2htmlEX";
+    license     = licenses.gpl3Plus;
+    maintainers = [ maintainers.taktoa ];
+    platforms   = with platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e11b6e78f90..496d6e9e236 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3330,6 +3330,8 @@ with pkgs;
 
   pdf2djvu = callPackage ../tools/typesetting/pdf2djvu { };
 
+  pdf2htmlEX = callPackage ../tools/typesetting/pdf2htmlEX { };
+
   pdf2odt = callPackage ../tools/typesetting/pdf2odt { };
 
   pdf2svg = callPackage ../tools/graphics/pdf2svg { };

From 70046019d9a5e929eb39d69abaabf52d3595d556 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 10 Feb 2017 09:28:05 +0100
Subject: [PATCH 700/899] guitarix: use python2

---
 pkgs/applications/audio/guitarix/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index e0bca0fa1c8..a5e29a5e174 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gettext, intltool, pkgconfig, python
+{ stdenv, fetchurl, gettext, intltool, pkgconfig, python2
 , avahi, bluez, boost, eigen, fftw, glib, glib_networking
 , glibmm, gsettings_desktop_schemas, gtkmm2, libjack2
 , ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     sha256 = "1qj3adjhg511jygbjkl9k5v0gcjmg6ifc479rspfyf45m383pp3p";
   };
 
-  nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python ];
+  nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ];
 
   buildInputs = [
     avahi bluez boost eigen fftw glib glibmm glib_networking.out
@@ -35,11 +35,11 @@ stdenv.mkDerivation rec {
     "--no-faust" # todo: find out why --faust doesn't work
   ] ++ optional optimizationSupport "--optimization";
 
-  configurePhase = ''python waf configure --prefix=$out $configureFlags'';
+  configurePhase = ''python2 waf configure --prefix=$out $configureFlags'';
 
-  buildPhase = ''python waf build'';
+  buildPhase = ''python2 waf build'';
 
-  installPhase = ''python waf install'';
+  installPhase = ''python2 waf install'';
 
   meta = with stdenv.lib; {
     description = "A virtual guitar amplifier for Linux running with JACK";

From 2832472da0aa41c11fc43c87b0d168d4bb01fbde Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 10 Feb 2017 09:28:13 +0100
Subject: [PATCH 701/899] golly: use python2

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

diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix
index 40d23cc7e8a..8902bacf11c 100644
--- a/pkgs/applications/science/misc/golly/default.nix
+++ b/pkgs/applications/science/misc/golly/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, wxGTK, perl, python, zlib, mesa, libX11}:
+{stdenv, fetchurl, wxGTK, perl, python2, zlib, mesa, libX11}:
 let
   s = # Generated upstream information
   rec {
@@ -10,7 +10,7 @@ let
     sha256="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204";
   };
   buildInputs = [
-    wxGTK perl python zlib mesa libX11
+    wxGTK perl python2 zlib mesa libX11
   ];
 in
 stdenv.mkDerivation rec {
@@ -26,12 +26,12 @@ stdenv.mkDerivation rec {
   makeFlags=[
     "AM_LDFLAGS="
   ];
-  NIX_LDFLAGS="-lpython${python.majorVersion} -lperl";
+  NIX_LDFLAGS="-lpython${python2.majorVersion} -lperl";
   preConfigure=''
     export NIX_LDFLAGS="$NIX_LDFLAGS -L$(dirname "$(find ${perl} -name libperl.so)")"
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE
       -DPYTHON_SHLIB=$(basename "$(
-        readlink -f ${python}/lib/libpython*.so)")"
+        readlink -f ${python2}/lib/libpython*.so)")"
   '';
 
   meta = {

From 616f358f7e0b9473ad277229d930468730658fc1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 10 Feb 2017 09:30:24 +0100
Subject: [PATCH 702/899] hamlib: use python2

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

diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix
index 185780e3716..3ea70fd4990 100644
--- a/pkgs/development/libraries/hamlib/default.nix
+++ b/pkgs/development/libraries/hamlib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl, python, swig, gd, libxml2, tcl, libusb, pkgconfig,
+{stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb, pkgconfig,
  boost, libtool, perlPackages }:
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ppp6fc2h9d8p30j2s9wlqd620kmnny4wd8fc3jxd6gxwi4lbjm2";
   };
 
-  buildInputs = [ perl perlPackages.ExtUtilsMakeMaker python swig gd libxml2
+  buildInputs = [ perl perlPackages.ExtUtilsMakeMaker python2 swig gd libxml2
                   tcl libusb pkgconfig boost libtool ];
 
   configureFlags = [ "--with-perl-binding" "--with-python-binding"

From 81d0494390307bb19998be7b15bfe5fc5b7778d6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 10 Feb 2017 09:22:29 +0100
Subject: [PATCH 703/899] jsonnet: use emscripten build against python2

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2befce8dea7..f986f37b9b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7763,7 +7763,9 @@ with pkgs;
 
   jsoncpp = callPackage ../development/libraries/jsoncpp { };
 
-  jsonnet = callPackage ../development/compilers/jsonnet { };
+  jsonnet = callPackage ../development/compilers/jsonnet {
+    emscripten = emscripten.override {python=python2;};
+  };
 
   libjson = callPackage ../development/libraries/libjson { };
 

From bfb31d28e746931f7a4dfaf42ccf8d7c957502ee Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 10 Feb 2017 09:40:57 +0100
Subject: [PATCH 704/899] ranger: fix tests

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

diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
index 673e4b02085..9b7aeddc2ff 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -15,8 +15,13 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "14j067n1azk6vc6cxlhi5w5bsn2wcz4hypvgxc0vjl9xp5n4f0nf";
   };
 
+  checkInputs = with pythonPackages; [ pytest ];
   propagatedBuildInputs = [ file ];
 
+  checkPhase = ''
+    py.test tests
+  '';
+
   preConfigure = ''
     substituteInPlace ranger/ext/img_display.py \
       --replace /usr/lib/w3m ${w3m}/libexec/w3m

From 00105162f413ea8e8a419da0fc5b556e3737e82f Mon Sep 17 00:00:00 2001
From: Pi3r <pradermecker@yahoo.ca>
Date: Fri, 10 Feb 2017 10:01:51 +0100
Subject: [PATCH 705/899] Asciidoctor: add pygments.rb (highlighter) to Gemfile
 (#22474)

---
 pkgs/tools/typesetting/asciidoctor/Gemfile    |  1 +
 .../typesetting/asciidoctor/Gemfile.lock      | 22 +++++---
 pkgs/tools/typesetting/asciidoctor/gemset.nix | 56 +++++++++++++------
 3 files changed, 55 insertions(+), 24 deletions(-)

diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile b/pkgs/tools/typesetting/asciidoctor/Gemfile
index d382e6397e1..92abd4f5cf2 100644
--- a/pkgs/tools/typesetting/asciidoctor/Gemfile
+++ b/pkgs/tools/typesetting/asciidoctor/Gemfile
@@ -4,3 +4,4 @@ gem 'asciidoctor-diagram'
 gem 'asciidoctor-bespoke'
 gem 'asciidoctor-pdf'
 gem 'asciidoctor-latex'
+gem 'pygments.rb'
diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
index 0212db3816a..34ed4a975a1 100644
--- a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
+++ b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
@@ -2,14 +2,15 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.0.2)
-    addressable (2.4.0)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
     afm (0.2.2)
     asciidoctor (1.5.5)
     asciidoctor-bespoke (1.0.0.alpha.1)
       asciidoctor (>= 1.5.0)
       slim (~> 3.0.6)
       thread_safe (~> 0.3.5)
-    asciidoctor-diagram (1.5.2)
+    asciidoctor-diagram (1.5.4)
       asciidoctor (~> 1.5.0)
     asciidoctor-latex (1.5.0.17.dev)
       asciidoctor (~> 1.5, >= 1.5.2)
@@ -25,17 +26,18 @@ GEM
       safe_yaml (~> 1.0.4)
       thread_safe (~> 0.3.5)
       treetop (= 1.5.3)
-    concurrent-ruby (1.0.2)
-    css_parser (1.4.6)
+    concurrent-ruby (1.0.4)
+    css_parser (1.4.8)
       addressable
     hashery (2.1.2)
     htmlentities (4.3.4)
-    json (2.0.2)
+    json (2.0.3)
+    multi_json (1.12.1)
     opal (0.6.3)
       source_map
       sprockets
     pdf-core (0.6.1)
-    pdf-reader (1.4.0)
+    pdf-reader (1.4.1)
       Ascii85 (~> 1.0.0)
       afm (~> 0.2.1)
       hashery (~> 2.0)
@@ -55,6 +57,9 @@ GEM
     prawn-templates (0.0.3)
       pdf-reader (~> 1.3)
       prawn (>= 0.15.0)
+    public_suffix (2.0.5)
+    pygments.rb (1.1.1)
+      multi_json (>= 1.0.0)
     rack (2.0.1)
     ruby-rc4 (0.1.5)
     safe_yaml (1.0.4)
@@ -63,12 +68,12 @@ GEM
       tilt (>= 1.3.3, < 2.1)
     source_map (3.0.1)
       json
-    sprockets (3.7.0)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     temple (0.7.7)
     thread_safe (0.3.5)
-    tilt (2.0.5)
+    tilt (2.0.6)
     treetop (1.5.3)
       polyglot (~> 0.3)
     ttfunk (1.4.0)
@@ -82,6 +87,7 @@ DEPENDENCIES
   asciidoctor-diagram
   asciidoctor-latex
   asciidoctor-pdf
+  pygments.rb
 
 BUNDLED WITH
    1.13.6
diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/tools/typesetting/asciidoctor/gemset.nix
index 4c26c6a434a..c436d6f9751 100644
--- a/pkgs/tools/typesetting/asciidoctor/gemset.nix
+++ b/pkgs/tools/typesetting/asciidoctor/gemset.nix
@@ -2,10 +2,10 @@
   addressable = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0mpn7sbjl477h56gmxsjqb89r5s3w7vx5af994ssgc3iamvgzgvs";
+      sha256 = "1j5r0anj8m4qlf2psnldip4b8ha2bsscv11lpdgnfh4nnchzjnxw";
       type = "gem";
     };
-    version = "2.4.0";
+    version = "2.5.0";
   };
   afm = {
     source = {
@@ -42,10 +42,10 @@
   asciidoctor-diagram = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1di271v0ic6d5xkqbbwg6scjyj1ypklgy211gdmhf18xzpka3fvi";
+      sha256 = "06kqlij2yc84zqxmb39bqi9pihapgac7gxyzrwm4kxfnmfdqmxrk";
       type = "gem";
     };
-    version = "1.5.2";
+    version = "1.5.4";
   };
   asciidoctor-latex = {
     source = {
@@ -66,18 +66,18 @@
   concurrent-ruby = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1kb4sav7yli12pjr8lscv8z49g52a5xzpfg3z9h8clzw6z74qjsw";
+      sha256 = "0p7ji1h1l407kci9w4b4yspzd58ssmlx7p91npx55kw08836dlpb";
       type = "gem";
     };
-    version = "1.0.2";
+    version = "1.0.4";
   };
   css_parser = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0zsldn0ihmzl7nqk4lww9h8ijv1zb3l8g92y7b4w0da2d6cnyjw8";
+      sha256 = "1aqv5ds1109s0g76ybvvaff41a71i03fjy0ix6272r8n0gdnjc3f";
       type = "gem";
     };
-    version = "1.4.6";
+    version = "1.4.8";
   };
   hashery = {
     source = {
@@ -98,10 +98,18 @@
   json = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1lhinj9vj7mw59jqid0bjn2hlfcnq02bnvsx9iv81nl2han603s0";
+      sha256 = "0cpw154il64w6q20rrnsbjx1cdfz1yrzz1lgdbpn59lcwc6mprql";
       type = "gem";
     };
-    version = "2.0.2";
+    version = "2.0.3";
+  };
+  multi_json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk";
+      type = "gem";
+    };
+    version = "1.12.1";
   };
   opal = {
     source = {
@@ -122,10 +130,10 @@
   pdf-reader = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0j9cimzw2waic800108qmnds7w33xd9y3bdvf9qzijwv9wjv0iq1";
+      sha256 = "0ivmgm73jjk3hv7896mgld5ki8jhxdvksw766rqxp6i863y9v4jq";
       type = "gem";
     };
-    version = "1.4.0";
+    version = "1.4.1";
   };
   polyglot = {
     source = {
@@ -175,6 +183,22 @@
     };
     version = "0.0.3";
   };
+  public_suffix = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q";
+      type = "gem";
+    };
+    version = "2.0.5";
+  };
+  "pygments.rb" = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0g0ipgxqfw0vf2md3s8sqf8y7m5lxqza2gwnr05z3vrf1nc6v6hk";
+      type = "gem";
+    };
+    version = "1.1.1";
+  };
   rack = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -218,10 +242,10 @@
   sprockets = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0jzsfiladswnzbrwqfiaj1xip68y58rwx0lpmj907vvq47k87gj1";
+      sha256 = "0sv3zk5hwxyjvg7iy9sggjc7k3mfxxif7w8p260rharfyib939ar";
       type = "gem";
     };
-    version = "3.7.0";
+    version = "3.7.1";
   };
   temple = {
     source = {
@@ -242,10 +266,10 @@
   tilt = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0lgk8bfx24959yq1cn55php3321wddw947mgj07bxfnwyipy9hqf";
+      sha256 = "0qsyzq2k7blyp1rph56xczwfqi8gplns2whswyr67mdfzdi60vvm";
       type = "gem";
     };
-    version = "2.0.5";
+    version = "2.0.6";
   };
   treetop = {
     source = {

From d04ee2f91cb4413d3fd6672e75e9f9677259d501 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Fri, 10 Feb 2017 12:11:29 +0100
Subject: [PATCH 706/899] libretro: add reicast core

---
 pkgs/misc/emulators/retroarch/cores.nix | 13 +++++++++++++
 pkgs/top-level/all-packages.nix         |  1 +
 2 files changed, 14 insertions(+)

diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 259a6007975..705150d4e20 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -248,6 +248,19 @@ in
     buildPhase = "make";
   };
 
+  reicast = (mkLibRetroCore rec {
+    core = "reicast";
+    src = fetchRetro {
+      repo = core + "-emulator";
+      rev = "ed47c72cf2e124d9d753285fd61d12ea8e071d0d";
+      sha256 = "05dw7qjnprf1lw3ps0sb7sp73hsh1a27rxbwjqd26j85zr84g3r9";
+    };
+    description = "Reicast libretro port";
+    extraBuildInputs = [ mesa ];
+  }).override {
+    buildPhase = "make";
+  };
+
   scummvm = (mkLibRetroCore rec {
     core = "scummvm";
     src = fetchRetro {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 496d6e9e236..6c1d52f8c85 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15599,6 +15599,7 @@ with pkgs;
       ++ optional (cfg.enablePrboom or false) prboom
       ++ optional (cfg.enablePPSSPP or false) ppsspp
       ++ optional (cfg.enableQuickNES or false) quicknes
+      ++ optional (cfg.enableReicast or false) reicast
       ++ optional (cfg.enableScummVM or false) scummvm
       ++ optional (cfg.enableSnes9x or false) snes9x
       ++ optional (cfg.enableSnes9xNext or false) snes9x-next

From 95ee742dcdf54e2c5a65d8ed6995636661ec4936 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Fri, 10 Feb 2017 12:25:26 +0100
Subject: [PATCH 707/899] attract-mode: init at 2.2.0

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

diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/pkgs/misc/emulators/attract-mode/default.nix
new file mode 100644
index 00000000000..4b8378368a3
--- /dev/null
+++ b/pkgs/misc/emulators/attract-mode/default.nix
@@ -0,0 +1,33 @@
+{ expat, fetchFromGitHub, ffmpeg, fontconfig, freetype, libarchive, libjpeg
+, mesa, openal, pkgconfig, sfml, stdenv, zlib
+}:
+
+stdenv.mkDerivation rec {
+  name = "attract-mode-${version}";
+  version = "2.2.0";
+
+  src = fetchFromGitHub {
+    owner = "mickelson";
+    repo = "attract";
+    rev = "v${version}";
+    sha256 = "1arkfj0q3n1qbq5jwmal0kixxph8lnmv3g9bli36inab4r8zzmp8";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  patchPhase = ''
+    sed -i "s|prefix=/usr/local|prefix=$out|" Makefile
+  '';
+
+  buildInputs = [
+    expat ffmpeg fontconfig freetype libarchive libjpeg mesa openal sfml zlib
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A frontend for arcade cabinets and media PCs";
+    homepage = http://attractmode.org;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ hrdinka ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 496d6e9e236..307bd69774f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17409,6 +17409,8 @@ with pkgs;
 
   areca = callPackage ../applications/backup/areca { };
 
+  attract-mode = callPackage ../misc/emulators/attract-mode { };
+
   beep = callPackage ../misc/beep { };
 
   blackbird = callPackage ../misc/themes/blackbird { };

From de9720b65f1354a6cc9968a43b2d8ebde9710756 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Fri, 10 Feb 2017 12:48:29 +0100
Subject: [PATCH 708/899] aqemu: init at 0.9.2

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

diff --git a/pkgs/applications/virtualization/aqemu/default.nix b/pkgs/applications/virtualization/aqemu/default.nix
new file mode 100644
index 00000000000..e7cd5b7bde6
--- /dev/null
+++ b/pkgs/applications/virtualization/aqemu/default.nix
@@ -0,0 +1,26 @@
+{ cmake, fetchFromGitHub, libvncserver, qemu, qtbase, stdenv
+}:
+
+stdenv.mkDerivation rec {
+  name = "aqemu-${version}";
+  version = "0.9.2";
+
+  src = fetchFromGitHub {
+    owner = "tobimensch";
+    repo = "aqemu";
+    rev = "v${version}";
+    sha256 = "1h1mcw8x0jir5p39bs8ka0lcisiyi4jq61fsccgb9hsvl1i8fvk5";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ libvncserver qtbase qemu ];
+
+  meta = with stdenv.lib; {
+    description = "A virtual machine manager GUI for qemu";
+    homepage = https://github.com/tobimensch/aqemu;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ hrdinka ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 496d6e9e236..ce74a3fb76c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12450,6 +12450,8 @@ with pkgs;
 
   ao = callPackage ../applications/graphics/ao {};
 
+  aqemu = qt5.callPackage ../applications/virtualization/aqemu { };
+
   ardour = callPackage ../applications/audio/ardour {
     inherit (gnome2) libgnomecanvas libgnomecanvasmm;
     inherit (vamp) vampSDK;

From 3047bb2e9c514e51286aac8d421e0f549cc82239 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Fri, 10 Feb 2017 15:12:18 +0100
Subject: [PATCH 709/899] nsd: 4.1.13 -> 4.1.14

* Fix #1132 for SERVFAIL zones perform backoff, and remembers the timeout on next startup.

* Fix null memcpy for radixtree with single link element.
* Robust fix against missing master in tcp_open for xfrd.
* Fix wildcards in include: config statements with chroot enabled.
* suppress compile warning in lex files.
* Fix to try every master once, then wait for timeout or notify.
* Save backoff timeout into xfrd.state file, this file has a higher version number now. Old files are skipped silently (causes refresh) and created as new files upon exit.
* Fix restart of zone transfers when new config becomes available.
---
 pkgs/servers/dns/nsd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index 603709b31ce..89845fff9c6 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/pkgs/servers/dns/nsd/default.nix
@@ -13,11 +13,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nsd-4.1.13";
+  name = "nsd-4.1.14";
 
   src = fetchurl {
     url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz";
-    sha256 = "1bwiabj1m7h14ppsa2azw017dqkqjgdl9gmj6ghjg80146xd8p64";
+    sha256 = "bdfc61c5f3bf11febd8f4776eef1d4f2d95ed70f12f11d4eeee943c186ffd802";
   };
 
   buildInputs = [ libevent openssl ];

From 1713dae2e38cc31e5db5ea4dab728a8ce6a34092 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Fri, 10 Feb 2017 12:17:11 +0100
Subject: [PATCH 710/899] cdi2iso: init at 0.1

---
 pkgs/tools/cd-dvd/cdi2iso/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/cd-dvd/cdi2iso/default.nix

diff --git a/pkgs/tools/cd-dvd/cdi2iso/default.nix b/pkgs/tools/cd-dvd/cdi2iso/default.nix
new file mode 100644
index 00000000000..a65f2d47d8f
--- /dev/null
+++ b/pkgs/tools/cd-dvd/cdi2iso/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "cdi2iso-${version}";
+  version = "0.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/cdi2iso.berlios/${name}-src.tar.gz";
+    sha256 = "0fj2fxhpr26z649m0ph71378c41ljflpyk89g87x8r1mc4rbq3kh";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin/
+    cp cdi2iso $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A very simple utility for converting DiscJuggler images to the standard ISO-9660 format";
+    homepage = https://sourceforge.net/projects/cdi2iso.berlios;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ hrdinka ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 496d6e9e236..5dbb9174117 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1092,6 +1092,8 @@ with pkgs;
 
   cdecl = callPackage ../development/tools/cdecl { };
 
+  cdi2iso = callPackage ../tools/cd-dvd/cdi2iso { };
+
   cdrdao = callPackage ../tools/cd-dvd/cdrdao { };
 
   cdrkit = callPackage ../tools/cd-dvd/cdrkit { };

From ac1cf94ec76ba2a84c47ef3e5202f8f4e2936679 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Fri, 10 Feb 2017 17:05:43 +0100
Subject: [PATCH 711/899] pythonPackages.s3transfer: 0.1.9 -> 0.1.10

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 982c39f876d..35cb7bf8ac4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23103,12 +23103,12 @@ in {
   };
 
   s3transfer = buildPythonPackage rec {
-    version = "0.1.9";
+    version = "0.1.10";
     name = "s3transfer-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/s/s3transfer/${name}.tar.gz";
-      sha256 = "0m67nhdnp2pd11j8h4bgz63zq0mvn2f205vrxmr3my8m45kpvb8p";
+      sha256 = "1h8g9bknvxflxkpbnxyfxmk8pvgykbbk9ljdvhqh6z4vjc2926ms";
     };
 
     foo = 1;

From c0f2e89d6a2096b72697ac2b8d93c98b4eea4a94 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Fri, 10 Feb 2017 17:05:13 +0100
Subject: [PATCH 712/899] pythonPackages.boto3: 1.4.2 -> 1.4.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 35cb7bf8ac4..4e4f70a5025 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3099,13 +3099,13 @@ in {
 
   boto3 = buildPythonPackage rec {
     name = "boto3-${version}";
-    version = "1.4.2";
+    version = "1.4.4";
 
     src = pkgs.fetchFromGitHub {
       owner = "boto";
       repo  = "boto3";
       rev   = version;
-      sha256 = "19hzxqr7ba07b3zg2wsrz6ic3g7pq50rrcp4616flfgny5vw42j3";
+      sha256 = "1zngj38a2dmc02p3ha9crzv9k682f0zgyyfx1bgg8hwwrnggikwl";
     };
 
     propagatedBuildInputs = [ self.botocore self.jmespath self.s3transfer ] ++

From ee4f732633363cbe238683f836ca6e42049200f8 Mon Sep 17 00:00:00 2001
From: Evan Danaher <edanaher@edanaher.net>
Date: Fri, 10 Feb 2017 11:43:42 -0500
Subject: [PATCH 713/899] neovim-remote: add meta section.

Also add myself to maintainers; it's time to admit I'm not leaving
anytime soon ;)
---
 lib/maintainers.nix                                |  1 +
 pkgs/applications/editors/neovim/neovim-remote.nix | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 4672dc59d43..70532778201 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -138,6 +138,7 @@
   dtzWill = "Will Dietz <nix@wdtz.org>";
   e-user = "Alexander Kahl <nixos@sodosopa.io>";
   ebzzry = "Rommel Martinez <ebzzry@gmail.com>";
+  edanaher = "Evan Danaher <nixos@edanaher.net>";
   ederoyd46 = "Matthew Brown <matt@ederoyd.co.uk>";
   eduarrrd = "Eduard Bachmakov <e.bachmakov@gmail.com>";
   edwtjo = "Edward Tjörnhammar <ed@cflags.cc>";
diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix
index 2ee269156bb..487d9c842b8 100644
--- a/pkgs/applications/editors/neovim/neovim-remote.nix
+++ b/pkgs/applications/editors/neovim/neovim-remote.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages }:
 
+with stdenv.lib;
+
 pythonPackages.buildPythonPackage rec {
   name = "neovim-remote-${version}";
   version = "v1.4.0";
@@ -13,4 +15,12 @@ pythonPackages.buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [ pythonPackages.neovim ];
+
+  meta = {
+    description = "A tool that helps controlling nvim processes from a terminal";
+    homepage = https://github.com/mhinz/neovim-remote/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ edanaher ];
+    platforms = platforms.unix;
+  };
 }

From 2ead5dfe8583ca89b02fef61edd9241a5b7d3f8f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 10 Feb 2017 11:26:25 -0600
Subject: [PATCH 714/899] elpa-packages 2017-02-10

---
 pkgs/applications/editors/emacs-modes/elpa-generated.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 817d7f62924..4298f605744 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -822,10 +822,10 @@
     gnugo = callPackage ({ ascii-art-to-unicode, cl-lib ? null, elpaBuild, fetchurl, lib, xpm }:
     elpaBuild {
         pname = "gnugo";
-        version = "3.0.1";
+        version = "3.0.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gnugo-3.0.1.tar";
-          sha256 = "08z2hg9mvsxdznq027cmwhkb5i7n7s9r2kvd4jha9xskrcnzj3pp";
+          url = "https://elpa.gnu.org/packages/gnugo-3.0.2.tar";
+          sha256 = "12xm960awsn2k8ph1yibhrxdg8iz1icifdqimysg3qxljmhmnb3k";
         };
         packageRequires = [ ascii-art-to-unicode cl-lib xpm ];
         meta = {

From 9fbb76c14fae6b1b695ebffdf9eb1f90b09a9811 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 10 Feb 2017 11:29:22 -0600
Subject: [PATCH 715/899] melpa-packages 2017-02-10

---
 .../editors/emacs-modes/melpa-generated.nix   | 1087 ++++++++++-------
 1 file changed, 627 insertions(+), 460 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index a0a6b2ec53b..8dfad041b9f 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -127,12 +127,12 @@
     abl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "abl-mode";
-        version = "20170130.105";
+        version = "20170208.647";
         src = fetchFromGitHub {
           owner = "afroisalreadyinu";
           repo = "abl-mode";
-          rev = "478ad2570f763b63a7369cc9f243b4f952a546bf";
-          sha256 = "0xcj8vr9fcxf6cpck5gdb7vddlsk4vswl0wdwmxv6rwv459j5war";
+          rev = "9c928c2968d7960ef672c3312051f0fbd4a7aeb3";
+          sha256 = "0fxl67nmy6vi6viwxday4j81m9lg4l8vg6yw2phgagm4zlp65k58";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/70a52edb381daa9c4dcc9f7e511175b38fc141be/recipes/abl-mode";
@@ -737,8 +737,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "a347cda40cfd8924e86fdb597d8f2b5129697645";
-          sha256 = "02njmfl7hmdpn1wxx50vfvai5w9gkmmajydccfz4r937knr0gibq";
+          rev = "436567c1e28cce979aab7820a8fc74b5b5294218";
+          sha256 = "07w8fpnglany530jksjsl5qs9mfbc52gh6pfnqlqx6ppp01k8lw4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -754,12 +754,12 @@
     ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
     melpaBuild {
         pname = "ac-php-core";
-        version = "20170124.1452";
+        version = "20170209.2128";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "a347cda40cfd8924e86fdb597d8f2b5129697645";
-          sha256 = "02njmfl7hmdpn1wxx50vfvai5w9gkmmajydccfz4r937knr0gibq";
+          rev = "436567c1e28cce979aab7820a8fc74b5b5294218";
+          sha256 = "07w8fpnglany530jksjsl5qs9mfbc52gh6pfnqlqx6ppp01k8lw4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -1549,12 +1549,12 @@
     all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "all-the-icons";
-        version = "20170203.1928";
+        version = "20170208.433";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "all-the-icons.el";
-          rev = "34a6bf1b036e162b61cdfbad2165c8f8b63dec0d";
-          sha256 = "1j11453x3229mm28sw88nc2pvdbw4i97ddgqnjy0s2hqz9z2ykzn";
+          rev = "51079bb7f25d5c3d30517023e2bf13b28aa6d2c0";
+          sha256 = "0jpnv9j1f6q459kzgvn2k0qh2li9qb9116c39qaxid8j1r1jp6lg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
@@ -2266,6 +2266,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "anything-tramp";
+        version = "20170208.539";
+        src = fetchFromGitHub {
+          owner = "masasam";
+          repo = "emacs-anything-tramp";
+          rev = "52b8c8dac2f56979a14504e3c97f00ad275f9345";
+          sha256 = "1z0ylrl4scm0faapq9xhl4r20ljr4bl489ggyxi1v3rbksw1lp0q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5be5351cb187dff8388865ac424f8e5be71639/recipes/anything-tramp";
+          sha256 = "1dpah5c35j552ixbd9mw2400vnfbibwhk1ihyz2n8b1c06syfny1";
+          name = "anything-tramp";
+        };
+        packageRequires = [ anything emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/anything-tramp";
+          license = lib.licenses.free;
+        };
+      }) {};
     anzu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "anzu";
@@ -2347,12 +2368,12 @@
     apel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apel";
-        version = "20160427.152";
+        version = "20170122.1458";
         src = fetchFromGitHub {
           owner = "wanderlust";
           repo = "apel";
-          rev = "74e1e49626a4bc7b1e9b87d844d3852e976d1df2";
-          sha256 = "1aywxk77vfgr1mk7j4pygy9hl4q7lbbx4iik1rs9frkmw6sb8qni";
+          rev = "339eb28ffae3165255a79de9b1fd362f43cd37c3";
+          sha256 = "1f0zxydh2pkwbjx5bh1bzl3r5g50vqg18azvqkvv9r0nn42hkhmi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/apel";
@@ -2759,12 +2780,12 @@
     async-await = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, promise }:
     melpaBuild {
         pname = "async-await";
-        version = "20170203.2134";
+        version = "20170208.350";
         src = fetchFromGitHub {
           owner = "chuntaro";
           repo = "emacs-async-await";
-          rev = "0a7a504a6a1b38fffc037b4c5671b20047c55402";
-          sha256 = "12xrcms2jhps63mjisd81pcam14larpascdix7lcdqd38vcxnzdm";
+          rev = "56ab90e4019ed1f81fd4ad9e8701b5cec7ffa795";
+          sha256 = "1k6wisls6dqn63r4f4brnhrjbvzqpigw2zxdl9v8g1qcw49spk5s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9d74ecf94e5dbb46a939d26833b7cd0efd159ca1/recipes/async-await";
@@ -3822,12 +3843,12 @@
     avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "avy";
-        version = "20160814.250";
+        version = "20170208.148";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "avy";
-          rev = "0f5e99b5e9a0fe709e5bce8ea4462dc732b2a281";
-          sha256 = "1p2x7k5106dlz4l1p5avkkvfxls7g35zbsbiranxsgmd1x2dyl7a";
+          rev = "b8d71639158b44a2a700b84cb02fc8518ad7d542";
+          sha256 = "1yddpl78krl2y5l3w6f1h53f5qsc09ad4qcwv31k549ziwiz1vd4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy";
@@ -4200,12 +4221,12 @@
     base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "base16-theme";
-        version = "20170124.1103";
+        version = "20170208.1225";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "b50e90a39344402d169b8fdd5d18cc43fb16a256";
-          sha256 = "13b9ccm7yw95zc8v8sri762fgqdp2hp107nj5b40yv90g3y4fwby";
+          rev = "53a4b2175ad58db5314105244f74d1f03a9f3df2";
+          sha256 = "1la5qljl8jcvnla5xfql509pwrcyjbamc6a3bzdxq55snh6hdkda";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4717,12 +4738,12 @@
     better-shell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "better-shell";
-        version = "20170130.2222";
+        version = "20170205.2308";
         src = fetchFromGitHub {
           owner = "killdash9";
           repo = "better-shell";
-          rev = "43e43d43f049d8eafb7508b5cd3cccbb2eac4a68";
-          sha256 = "1s31rjfq50lh2d2bs7afzwqi2282d9kwl2vpf5r9q10dvc0xb4bp";
+          rev = "6ae157da700a4473734dca75925f6bf60e6b3ba7";
+          sha256 = "14ym7gp57yflf86hxpsjnagxnc0z1jrdc4mbq7wcbh5z8kjkbfpd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc553c9fb6de69dafe9fbe44a955b307f4d9507f/recipes/better-shell";
@@ -4889,8 +4910,8 @@
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "use-package-chords";
-          rev = "8dedc76617cbabd605f4c0d486018e3c4d3c8a9b";
-          sha256 = "0d69hckz6xbll1x2mll385kcw7mwx8cwxg1wdhphnww0s810isgp";
+          rev = "e8551ce8a514d865831d3a889acece79103fc627";
+          sha256 = "0500pqsszg7h7923i0kyjirdyhj8aza3a2h5wbqzdpli2aqra5a5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92fbae4e0bcc1d5ad9f3f42d01f08ab4c3450f1f/recipes/bind-chord";
@@ -4948,12 +4969,12 @@
     bing-dict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bing-dict";
-        version = "20160616.1820";
+        version = "20170209.1459";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "bing-dict.el";
-          rev = "bcad59c4f3a35d83aeaa4a88f0935e89cc2da764";
-          sha256 = "04zfq3d1h9givycp182a9lb19dbny98qgvc43s08kb0gdjj0f6xx";
+          rev = "7c067b7a3a1a4797476f03a65f4a0b4a269a70c7";
+          sha256 = "1cw8zxcj7ygj73dc8xf6b4sdjrwxfl6h07mrwym8anllqs2v0fa6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5653d2b6c2a9b33cfed867e7f6e552d4ed90b181/recipes/bing-dict";
@@ -6928,8 +6949,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "6ac74e951bf11593ce134cf002456ae5d420a2b4";
-          sha256 = "0ywq2lg95a1r1hls4pnns7pjii42ai8qyp87hsxbbci88ay0i81i";
+          rev = "6fc41c74644a457f1f426e2ac62ac2ac88b1fa30";
+          sha256 = "1lx3qcj9khalasx3xd1b8za41zmjylypx7cp0sn0flbhmw1irybk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -6968,7 +6989,7 @@
         version = "20170201.347";
         src = fetchsvn {
           url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "11993";
+          rev = "12000";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
@@ -7300,12 +7321,12 @@
     chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
     melpaBuild {
         pname = "chinese-pyim";
-        version = "20170111.1209";
+        version = "20170208.501";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-pyim";
-          rev = "577a3438d14e1a1f08baf0399ec8138c9d1dcba4";
-          sha256 = "0i9nqhqbj12ilr5fsa4cwai9kf2ydv84m606zqca2xyvvdzw22as";
+          rev = "113d93e02ae41767342fe9b24b3758e75fd3af23";
+          sha256 = "06xryf0wmlsyr2g9m0vxqdnsaicf6jb8nxc20n3jg89b96688wnq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim";
@@ -7325,8 +7346,8 @@
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-pyim-basedict";
-          rev = "59ea301585ef832022f92e2d75dec7e000611301";
-          sha256 = "0zbdb8snwxwyhm7inynsnx0rrr6dm9mh5lslzy29c6837jzgg2f6";
+          rev = "3bca2760d78fd1195dbd4c2d570db955023a5623";
+          sha256 = "07dd90bhmayacgvv5k6j079wk3zhlh83zw471rd37n2hmw8557mv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e2315ffe7d13928eddaf217a5f67a3e0dd5e62a1/recipes/chinese-pyim-basedict";
@@ -7738,12 +7759,12 @@
     circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "circe";
-        version = "20170107.632";
+        version = "20170205.1414";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "5444a8dd90691de941509f7cc9ac8329c442dbdd";
-          sha256 = "00dcdszskzqggg4gjp5f2k2v1a03jad52q2pqf04jqjycapkx227";
+          rev = "773e48624edc32022764d9b3bab861f32c336ac3";
+          sha256 = "0s0ksk4f8hz2jajh7hx8b5qv8vrv5mr8mvk8n51ycip0gmrl98nf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe";
@@ -7825,7 +7846,7 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "294096";
+          rev = "294752";
           sha256 = "13516xv7ypswhlarh4sd97sc17zar10snbmrcn14wd53jgxx440y";
         };
         recipeFile = fetchurl {
@@ -7947,12 +7968,12 @@
     cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "cliphist";
-        version = "20170117.1437";
+        version = "20170208.514";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "cliphist";
-          rev = "8aaee153e0561625c35a8c178e57385c2ec92731";
-          sha256 = "0swsvzz20szfcgfaarga9apla1kl0ph0lrpk0ccl6mcf93zbnvby";
+          rev = "acbd9782d82d7ae6bfb22fb0955597b9c5fcbb6c";
+          sha256 = "1gj5fqjyr4m4qim9qjsvzzk42rm3vw3yycvq3nj0wpj90zb1yh14";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82d86dae4ad8efc8ef342883c164c56e43079171/recipes/cliphist";
@@ -8467,8 +8488,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "d5f0c696116541ff4d58513d5fa2970ab70cccf7";
-          sha256 = "12pl3wy4cp457ha58w9xk6jd6x66nk4sq08h02hhpyrz7d3wi3cp";
+          rev = "ada0bc21f42e25882ddf5a8aab10eaf3ea7e0b89";
+          sha256 = "0cl8c2kbsd8jcc9mdpdriamxv9bk5fnjra5c7rpwc19qahgf2w3a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -9386,12 +9407,12 @@
     company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "company-coq";
-        version = "20170110.1633";
+        version = "20170206.2151";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
           repo = "company-coq";
-          rev = "84eae262728392ae1d077e0435ebbd2e75c3bdeb";
-          sha256 = "0cxvrlal884pmk7hf0c5dn0b93jd6wchag1a9vwh9x458hm9h4gy";
+          rev = "f77e4b12a7deebc83125d69ac1e2288d8aecf521";
+          sha256 = "04a8vlw3999yhmn3jg9d3jvvmfwmc88xnpfw1qm820s97cinzsgf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq";
@@ -9561,12 +9582,12 @@
     company-flow = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-flow";
-        version = "20161111.2147";
+        version = "20170208.756";
         src = fetchFromGitHub {
           owner = "aaronjensen";
           repo = "company-flow";
-          rev = "1f10d38135679f705494f23cd866ded0130e2993";
-          sha256 = "0alkxdd171dwk6rnq2yc6gpljdazz7yz7q3mzs3q4rcmrvlr8h84";
+          rev = "b86eaff31a66e311c210da93b83fa218f8def24b";
+          sha256 = "1lpihk96pz3v7qd62icm950wds1xc02mx08ygfv7ia1zv1m4m6w5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63d346c14af1c5c138d14591a4d6dbc44d9bc429/recipes/company-flow";
@@ -9855,12 +9876,12 @@
     company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-php";
-        version = "20170111.2112";
+        version = "20170209.2128";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "a347cda40cfd8924e86fdb597d8f2b5129697645";
-          sha256 = "02njmfl7hmdpn1wxx50vfvai5w9gkmmajydccfz4r937knr0gibq";
+          rev = "436567c1e28cce979aab7820a8fc74b5b5294218";
+          sha256 = "07w8fpnglany530jksjsl5qs9mfbc52gh6pfnqlqx6ppp01k8lw4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -9922,8 +9943,8 @@
         src = fetchFromGitHub {
           owner = "expez";
           repo = "company-quickhelp";
-          rev = "e204a80b5231486145902df4abd063b8c9d20376";
-          sha256 = "1ijzsa1l1ispd0zc0bzbcrvwcf3i4siqbvccnpdpr6i32sd3kwsq";
+          rev = "639baefc78ee9346229969cf794fba596e15a7d3";
+          sha256 = "0ql5a34cgkdbz1bxml5sam5kwd78zllkf8hm0r6zcnjykh4b5wv4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/022cc4fee54bb0194822947c70058145e2980b94/recipes/company-quickhelp";
@@ -10180,8 +10201,8 @@
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "composer.el";
-          rev = "2d16d3bb65c53e9e26f4b7b22ad38590a4a48ee1";
-          sha256 = "1zxqqd12p1db75icbwbdj51fvp8zzhivi8ssnxda1r5y5crbiqdv";
+          rev = "00b00cc48dec28ef4f993ad7044cd79f44b4cbd6";
+          sha256 = "16vv7s3g4in3zl5yl2iqgcmfmay64gk6z8mc7pb199alk7m0dlyq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer";
@@ -10385,12 +10406,12 @@
     copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "copy-as-format";
-        version = "20161231.1628";
+        version = "20170208.1921";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "copy-as-format";
-          rev = "f10105bb5a6a9ccc557649a56f46546b25a5460b";
-          sha256 = "0p27jdwp580x6namdklk7472ajj72h2zka4q70yccszh52c44iyq";
+          rev = "22239b22b63393222143857825098b03c53a1044";
+          sha256 = "1r4f04ca4w60qqrc5s7ic69ah3z63ygc1xagxqbp85wavq7vk8rc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format";
@@ -10490,12 +10511,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20170203.1430";
+        version = "20170208.107";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "7c73f7166486eeca829446a62efdb9520802ebea";
-          sha256 = "0q8wjynrlq2n6wf0x2nnmvj9h1i2pl39xpz6b7f3jbm7720182ld";
+          rev = "d23d1feefccd658f013cbf7d1b052767bed9b2b6";
+          sha256 = "0fffs5l45hrz7qv4gxwdn4prabl49zgx74daxyflrlkmbffy0gr4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -10700,12 +10721,12 @@
     cpputils-cmake = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cpputils-cmake";
-        version = "20161201.1441";
+        version = "20170203.155";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "cpputils-cmake";
-          rev = "2c48c1bacee286d927038bf0c893678931f0f956";
-          sha256 = "03a0y508znl91c6893wf5l9d98nc4dbfgg9c594c542mdbrk54z0";
+          rev = "5bad6a1f1042e45fa6d2c20fd901100d14d455ff";
+          sha256 = "0ag0wkyf1y4q0cnv8gixrbhhaf871x3r97izb82v42i47cnwk228";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b84a159e97f7161d0705da5dd5e8c34ae5cb848/recipes/cpputils-cmake";
@@ -11342,10 +11363,10 @@
       }) {};
     cus-edit-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "cus-edit-plus";
-        version = "20170102.923";
+        version = "20170206.1603";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/cus-edit+.el";
-          sha256 = "1mmcnx0i9jz1xzxgl9wqlfk4yl8y3bz88jf8078b80y34489lky9";
+          sha256 = "02mcvr8fnaflqwxzafr6i745wcw8akhjjq8ami312aibf5yjadik";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57370fc617f4f10cc67e9d3c6dc113ff0a18cace/recipes/cus-edit+";
@@ -11509,8 +11530,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "68336b38580db34bb85cfed03a3243522c328d09";
-          sha256 = "04qcq9nsy57hy23r6crrk7i7hy95424bag5ymqa378vkqw490s9s";
+          rev = "e4b8a88d1e9b0ff053705b5082d6f9e12a839069";
+          sha256 = "1m4h0jw4baa70z5difns5afbylagdw11w3ppc92sjzjpicxn2g9v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -11610,12 +11631,12 @@
     danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "danneskjold-theme";
-        version = "20161214.703";
+        version = "20170210.708";
         src = fetchFromGitHub {
           owner = "rails-to-cosmos";
           repo = "danneskjold-theme";
-          rev = "af41b9146b8c374477aeb8e739686a2006ce7479";
-          sha256 = "0k60jr11jnvn4fpx7jr7jlcnfsrdv4kp26fd71jv0j4gvin2ljxj";
+          rev = "95805f95aa780ecdb6ff35aaa6a56f3acc4c8be3";
+          sha256 = "1bpyzx6i2z73y70na9a450bpv9gw4av5jx6njbwzjbapdcl7dxz6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme";
@@ -11631,12 +11652,12 @@
     dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "dante";
-        version = "20170201.1425";
+        version = "20170207.234";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "dante";
-          rev = "385dd8114bb9eaba44943f00f9f7aea71af7bf34";
-          sha256 = "1jkdq9li3vqzdmmznpaxak7mf9y9vlk0abdb7ffzvvlry19dvgs8";
+          rev = "7acaefbf36fe53e9af9f812957eea404e11f8a61";
+          sha256 = "0ascjab014sbv9fvkswyxwhg50f0siwa9v6s67k5g58n9f7r7bls";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
@@ -11862,12 +11883,12 @@
     dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dash";
-        version = "20161121.55";
+        version = "20170207.2056";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "958e3fb62fd326d3743c0603b80d24ab85712c03";
-          sha256 = "1a1zca0lh01wayd4qdjihimhd1bn00qpwfiybgdcb7yn5xfwv9a1";
+          rev = "98e819e407bbc35478cde30a74be15f077bd6d4b";
+          sha256 = "1ws57p9y9fjpzk63x5qfibqc4xz6q4iczrxdmrgvm0p3mj3gmvwm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash";
@@ -11908,8 +11929,8 @@
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "958e3fb62fd326d3743c0603b80d24ab85712c03";
-          sha256 = "1a1zca0lh01wayd4qdjihimhd1bn00qpwfiybgdcb7yn5xfwv9a1";
+          rev = "98e819e407bbc35478cde30a74be15f077bd6d4b";
+          sha256 = "1ws57p9y9fjpzk63x5qfibqc4xz6q4iczrxdmrgvm0p3mj3gmvwm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional";
@@ -12240,12 +12261,12 @@
     dedukti-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dedukti-mode";
-        version = "20160329.1002";
+        version = "20170206.514";
         src = fetchFromGitHub {
           owner = "rafoo";
           repo = "dedukti-mode";
-          rev = "dab509952b6c64d0bb12b5f60dd93e3b38b01d62";
-          sha256 = "1lnvr1rxgf1i0dh1gqlkghz6r4lm1llpv3vhky313220ibxrpsvm";
+          rev = "6f5513a1dd7ff5d76da2402287a58f55f8891efa";
+          sha256 = "1vxbringd99w6mraq4d3b2k4rh5ldc4wvxjvg1z95xawhznv3v0r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/767a685fbe8ae86177e90a17dac3815d41d74df4/recipes/dedukti-mode";
@@ -12552,12 +12573,12 @@
     dictcc = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "dictcc";
-        version = "20151221.357";
+        version = "20170207.835";
         src = fetchFromGitHub {
           owner = "cqql";
           repo = "dictcc.el";
-          rev = "1fd76499cf5d2045e8594aec3c0b62168802f887";
-          sha256 = "0b8yg03h5arfl5rlzlg2a6q7nhx452mdyngizjzxlvkmrqnlra4v";
+          rev = "a1e87dad68faee956e4614c4f0f0bb98ba81ab6a";
+          sha256 = "086nq9ngn06n605s21733456knna2py5dfymm8824zslzz39i8fy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e867df96915a0c4f22fdccd4e2096878895bda6/recipes/dictcc";
@@ -13768,12 +13789,12 @@
     dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dix";
-        version = "20170201.316";
+        version = "20170209.538";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "dix";
-          rev = "43a2d386b6c6c314db2a1ab8e772ee68d8256806";
-          sha256 = "0qkh35widg3b6cfyv651xx9xyq35r7zjfygcp9wv3w3wcvxdaznk";
+          rev = "fc19b2e0c387a545901365a01c4a355bf0504405";
+          sha256 = "0qavf6q8gk4sli28rm4wgvwwj28qxd3qkvj921l8sqr49paah0vy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix";
@@ -13793,8 +13814,8 @@
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "dix";
-          rev = "43a2d386b6c6c314db2a1ab8e772ee68d8256806";
-          sha256 = "0qkh35widg3b6cfyv651xx9xyq35r7zjfygcp9wv3w3wcvxdaznk";
+          rev = "fc19b2e0c387a545901365a01c4a355bf0504405";
+          sha256 = "0qavf6q8gk4sli28rm4wgvwwj28qxd3qkvj921l8sqr49paah0vy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil";
@@ -14133,12 +14154,12 @@
     docker-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "docker-tramp";
-        version = "20161020.2220";
+        version = "20170206.1925";
         src = fetchFromGitHub {
           owner = "emacs-pe";
           repo = "docker-tramp.el";
-          rev = "d8b510365d8e65551f4f792f251e7212411708c3";
-          sha256 = "0lxvzmfg52fhxrhbvp92zwp7cv4i1rlxnkyyzgngj3sjm7y60yvg";
+          rev = "8e2b671eff7a81af43b76d9dfcf94ddaa8333a23";
+          sha256 = "1lgjvrss25d4hwgygr1amsbkh1l4kgpsdjpxxpyfgil1542haan1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker-tramp";
@@ -14686,7 +14707,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1781698";
+          rev = "1782484";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -15290,12 +15311,12 @@
     ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }:
     melpaBuild {
         pname = "ebib";
-        version = "20170118.1625";
+        version = "20170208.1223";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "ebib";
-          rev = "d415b91c91581ff39364384fec35c219cb89d43a";
-          sha256 = "13283ymm4av2gk7zj2rsppg6sk0lixy9g4lic4arrm8b5yb0vcsd";
+          rev = "1ae554d1b67cb81b96c828e9710a4658db35b9fd";
+          sha256 = "0ch8ws46r55rdap67xa40gb9h4llad6wx75iga4fyjzh6fxv9q9d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@@ -15311,12 +15332,12 @@
     ebib-handy = callPackage ({ chinese-pyim, ebib, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ebib-handy";
-        version = "20161126.140";
+        version = "20170208.524";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "ebib-handy";
-          rev = "e4815b2d127300361b8528681d2d36ad5465e574";
-          sha256 = "03pnapalpdyfcy4irmxwljpwxmbcgz3dzbxd8b0058gkhzan9vrz";
+          rev = "d70731bd02dd86500cb7807d0d11fc05b53d2a69";
+          sha256 = "03db4k69qkp4s9xj910ynkq4ky68hs404djsglhlcirdpwj58d80";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8843caa0d80000c70d3b264854f50daac94e6962/recipes/ebib-handy";
@@ -15946,11 +15967,11 @@
       }) {};
     eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "eide";
-        version = "20170202.1345";
+        version = "20170207.1259";
         src = fetchgit {
           url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git";
-          rev = "c812097018143642cf8164309581b805fb947c78";
-          sha256 = "0ynxz0xlb2iak8riz404gb4spy6x7xr3rmhsm65apylkmj999g06";
+          rev = "756ebff43c4c2393a679ea7d26e22743831d4564";
+          sha256 = "135ymq7pc9478dlx6q4nln439r9d64ylmbbykcpisgw6ypn1yzbz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d384f185f76039b06a1b5b12c792b346c6d47a22/recipes/eide";
@@ -15987,12 +16008,12 @@
     ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20170201.751";
+        version = "20170209.956";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "0ede9e7ef64017039748b8f47de4df834b0443ed";
-          sha256 = "03fm7lhfzrhn4dddlhqx6v1dqfgz6rj352y0znnfdaskzychw1sa";
+          rev = "faf61c3cc371a9d4caa2e84687c31e5efb4577e9";
+          sha256 = "1rhd7l5pjfg11m6njc6z13p92v3fdswjr354rfrc2p0w03vc6nyb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -16050,12 +16071,12 @@
     ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }:
     melpaBuild {
         pname = "ejc-sql";
-        version = "20170201.734";
+        version = "20170210.30";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "ejc-sql";
-          rev = "f9bb4917058a71f92f4a22703d90eecc17354d97";
-          sha256 = "14s40q1jf73dql09a1mzpk2q14kl5m4x7y7j4iazh2lca9kf61lz";
+          rev = "4046b291dce26148e62fed3974b94489ccc24674";
+          sha256 = "127kiplrwf1wkwpjf1fra6j1ic0wwiiza7d4ih47ffs40cq1f91r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql";
@@ -16180,8 +16201,8 @@
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "el-patch";
-          rev = "2714aa06af088155bc3d163f8ebde7d410c0694a";
-          sha256 = "0fdf05g6lsjwa1qx5h1yx3lzvkcw26lbn90022jb3f70b38adhf0";
+          rev = "df3cb294fdbed717fd7f7fcb8dd917226c5f2d8d";
+          sha256 = "01z824qxbqzgggj07x1ryx7mvw0jqq2s9hwg1jn23vzy7fchij44";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -18197,12 +18218,12 @@
     epic = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }:
     melpaBuild {
         pname = "epic";
-        version = "20150503.37";
+        version = "20170209.1623";
         src = fetchFromGitHub {
           owner = "yoshinari-nomura";
           repo = "epic";
-          rev = "02f6472bb490a39d42ed49c0364972173202f6e1";
-          sha256 = "18gfi1287skv5xvh12arkvxy2c4fism8bdk42wc5q3y21h8nsiim";
+          rev = "a41826c330eb0ea061d58a08cc861b0c4ac8ec4e";
+          sha256 = "0mvg52f2y3725hlzqcn2mh8jihnbg68wlqmq951sa3qfma7m40pp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7c7162791d560846fe386746c00a9fe88c8007bb/recipes/epic";
@@ -18742,12 +18763,12 @@
     erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "20161129.304";
+        version = "20170208.306";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "181d1c60def42e938dc3642cf798a73fa73d1425";
-          sha256 = "14fpiyq68nw4z4wykrxhqic0y9ghr7yjx0wx3zff4l001c0lqr4w";
+          rev = "47b4abf118e2dac88c5c2cbd531372cc217854ec";
+          sha256 = "13fhkkfnvyf938gznl4av9gn7r4yyvw2rv438pabf0d0min37qqf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -18906,12 +18927,12 @@
     es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, spark }:
     melpaBuild {
         pname = "es-mode";
-        version = "20161103.1024";
+        version = "20170207.1035";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "es-mode";
-          rev = "673506ec3d9eedc06f1e9f2953ac2720bf66f992";
-          sha256 = "07r7zr38hqv0njc8zwdqmslh422kwahri2s7gp56abfk6wc0ndkm";
+          rev = "996730ebce57d810d2c275c7fadb11c2b1134dea";
+          sha256 = "1qhfnd5anp5qrmravv7ks5ix763xnki2f5jwcyj70qyxwr0l60cg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode";
@@ -19305,12 +19326,12 @@
     ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "ess";
-        version = "20170118.232";
+        version = "20170206.310";
         src = fetchFromGitHub {
           owner = "emacs-ess";
           repo = "ESS";
-          rev = "b67756eb72fc813196e1b1915eeaa36d3ef95ecc";
-          sha256 = "1rwvp4gqr0nd81k7125hfgk60m7b2cjwg2ilwfg1ym85cqlqp8l3";
+          rev = "2ca23d826dfeeeb248739d68e5528286af3346a5";
+          sha256 = "16i6zqnnj4c12y7bfhmk723gffqn05mjc9zs8lyb0c59s6la54c9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@@ -19677,12 +19698,12 @@
     evil = callPackage ({ fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
-        version = "20160825.1343";
+        version = "20170209.1259";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "16eb854e18d1ec79b00a0a49c1f60aed710b303b";
-          sha256 = "1n5bm2264fgx9a462yl9nw0rm742x40b0c8w7c21dc8rz4r76a9z";
+          rev = "c29c32be3327294036a8a56513836ee515091f16";
+          sha256 = "05g7wp9aaf767d4277q86nrz1azhbhlxxc1pncf2f5dmid9pbgbq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil";
@@ -19887,12 +19908,12 @@
     evil-ediff = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-ediff";
-        version = "20160821.1950";
+        version = "20170208.848";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "evil-ediff";
-          rev = "81be356eaf5dc9ee1cc624c237007892d7c191f9";
-          sha256 = "1x831myijdnzxjfpm1gb8fqfvfwv5ixsaqkax37cim2yf2fbvln1";
+          rev = "b77232b82ca0d81f2acd0d3ff60a8b99e0a30460";
+          sha256 = "18rlwn2yn6yf11hfhvs76qk3i9l45gry3lpahpsd2gf426hd48mg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/45eb1339792849b80a3ec94b96a88dd36262df2b/recipes/evil-ediff";
@@ -20223,12 +20244,12 @@
     evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-mc";
-        version = "20170131.2119";
+        version = "20170205.1355";
         src = fetchFromGitHub {
           owner = "gabesoft";
           repo = "evil-mc";
-          rev = "3ab7942cec9bd8afbc64349ab24f9558934810d5";
-          sha256 = "1nyak4vp0h2cjls12sqcgvk07iap6m88zrrlq65702jpcqp9hycj";
+          rev = "17a469799a5fe0df8d9b3589c6719634acd065eb";
+          sha256 = "0rwz0xg76kvyz959r8bywdbddxaxn69z9lqq95z71qq980w3d4g7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc";
@@ -20307,12 +20328,12 @@
     evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-nerd-commenter";
-        version = "20170203.505";
+        version = "20170208.1712";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-nerd-commenter";
-          rev = "e1de1d759bcbd1026aeff8e402a2ef7edf546c0d";
-          sha256 = "1zm878w3lmsc76zf8ddvpm3lxsbqdvwcrxjyrhz8amfiw75klja4";
+          rev = "01a98a20c536a575ee5bc897f38116155154d5fe";
+          sha256 = "160h4qasqr04fnv9w5dar327i074dsyac2md5y7p3hnz1c05skhl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
@@ -20811,12 +20832,12 @@
     evil-visual-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-visual-replace";
-        version = "20161122.1641";
+        version = "20170201.1920";
         src = fetchFromGitHub {
           owner = "troyp";
           repo = "evil-visual-replace";
-          rev = "f88c8aa9e3a0d7e415bec50dcdf4bc5bb8feee45";
-          sha256 = "1rmdjlbh3ah1pcdsd6yzb15g15b10x0py1alfywvyc1p227lv4v8";
+          rev = "9bfbaf71898294e25d588a887fb4753641edfbe9";
+          sha256 = "00mhqb9rn4hq90x5i44jyq51lg351bv8hdj4c443nxrbldi73k9s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/165aea6697a6041bb83303f3ec8068a537accd4a/recipes/evil-visual-replace";
@@ -21145,12 +21166,12 @@
     eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eziam-theme";
-        version = "20170130.834";
+        version = "20170209.613";
         src = fetchFromGitHub {
           owner = "thblt";
           repo = "eziam-theme-emacs";
-          rev = "97e2b9d551e92d47a5baf78d6b5399e45eea2ae8";
-          sha256 = "0pxxzb2szp0bw7ayj65yfzy5h59dci541k7fs5m7xkzakyyx0b8i";
+          rev = "5580dad950d866ff0110c01480b02b792167b83d";
+          sha256 = "06ww18igmy7v07gqgw6yn9qb8h76a8mwd43pyi25y615k48ilrg6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
@@ -21535,12 +21556,12 @@
     fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fcitx";
-        version = "20161118.1128";
+        version = "20170208.1012";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "fcitx.el";
-          rev = "830fa2e665d7bcba8f7e7de754937c1ae6e9b60b";
-          sha256 = "0qds4sqj9hppi5dfsfbpvba86fwigjprr75900rb50bb06ql4dqh";
+          rev = "ec1d202c11a1c81f7ab0b9cf235d64c68d8e3134";
+          sha256 = "1p32lqmnp7k0gck6my1cy4hd5sck28zkfvlg8q23lpkcg1vcsqlx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8c40f09d9397b3ca32a7ed37203f490497dc984/recipes/fcitx";
@@ -21776,22 +21797,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    find-by-pinyin-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    find-by-pinyin-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pinyinlib }:
     melpaBuild {
         pname = "find-by-pinyin-dired";
-        version = "20150202.216";
+        version = "20170206.208";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "find-by-pinyin-dired";
-          rev = "d049cc7f507a6f801c497a3d401b260300874f58";
-          sha256 = "18a4ydp30ycx5w80j3xgghclzmzbvrkl2awxixy4aj68nmljk480";
+          rev = "2c48434637bd63840fca4d2c6cf9ebd5dd44658f";
+          sha256 = "0ial0lbvg0xbrwn8cm68xc5wxj3xgp110y2zgypkdpak8gkv8b5h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0aa68b4603bf4071d7d12b40de0138ecab1989d7/recipes/find-by-pinyin-dired";
           sha256 = "150hvih3mdd1dqffgdcv3nn4qhy86s4lhjkfq0cfzgngfwif8qqq";
           name = "find-by-pinyin-dired";
         };
-        packageRequires = [];
+        packageRequires = [ pinyinlib ];
         meta = {
           homepage = "https://melpa.org/#/find-by-pinyin-dired";
           license = lib.licenses.free;
@@ -22526,12 +22547,12 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20170117.1430";
+        version = "20170209.1145";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "13fba48c63d4823a19ef5782df8ad3b0e50ecae2";
-          sha256 = "0l5p1ih3a5d2g7hwz2yr0adxdvhrvm9174whihqnagbb8lxfvvyq";
+          rev = "4c0aa8e00d9419a37dbb58a4faef36ab273b69c3";
+          sha256 = "0ridbz5xnxr8lj83xn45h4y5pl09mwl053b3b3vq0z8dh3r8ac7n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -23009,12 +23030,12 @@
     flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-flow";
-        version = "20170126.1007";
+        version = "20170207.605";
         src = fetchFromGitHub {
           owner = "lbolla";
           repo = "emacs-flycheck-flow";
-          rev = "da2d0834e1d7b2f1157f579e3ee157db325caae7";
-          sha256 = "0nsi5km1f0p6l25i4kylvnzfxz4wi9108k2zsspfshw3b6bbk7mf";
+          rev = "090e89455b1f1dcb2de7a2f40c36d2a002417795";
+          sha256 = "1vp2mswzxfd88i253l7mx5qj8x1h47fgvgy7dwi31xvp7vr40n6g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d18fb21d8ef9b33aa84bc26f5918e636c5771e5/recipes/flycheck-flow";
@@ -23366,12 +23387,12 @@
     flycheck-pkg-config = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "flycheck-pkg-config";
-        version = "20170129.1315";
+        version = "20170209.1545";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "flycheck-pkg-config";
-          rev = "c85f543a682cdda1f8c9a2e255c8230257715cb4";
-          sha256 = "02xv8w5pgsara2wf6zp6992n52a363kw2xiqdv5kcz8y1bxcliz1";
+          rev = "f615b9da412425f65f2818e26970412a7736b178";
+          sha256 = "02if6mjxjlbgdsfzgmbn7j65c3zrszr92mnpydbbksg1abqr7146";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b2e88f2f126c9ff8b4261d6adb4c0d8d3049f33/recipes/flycheck-pkg-config";
@@ -24521,12 +24542,12 @@
     fn = callPackage ({ cl-lib ? null, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fn";
-        version = "20170130.1745";
+        version = "20170209.1804";
         src = fetchFromGitHub {
           owner = "troyp";
           repo = "fn.el";
-          rev = "463cd9b82aec7c90a529a98c4fcad636069fd978";
-          sha256 = "0pwic988mp4x0x1icklsvkxy8nw72ljz93j8s3cimmic7dslnmza";
+          rev = "2842e3c6d1b5c96184fa638c37b25ce5b347a1a6";
+          sha256 = "0kxpy87f44gkfzrnhcrprca0irkpddpbw7wbrm4aidw0synpab91";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6d2929604b6dd21d6cf425643927a9c216801dc1/recipes/fn";
@@ -24896,12 +24917,12 @@
     forth-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "forth-mode";
-        version = "20170101.1245";
+        version = "20170208.2305";
         src = fetchFromGitHub {
           owner = "larsbrinkhoff";
           repo = "forth-mode";
-          rev = "05e8a027960c77ac5a09bda959889de57ecbb486";
-          sha256 = "1s0543dc69ciz6ll7m62kaac92jmpk9yqaa37jrv5lscrp6sgamz";
+          rev = "45650c28a2cdc149a4480d5ea754758c75f8eb01";
+          sha256 = "14p0qygs2ng0jq7hqnhq3za52pzs8gv8qr75a6ic0irh21mvspzp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e46832079ee34c655835f06bf565ad5a5ab48ebd/recipes/forth-mode";
@@ -25001,10 +25022,10 @@
     frame-cmds = callPackage ({ fetchurl, frame-fns, lib, melpaBuild }:
     melpaBuild {
         pname = "frame-cmds";
-        version = "20170101.950";
+        version = "20170207.1045";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/frame-cmds.el";
-          sha256 = "0yscijwwm31551ysagysdrryr1w33kg34j3bnrq92mxsmb6i19ad";
+          sha256 = "05mdds242vcav9gy15phvlk9q8iy29wnc8bp0c7i6z6bblairfzj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/frame-cmds";
@@ -25232,12 +25253,12 @@
     fstar-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fstar-mode";
-        version = "20170124.521";
+        version = "20170209.744";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "323271293e82cd03440a8bb6d11077c1c3f5b44b";
-          sha256 = "1rxpnlda4r3gc4bb8390a4gscqhxgvbp2gk27l7qyavn0jfxmq0h";
+          rev = "826422333deac91b390836a3bb4bb0b696c4f926";
+          sha256 = "1zrpz6qdfwa9p7wp5pd0xsax1cvlz0vr177w9bkvwvnax8cy1n42";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode";
@@ -25256,8 +25277,8 @@
         version = "20170107.626";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "f342fd04d9aad172dca83533ab8d3a525f47784f";
-          sha256 = "0b3vraxxgxp7x6mz6d25ha6dkgxzy847bdw2157h12f0p7pac0j4";
+          rev = "d63c992d97f415ba97b115356d796e2da2dadbe1";
+          sha256 = "15scnv8gbinazwf97da7crpmj6nlqi8ai4psk257x9c82p3jyln6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -25710,8 +25731,8 @@
         src = fetchFromGitHub {
           owner = "noctuid";
           repo = "general.el";
-          rev = "66fa3050e59137763bc207c1cc7eb09922ce2e01";
-          sha256 = "1g50iyvcgkkniq9dj6q2b6yw04cja3z97hn85i7b2qrj161yinps";
+          rev = "b626fae4f0fbf2ec2bf7df850dd1c8ad15e70b65";
+          sha256 = "1p9kwh9yadai0ijn98rag0sln18fj9ciy51p88967bgvbx1rx8x3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general";
@@ -26172,8 +26193,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "b43de68002e77c06e3bc288eca5e849d077864cb";
-          sha256 = "00f0g34hmfyjqyy0zmzssani9wppi1bqbbvnqqfxdlcbf7chxr74";
+          rev = "ac9c50592722a2f03e6f28e54b9fb05e9460674b";
+          sha256 = "0fyb5x22svqxpm7krd061hd2dzd30z2pnkxzqf8lx82j1zapqkqj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -27008,12 +27029,12 @@
     gnus-desktop-notify = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "gnus-desktop-notify";
-        version = "20170130.543";
+        version = "20170208.546";
         src = fetchFromGitHub {
           owner = "wavexx";
           repo = "gnus-desktop-notify.el";
-          rev = "66bfa697c49973f3bbc47bcde2304b1f16d30309";
-          sha256 = "1xa9bqr1pbdx8zan81d6phyv473ihlvm8lif594m630hn68b5yw9";
+          rev = "8fd980c4a4ba18085ec87a2f0c71875c5d01087f";
+          sha256 = "00zh5v24pxkfg240z6c5y9ngsn6rnvmxphiilf84bxxpwn030brk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/gnus-desktop-notify";
@@ -27282,8 +27303,8 @@
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "d9647672717bb5d507de42975a337c738a0461a3";
-          sha256 = "18x01y9qlqmpvyl638ymc1ml6j33xgc0xhig6qfx0y7s484zblm8";
+          rev = "5737e59cbac9bc480546766c9502c527fa2be26f";
+          sha256 = "089w4qibcxj6x1ssq9c6pwsibrr3dih9k343ncxavhyqvyf9irxd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru";
@@ -27320,12 +27341,12 @@
     go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "go-mode";
-        version = "20161231.1134";
+        version = "20170206.1507";
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "d9647672717bb5d507de42975a337c738a0461a3";
-          sha256 = "18x01y9qlqmpvyl638ymc1ml6j33xgc0xhig6qfx0y7s484zblm8";
+          rev = "5737e59cbac9bc480546766c9502c527fa2be26f";
+          sha256 = "089w4qibcxj6x1ssq9c6pwsibrr3dih9k343ncxavhyqvyf9irxd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode";
@@ -27408,8 +27429,8 @@
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "d9647672717bb5d507de42975a337c738a0461a3";
-          sha256 = "18x01y9qlqmpvyl638ymc1ml6j33xgc0xhig6qfx0y7s484zblm8";
+          rev = "5737e59cbac9bc480546766c9502c527fa2be26f";
+          sha256 = "089w4qibcxj6x1ssq9c6pwsibrr3dih9k343ncxavhyqvyf9irxd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename";
@@ -27618,8 +27639,8 @@
         src = fetchFromGitHub {
           owner = "golang";
           repo = "lint";
-          rev = "5295072ea38460cda1ff822cf6d30a7bf64329bd";
-          sha256 = "1q21ll8ip9zgdc9vqmad96dv39swch2zwkar840yk9ydbv46sbyp";
+          rev = "6d7efc48f3ecdd4fdd4035680f25173dbb22fdba";
+          sha256 = "1i50sxyvvykdw51iafaw87aj2dwisgj0qcxi5gl1czdfw9x0v06k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint";
@@ -27866,12 +27887,12 @@
     gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gotham-theme";
-        version = "20161022.848";
+        version = "20170210.151";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "gotham-theme";
-          rev = "223f3771d84f2d5a9f20390e496cecc529f769d6";
-          sha256 = "0y28gqmnvbagnv9qp7173bylkbl4sgpy8szzn1s9q46fjysdj8b8";
+          rev = "a5bfe13e7bba81d25b32d836c0b870e8f3f6c463";
+          sha256 = "02hb0znxwbxlkchlkya4j6hm6p1djza6ajij6d94a7p13dnpmygb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme";
@@ -28291,6 +28312,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    green-screen-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "green-screen-theme";
+        version = "20170209.1208";
+        src = fetchFromGitHub {
+          owner = "rbanffy";
+          repo = "green-screen-emacs";
+          rev = "e47e3eb903b4d9dbcc66342d91915947b35e5e1e";
+          sha256 = "0gv434aab9ar624l4r7ky4ksvkchzlgj8pyvkc73kfqcxg084pdn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/821744ca106f1b74941524782e4581fc93800fed/recipes/green-screen-theme";
+          sha256 = "0a45xcl74kp3v39bl169sq46mqxiwvvis6jzwcy6yrl2vqqi4mab";
+          name = "green-screen-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/green-screen-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     gregorio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gregorio-mode";
@@ -28562,12 +28604,12 @@
     guess-language = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, typo }:
     melpaBuild {
         pname = "guess-language";
-        version = "20170204.956";
+        version = "20170210.216";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "guess-language.el";
-          rev = "8450268f18610e552942641e67bc16f7347fffd5";
-          sha256 = "08qqljcvpm76hm57vd8r67w4zjbrdlbkq5mcyhk1qifa38cah52r";
+          rev = "9763f9e81892c7dd2f5ffa6e771b356beeefafee";
+          sha256 = "07k0cf3n3c9hmrhnj2h6yfp4hbw09qn22a5wq5c54bskfyhrkj4s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e78cb707943fcaaba0414d7af2af717efce84d0/recipes/guess-language";
@@ -28748,22 +28790,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    hacker-typer = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    hacker-typer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hacker-typer";
-        version = "20170204.838";
+        version = "20170206.720";
         src = fetchFromGitHub {
           owner = "therockmandolinist";
           repo = "emacs-hacker-typer";
-          rev = "baff7225a4ea340b35e341baea3cd2b25e7fc15e";
-          sha256 = "0yfngpkc8w5y8sagf4jh126m5dw37hgilyw6h24qw5cvan1ndbz7";
+          rev = "d5a23714a4ccc5071580622f278597d5973f40bd";
+          sha256 = "13wp7cg9d9ij44inxxyk1knczglxrbfaq50wyhc4x5zfhz5yw7wx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/561661965a7a500f24671454b3b680816457e180/recipes/hacker-typer";
-          sha256 = "0i9kkxcz0fz4yviksl3f0ggh9kpwr9sidg7945r46bmblni3f0j9";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8e04a3a1606ea23865c04d93e3dc77cb55b9931f/recipes/hacker-typer";
+          sha256 = "128y562cxi8rblnqjdzhqc6b58bxi67f6hz569gqw4jywz0xcd0g";
           name = "hacker-typer";
         };
-        packageRequires = [ async emacs ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/hacker-typer";
           license = lib.licenses.free;
@@ -28877,12 +28919,12 @@
     haml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
     melpaBuild {
         pname = "haml-mode";
-        version = "20170104.2224";
+        version = "20170208.28";
         src = fetchFromGitHub {
           owner = "nex3";
           repo = "haml-mode";
-          rev = "813530d171b233a42f52b97958f1245e1a09c16a";
-          sha256 = "0ylpw01g0mwk61rjlv8wc8bqh5y2xh2s7s8avfvcc689hafp7c2j";
+          rev = "e232abdb908d92a1a346ee1a7671d4a3121310c5";
+          sha256 = "1qqwh28rf94pfcvazs0fl4yjz430aw6sadf07i4r408lq6r089dx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/haml-mode";
@@ -29108,12 +29150,12 @@
     haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "20170204.556";
+        version = "20170209.415";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "f299294968faa2a5115467abc086d04fd4145964";
-          sha256 = "0vjhqv72ak6wdz33r7vkmjm4sb9wr0r4zmhpbs8g8g0yisdpgdjk";
+          rev = "f430fdce5ff747fb3c6490d29bc6be23d5444480";
+          sha256 = "0z31wsbjq67dm8bfb5gcrncp3xif47vxr51gjyprsam9k5ixlmm4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -29376,12 +29418,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170203.715";
+        version = "20170209.513";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "6105ddd0be224e5b60a1a8d8fcdd176a21c76848";
-          sha256 = "1i1xk75zs5q1f4z50ywi8l2qnc9vh2hyd01112vjp6qgqspn0kkk";
+          rev = "bbd39ac5d2833e50882a8736b846e432aea3a754";
+          sha256 = "0px36psp6lp3wih8i8xv0q4yb6c3ps39mkrlc8b8a50zf7bi75x7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -29460,12 +29502,12 @@
     helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ag";
-        version = "20170127.2155";
+        version = "20170209.745";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-ag";
-          rev = "c925ab0d3e50c100c7a1ffa54c724f39df1ae526";
-          sha256 = "0m5cap2ssp2yklvxlrfp3p5admaz3qhhakh81743r4klgkxv0kdk";
+          rev = "39ed137823665fca2fa5b215f7c3e8701173f7b7";
+          sha256 = "0a6yls52pkqsaj6s5nsi70kzpvssdvb87bfnp8gp26q2y3syx4ni";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag";
@@ -29775,12 +29817,12 @@
     helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "helm-cider";
-        version = "20170203.1535";
+        version = "20170209.2316";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "helm-cider";
-          rev = "24972f395de6ee261d01c06301e9b4480f865a9c";
-          sha256 = "15qn0xcci4mb8bh6mh4bf80ss8hqj0fzd1mqvhnmihlfww8a3jpd";
+          rev = "8e092d0d2e9cf27195296c684b4fab831208b98a";
+          sha256 = "081wkmp4mcdszyirgifdn4qzpvc9bz3qkvwnlp0c9jzimkizpgsl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31d3cd618f2ac88860d0b11335ff81b6e2973982/recipes/helm-cider";
@@ -29943,12 +29985,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170204.906";
+        version = "20170210.5";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "6105ddd0be224e5b60a1a8d8fcdd176a21c76848";
-          sha256 = "1i1xk75zs5q1f4z50ywi8l2qnc9vh2hyd01112vjp6qgqspn0kkk";
+          rev = "bbd39ac5d2833e50882a8736b846e432aea3a754";
+          sha256 = "0px36psp6lp3wih8i8xv0q4yb6c3ps39mkrlc8b8a50zf7bi75x7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -31013,12 +31055,12 @@
     helm-make = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "helm-make";
-        version = "20161109.1107";
+        version = "20170206.1323";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "helm-make";
-          rev = "11744341b10b35200ebb6789de52ce1a79336ef4";
-          sha256 = "1kzv11admqzdbswhahh28imkvjhwmp3pggpf5igpi019p8v3y91c";
+          rev = "ed406557c814bb2521cf826370e57ffe9d40d33e";
+          sha256 = "02dfrr474yza18xvshjx41h1fsk81g950k6p3h4j1hpdqgjkv96k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f25f066c60d4caff1fbf885bc944cac47515ec8/recipes/helm-make";
@@ -31304,6 +31346,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-perspeen = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, perspeen }:
+    melpaBuild {
+        pname = "helm-perspeen";
+        version = "20170205.742";
+        src = fetchFromGitHub {
+          owner = "jimo1001";
+          repo = "helm-perspeen";
+          rev = "9f1cfd4b9a4881e089486a02eeba07c551d5d706";
+          sha256 = "1jdcvli9j5q5n4qp4qa5ylyb47mrh3crhbq316qkxk473r8hprlc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee26a57aacbd571da0cfaca2c31eec6ea86a543/recipes/helm-perspeen";
+          sha256 = "07cnsfhph807fqyai3by2c5ml9a40gxkq280f27disf8sc45rg1y";
+          name = "helm-perspeen";
+        };
+        packageRequires = [ helm perspeen ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-perspeen";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-phpunit = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, phpunit }:
     melpaBuild {
         pname = "helm-phpunit";
@@ -31892,6 +31955,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-tramp";
+        version = "20170208.546";
+        src = fetchFromGitHub {
+          owner = "masasam";
+          repo = "emacs-helm-tramp";
+          rev = "18bb091ed100895a1dfbc3ee1f85c08de541f742";
+          sha256 = "12fbpsn7wywgbr1npxv3smb0z5s7j8zpg4s60zs28hz49j8v4058";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4a69f0a17c4efbaea012be8e878af4060fa0c93b/recipes/helm-tramp";
+          sha256 = "1113qxl34sf27a88vpvckrfrigp8vnm42nmfrcxz156maa1g9cbv";
+          name = "helm-tramp";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-tramp";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-unicode = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-unicode";
@@ -32738,12 +32822,12 @@
     highlight-thing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "highlight-thing";
-        version = "20160817.126";
+        version = "20170207.2239";
         src = fetchFromGitHub {
           owner = "fgeller";
           repo = "highlight-thing.el";
-          rev = "f9eaebdd80815d1cc30dbf56d8b171da3135ee7c";
-          sha256 = "00nvmp8fcc55hmy37wxnwhvg3m85a5fyrqpli9zjgbblckfz1v55";
+          rev = "c998172704ac4b96147d862a0eb4a0f97deb5e0a";
+          sha256 = "0s441ya0fcw7sv1ah13dh0b0m2rcvf68a442knvnf06a07hpr5sr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/84b6cb403ff9a588771d051e472596f4e3cc974d/recipes/highlight-thing";
@@ -32805,8 +32889,8 @@
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "hindent";
-          rev = "2b0b236ab55d1ef629e458882666ca01b7c84ef5";
-          sha256 = "17bxdskaqxy6dfcg7nhc1wjwrw4qdmaix64avdkb4lkcsn5n9myv";
+          rev = "cd3d3241c7dbd88a0505fb005d4072965c1bfe1f";
+          sha256 = "144arwryhp464v8k1w12v87mf70bq372dc4pxvl2giqssmaq7jms";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -33128,12 +33212,12 @@
     hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "hledger-mode";
-        version = "20170203.1909";
+        version = "20170209.938";
         src = fetchFromGitHub {
           owner = "narendraj9";
           repo = "hledger-mode";
-          rev = "0038c446bfc5cb1b65fc1b3e181f8d57e73887fe";
-          sha256 = "1z2251slpymbrqh09ismyq36kd34s81a677i26b9jzcd4x4ns4bb";
+          rev = "76d60bd3f740aabc8c9d3e25240aa71bb20f7d2b";
+          sha256 = "1wwj9sqjhkjdwn69nd5h9mmrqb42d7c066bl3f7szmg6mhwgffw3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode";
@@ -34585,12 +34669,12 @@
     iflipb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "iflipb";
-        version = "20141123.1316";
+        version = "20170205.200";
         src = fetchFromGitHub {
           owner = "jrosdahl";
           repo = "iflipb";
-          rev = "2e0d1719abeec7982341761ee5dabb01574e6862";
-          sha256 = "18rlyjsn9w0zbs0c002s84qzark3rrcmjn9vq4nap7i6zpaq8hki";
+          rev = "8eb478535aa4847b94ea4ce29d9476a6b652be2b";
+          sha256 = "0plvjg1nkq37mpdbli2fyqhvabzi18mq5kjrgxk9d6s6ki2m26kq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fad6fc8bc3c0be0d5789a0d7626ebc3f298b4318/recipes/iflipb";
@@ -35601,12 +35685,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20170203.248";
+        version = "20170206.1238";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "bde85cc8af5d9b038bb58acc0763ef0be7278675";
-          sha256 = "0lhcq4cl8vx9bvcl2ab4iv4bqiw49jpc20kkj54ms40npfgfjksc";
+          rev = "9cd5e5047cb0147f50bc722bb748e9b55ae89fa2";
+          sha256 = "1j6r8nswgnjd343dlvf4b43sym7cypw6m54gzdg9sbgqgr51avbc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -35933,10 +36017,10 @@
       }) {};
     isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "isearch-plus";
-        version = "20170101.2341";
+        version = "20170207.2149";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/isearch+.el";
-          sha256 = "0iagsqqsxjxz0j30ljynwjpjn6i5klaxka4ygrsbxh0ys6cv5yfh";
+          sha256 = "1h2pn8qvxpnn2y0h54fijgqb47l047hq5g2n42x0nmiky2hjqras";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+";
@@ -35991,12 +36075,12 @@
     isend-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "isend-mode";
-        version = "20130419.258";
+        version = "20170208.110";
         src = fetchFromGitHub {
           owner = "ffevotte";
           repo = "isend-mode.el";
-          rev = "274163f5c42834ce0391fcc8800e169104ad518f";
-          sha256 = "022j39r2vvppnh3p5rp9i4cgc3lg24ksjcmcjmbmna1vf624izn0";
+          rev = "95ba9e71390858bf706b148276f37428dd2774d2";
+          sha256 = "0njfglyspdl7jzybvi67wlqrdfbqhfv36fx48yz5v16018pd856h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ef6e4dab78a4c333647a85ed07a81da8083ec0c/recipes/isend-mode";
@@ -36096,12 +36180,12 @@
     iterator = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "iterator";
-        version = "20160406.1206";
+        version = "20170207.38";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
           repo = "iterator";
-          rev = "1523f1dcbf4086e91561ec5dec4c2f6fcba778bd";
-          sha256 = "006lw8zjxz0702wlrs0nb0ijwh5air3yc3cam7dbkyy7mh632vhi";
+          rev = "9da54f9aed945b46866782cdf962c9e530419297";
+          sha256 = "0r50hdyr9s18p7ggiyv36g011jgg47bgszvjgcmpp23rz131mxyw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/66aa4c3b43083a0098ee3163005dcc36d7251146/recipes/iterator";
@@ -36159,12 +36243,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20170202.223";
+        version = "20170208.956";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "7c73f7166486eeca829446a62efdb9520802ebea";
-          sha256 = "0q8wjynrlq2n6wf0x2nnmvj9h1i2pl39xpz6b7f3jbm7720182ld";
+          rev = "d23d1feefccd658f013cbf7d1b052767bed9b2b6";
+          sha256 = "0fffs5l45hrz7qv4gxwdn4prabl49zgx74daxyflrlkmbffy0gr4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -36247,8 +36331,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "7c73f7166486eeca829446a62efdb9520802ebea";
-          sha256 = "0q8wjynrlq2n6wf0x2nnmvj9h1i2pl39xpz6b7f3jbm7720182ld";
+          rev = "d23d1feefccd658f013cbf7d1b052767bed9b2b6";
+          sha256 = "0fffs5l45hrz7qv4gxwdn4prabl49zgx74daxyflrlkmbffy0gr4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -36850,12 +36934,12 @@
     jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }:
     melpaBuild {
         pname = "jdee";
-        version = "20170122.800";
+        version = "20170209.1026";
         src = fetchFromGitHub {
           owner = "jdee-emacs";
           repo = "jdee";
-          rev = "09d0d4981fe340e7608cd2e1af3d7e72a87edb92";
-          sha256 = "01c9w0qfx5yvbfj3yz2xys8w9gy3nnp5iqhcqnkb2y76syn6w4qk";
+          rev = "60bf9339d1871e06e37865b58be4b6716d081a7c";
+          sha256 = "09hv4pm5p1m4wpr7wfvxda6w1y5wacg6apbn90c6w0zgivq89k4i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee";
@@ -38398,8 +38482,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "57d41c920997ae2b373b0bfa57862845d99337fb";
-          sha256 = "1pb3kid4jb5fr37n2p19h7yvnip9gmp1gjjkbaz7k176r73bf16q";
+          rev = "b15c6507a60ed3ef6dc3cb9489ddc8ca6ebba4b2";
+          sha256 = "0bkk8cld7g0id0xs7ql6piyzdng6rzn4w0i3xlkhlq759mv413dg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -38478,12 +38562,12 @@
     kodi-remote = callPackage ({ fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }:
     melpaBuild {
         pname = "kodi-remote";
-        version = "20161126.1914";
+        version = "20170206.1833";
         src = fetchFromGitHub {
           owner = "spiderbit";
           repo = "kodi-remote.el";
-          rev = "ddb4e59bcbac9d198f0ba6c5e8acebb4c5005946";
-          sha256 = "0gkg0n71fg74a95ckpblizwlp3a59iqqlcq7ix0q6055q6gcvixc";
+          rev = "f028d330e0220d7719f1504ad3b25bab9c1b8e4a";
+          sha256 = "0pmchrsw59ng8vilgml7ba5b17bwh0ac4b31s55nhy3f59l7y0d1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote";
@@ -39083,12 +39167,12 @@
     ledger-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ledger-mode";
-        version = "20170202.448";
+        version = "20170208.425";
         src = fetchFromGitHub {
           owner = "ledger";
           repo = "ledger-mode";
-          rev = "63b47814b0f44fdd2c5e3a16144588a78923ec55";
-          sha256 = "0ng4giaz54iycp3lcvfzfvfpl0cr1w3m0qrz19kdgk7p3ag1c8in";
+          rev = "574093b4bdbf4854f7a661556ec9ebfe5a9a9611";
+          sha256 = "0irxj5w6yrqbyr9js1mp3fh19cfwijd7brpvzas6j7v3fb0mf7zx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/851eca11911b337f809d030785dc2608c8a47424/recipes/ledger-mode";
@@ -39336,8 +39420,8 @@
         src = fetchFromGitHub {
           owner = "rvirding";
           repo = "lfe";
-          rev = "fefa5e03592513d0e435650df52a53f861ce7b04";
-          sha256 = "0sxlcy19bds9yjpcsx731h69w8q2xs8gl3vbk33h2qq5imhd0q18";
+          rev = "332f39d3fef443ef2d869b6a393e8a1c16a7e1f9";
+          sha256 = "11n8d8rbjgi3wfhcwidavg3wfsn1fvdzpqi4s3m8lqc2gq2srccn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
@@ -39649,12 +39733,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20170203.2342";
+        version = "20170209.125";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "5c160ffc38caa1e62614550e9e74981163f07c2c";
-          sha256 = "0p2z907wy090fq4ln0mysflwqialxs0hpvi85j4k8hwfrpir0yl6";
+          rev = "205cd556621d5d1db0c6e9f2608a80fc014b492d";
+          sha256 = "080azhzp6gd1ihkd6ydbcrqzrhggprwn08n9pz7ms0cd75vwxj9k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -39691,12 +39775,12 @@
     lispyville = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, lispy, melpaBuild }:
     melpaBuild {
         pname = "lispyville";
-        version = "20170120.2353";
+        version = "20170205.1833";
         src = fetchFromGitHub {
           owner = "noctuid";
           repo = "lispyville";
-          rev = "8b6e97c906e87203c8034bfda35aa95f2fc02109";
-          sha256 = "16r4p4fh2i41ai0bsppdhyk1w6sb1l8hjbs0apv20f4jssv36hjs";
+          rev = "3ba91c5908484188971e952d98256139123c4cbe";
+          sha256 = "15zfpa2bd80537vcmlp4i39rpxvn6396wynh7sa9yiwrnq246sj6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d96d3603dc328467fcce29d3ac1b0a02833d51/recipes/lispyville";
@@ -39962,12 +40046,12 @@
     live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "live-py-mode";
-        version = "20170203.2106";
+        version = "20170209.2119";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "2134cfef9c7194a2f7b093e037374673e03d2267";
-          sha256 = "1q4vskmkpwk10lwxvhsf4f5p43pjfkh2pvnjip95dp6vn5hgc1p2";
+          rev = "61822a570283987d93543a4fd230c738813072cf";
+          sha256 = "1chf8vkr3sn3i63q1rzpn3cxw16fqv29bbhrzw64scgdjqjn796w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -40049,8 +40133,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "e6120c3c7f5ba8ac0ab6e087c794b1881aa2ef24";
-          sha256 = "1mhcm8id257jdwa4qvyh90a125nfkz33mjwysa21iqqp6fhy4qgy";
+          rev = "7f4371b614a6e25f0efd2133d11d631329eba1fb";
+          sha256 = "0wa86zmbs3i8v50yvww5anzl29194vfkgn9zdh24vkzwxlshfmwk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -40710,12 +40794,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170203.1633";
+        version = "20170208.834";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "b43de68002e77c06e3bc288eca5e849d077864cb";
-          sha256 = "00f0g34hmfyjqyy0zmzssani9wppi1bqbbvnqqfxdlcbf7chxr74";
+          rev = "ac9c50592722a2f03e6f28e54b9fb05e9460674b";
+          sha256 = "0fyb5x22svqxpm7krd061hd2dzd30z2pnkxzqf8lx82j1zapqkqj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -40761,14 +40845,14 @@
         pname = "magit-filenotify";
         version = "20151116.1540";
         src = fetchFromGitHub {
-          owner = "emacsorphanage";
+          owner = "ruediger";
           repo = "magit-filenotify";
           rev = "c0865b3c41af20b6cd89de23d3b0beb54c8401a4";
           sha256 = "0nkxxhxkhy314jv1l3hza84vigl8q7fc8hjjvrx58gfgsfgifx6r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/41aeebef8ed914fb378fef13ba47572accee332c/recipes/magit-filenotify";
-          sha256 = "0bbw6ay3csbc5zc6wa9p9nxpbxl3k35xz9jwqlw8mgz2b1xq083d";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ca5541d2ce3553e9ade2c1ec1c0d78103dfd0c4d/recipes/magit-filenotify";
+          sha256 = "1ihk5yi6psqkccpi2bq2h70kn7k874zl7wcinjaq21lirk4z7bvn";
           name = "magit-filenotify";
         };
         packageRequires = [ emacs magit ];
@@ -40885,12 +40969,12 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "20170128.745";
+        version = "20170209.1031";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "b43de68002e77c06e3bc288eca5e849d077864cb";
-          sha256 = "00f0g34hmfyjqyy0zmzssani9wppi1bqbbvnqqfxdlcbf7chxr74";
+          rev = "ac9c50592722a2f03e6f28e54b9fb05e9460674b";
+          sha256 = "0fyb5x22svqxpm7krd061hd2dzd30z2pnkxzqf8lx82j1zapqkqj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -41092,22 +41176,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    major-mode-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    major-mode-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
     melpaBuild {
         pname = "major-mode-icons";
-        version = "20170130.108";
+        version = "20170208.40";
         src = fetchFromGitHub {
           owner = "stardiviner";
           repo = "major-mode-icons";
-          rev = "278e11182c900ea5bed7004e015ef18e383e40bb";
-          sha256 = "13dfm08w2l8fxmb77pz33yf410hmb1606fy8avslsflaczdm67kw";
+          rev = "8773a4d01a77f0562373633692c8ded0305aa374";
+          sha256 = "1pqbqybv21j4a9h5spyv780khky80n5bwvh1dg9sqia47kf3z5ak";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c8f551bec8bdc5dee4b31edea0c2f92b3c77ec56/recipes/major-mode-icons";
           sha256 = "02p5h9q2j7z3wcmvkbqbbzzk3lyfdq43psppy9x9ypic9fij8j95";
           name = "major-mode-icons";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ emacs powerline ];
         meta = {
           homepage = "https://melpa.org/#/major-mode-icons";
           license = lib.licenses.free;
@@ -41137,12 +41221,12 @@
     make-it-so = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "make-it-so";
-        version = "20161009.43";
+        version = "20170206.741";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "make-it-so";
-          rev = "9e10518a2fed8a4a5961b6abad50ef92b4747600";
-          sha256 = "0ilqa7jdfzyhjjnxn69cx93nj3py429jwyg8rgzas87kjk9qiv7m";
+          rev = "c674b25e6b3eb7c848a62727e69bdafdc92a37be";
+          sha256 = "1qjcwvqbxl0iqlbwcisqmq2m3giwkm2sq5i2a5crrwhzxjasbbsj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aad592089ed2200e2f8c5191e8adeac1db4bce54/recipes/make-it-so";
@@ -41347,12 +41431,12 @@
     mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }:
     melpaBuild {
         pname = "mandoku";
-        version = "20170204.332";
+        version = "20170210.348";
         src = fetchFromGitHub {
           owner = "mandoku";
           repo = "mandoku";
-          rev = "5c4320254840dfeee410c46ab36ba94fa2efb6e1";
-          sha256 = "1wy2xs87ndvsg821chq9apnvh2l6ny2bdq815fqw1kyr3ml5x8mk";
+          rev = "2727f2b1b217764e8217fb0db9ab87a8bcc80201";
+          sha256 = "1lxmxka6jg3ma6nmg5b4b6a2lz94in43pgb7gh1kprwl3i13578w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -41470,6 +41554,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    markdown-edit-indirect = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
+    melpaBuild {
+        pname = "markdown-edit-indirect";
+        version = "20170208.722";
+        src = fetchFromGitHub {
+          owner = "emacs-pe";
+          repo = "markdown-edit-indirect.el";
+          rev = "f617397e5f1a77d87a1d189f66c5a2f012f66b4d";
+          sha256 = "00l6mkvsfq37jy3c7qmw4ca5h0an9326ambrkrna4ii03qlshqik";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fa4da9d5c63da3bd777101098168696f5c4d3fbc/recipes/markdown-edit-indirect";
+          sha256 = "19038vb6ph7l9w1yv8pszyd13ac38l44vb46l9jmgyby773m7644";
+          name = "markdown-edit-indirect";
+        };
+        packageRequires = [ edit-indirect emacs markdown-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/markdown-edit-indirect";
+          license = lib.licenses.free;
+        };
+      }) {};
     markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markdown-mode";
@@ -43176,10 +43281,10 @@
       }) {};
     modeline-posn = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "modeline-posn";
-        version = "20170114.1554";
+        version = "20170205.926";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/modeline-posn.el";
-          sha256 = "068kdgzzv76ls5hyxs77vzm5ai7x8zcsmhjk78pmfirfrjrxcjgf";
+          sha256 = "085q998d7b4i3ay5cg4dcny7jw8a3hbvx2hifshwx4cck10p8f8b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c62008950ea27b5a47363810f57063c1915b7c39/recipes/modeline-posn";
@@ -45062,12 +45167,12 @@
     neotree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "neotree";
-        version = "20170201.712";
+        version = "20170206.804";
         src = fetchFromGitHub {
           owner = "jaypei";
           repo = "emacs-neotree";
-          rev = "b7479d0d96e44983917c7e3546bee2e215bb4a30";
-          sha256 = "09cjnybyd9mgvy9vn1hd3r0fzmxla5ijpa83mx5ddjbig10wrva1";
+          rev = "ab9a1559d01857252b85d787666ea24a103003b4";
+          sha256 = "04473ay2hcpw696x9k2gh1dvj2h4nb898q4g3nf3b0rdg2cpb250";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree";
@@ -45360,8 +45465,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "1351b0df87a0984914769c5dc76489618b3a3fec";
-          sha256 = "09zvphzik9pypi1bnjs0v83qwgl5cfb5w0c788jlr5wbd8x3crv1";
+          rev = "4724903c78e80481fc63d627081fac6a98e4205d";
+          sha256 = "1wqyha271xvlyjmk4ygqhdj8m8gcz2f9npknpz5vriqnpv22hwmr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -45482,12 +45587,12 @@
     no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "no-littering";
-        version = "20170122.942";
+        version = "20170206.33";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "no-littering";
-          rev = "87fffa1973376bd1837fcf84277cd16db9c96957";
-          sha256 = "1nfllm98d0893wk49fkijc071pg3v3qmpy4apyppj88k6m58y573";
+          rev = "1a6ca91e4a2cb48cccc989b6473191f42b606ab6";
+          sha256 = "1kd65x4bg9xrqp7241yxs352p2hiwa5hnggi2sw4718wcfbim1zw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
@@ -47473,12 +47578,12 @@
     org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-board";
-        version = "20170103.239";
+        version = "20170207.634";
         src = fetchFromGitHub {
           owner = "scallywag";
           repo = "org-board";
-          rev = "55c52745f6f156062a7187795b6b0c6aaa1f1e2b";
-          sha256 = "0ca8lbm5gzcmpzwnghs0f8klxrz5sy1brw78h7rhpv4rdwfw1ji5";
+          rev = "7f07d1bb5758a28f7e1618a14281ad4da71c26e2";
+          sha256 = "18ngnd4fkh59az0mj4lgvp5zil56qxn01d9aif6n6xszfcbgsnj1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board";
@@ -48123,12 +48228,12 @@
     org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "org-jira";
-        version = "20170117.2024";
+        version = "20170207.2145";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "org-jira";
-          rev = "8d3a36c68a948676cfc0512c68200fb2e9456508";
-          sha256 = "0pp05wxbn627y1yapya2phda2s3ddgcblvqyzv5i6q231slc3c69";
+          rev = "e665315fc041851e19c759e51173f9ddc0445512";
+          sha256 = "0fgir67cm6gmwj80gmhblg9j7pp6qvkksm9qnsdj2r5q1c9s33kc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
@@ -48210,8 +48315,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "de58e0ae3351f4333752da07ad13db549b2a44bc";
-          sha256 = "176i7pwljwwq5dy7ch39ydk87njjmcqdxb55zpyhdg8bimvkg4xy";
+          rev = "eb59c75f394ddec8f0714ccff3e9a6280ee1898d";
+          sha256 = "0sk3232jgrnfjxix8mrrcq8zwxww16iy6vpsq5njh8avqdf6mi9n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -48230,8 +48335,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "de58e0ae3351f4333752da07ad13db549b2a44bc";
-          sha256 = "176i7pwljwwq5dy7ch39ydk87njjmcqdxb55zpyhdg8bimvkg4xy";
+          rev = "eb59c75f394ddec8f0714ccff3e9a6280ee1898d";
+          sha256 = "0sk3232jgrnfjxix8mrrcq8zwxww16iy6vpsq5njh8avqdf6mi9n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -48247,12 +48352,12 @@
     org-mime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-mime";
-        version = "20170204.531";
+        version = "20170205.149";
         src = fetchFromGitHub {
           owner = "org-mime";
           repo = "org-mime";
-          rev = "91d8f487755a3b7159891e4da77ccfa7ff2836f4";
-          sha256 = "164gqknhb1ddfafkafjdr2a2a34m71sm8pbglfh5q0qg52f832za";
+          rev = "a0b82a6c1a0dbcf5b7bebfe2e5817d54a1cd3cc8";
+          sha256 = "11wldx6c53ncw3pmdwxn31q82vkcffqvr2cfphl5bhb4q8r5lrjn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime";
@@ -48352,12 +48457,12 @@
     org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, git, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
     melpaBuild {
         pname = "org-page";
-        version = "20161121.2129";
+        version = "20170206.1845";
         src = fetchFromGitHub {
           owner = "kelvinh";
           repo = "org-page";
-          rev = "bef1e2fbcb60e85b3d27887fb0c6c988a18a0b59";
-          sha256 = "1yhy98rg7zqj91hkabkf00mzgzk9cb5mvp5mad09gfy9ijkkm6sg";
+          rev = "c2f54f310e0f50b5ca291a45356717e932505bb5";
+          sha256 = "1q76daimscr2mp0wi6cp0mbph7cp4gdm818cdi76rsz48xa83gxi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/872f163d4da58760009001472e2240f00d4d2d89/recipes/org-page";
@@ -48405,8 +48510,8 @@
         version = "20170124.549";
         src = fetchgit {
           url = "https://git.leafac.com/org-password-manager";
-          rev = "ec862fa9680aa37b18a7e937e84472a5bdd94635";
-          sha256 = "1ia7sjnd6z6x2m2cbf17md2adbsbnfg30z8aalb991avv9bj9lm2";
+          rev = "a982506652a2f5f4afeb338238e724d361cbc74d";
+          sha256 = "0x9f0vlgawbvga56yj95pdcx1j9r51ax76xsbbyrir0iyawgh258";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02ef86ffe6923921cc1246e51ad8db87faa00ecb/recipes/org-password-manager";
@@ -48617,12 +48722,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20170130.1818";
+        version = "20170209.623";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "ad34032f07a8eac49f091824ac80b7752e8bdf74";
-          sha256 = "03869nki9c0msmqclm7mgsqnhdbkp0xahnpk8h9d7zldqiqck0x7";
+          rev = "2d9c53509e6930d8857ac74ef710637b7c34d77c";
+          sha256 = "1ja8b60w5snnkks94qb63fy6rscwcpkx3anaq6z9fdv78yjbx1x1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -49369,12 +49474,12 @@
     osx-dictionary = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "osx-dictionary";
-        version = "20161207.810";
+        version = "20170208.505";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "osx-dictionary.el";
-          rev = "0e5e5f1b0077a62673855889d529dd4f0cc8f665";
-          sha256 = "1zpr50q7i4wg1x7vsj69rh1b8xvk9r0591y4fvvs3a2l1llca2mq";
+          rev = "ec16c40cc4db0140db1cf6ad1fb1198c7c344b2b";
+          sha256 = "0n09s09qaqwdrpd4dgxj16bh3lgc8nzdld49z8zkipf3cfh5v040";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae4467ad646d663f0266f39a76f9764004903424/recipes/osx-dictionary";
@@ -49642,12 +49747,12 @@
     overseer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "overseer";
-        version = "20160517.2343";
+        version = "20170207.2241";
         src = fetchFromGitHub {
           owner = "tonini";
           repo = "overseer.el";
-          rev = "817c2d4c40071f1cd11fc91c60a1eb44c9f1543f";
-          sha256 = "0pzrsag2hxg4kys57w2ragk6kfrpilaamwrzw0czi53r6vmddfdp";
+          rev = "3269801dc5145d41c11599430229340e6dfa6cc6";
+          sha256 = "1zjp1bw7ipg4ibabrc0wzzsvd4jydjq571768v2hdpzcdw36d8f7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82e6b86f20a2d2d687b13091da31150c467bf271/recipes/overseer";
@@ -49730,8 +49835,8 @@
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "18d63e2823ad481414499d070623f898f9c0ba3a";
-          sha256 = "0k4ddlhpjinc5h0ajv58qjgj28b3zp6nhk6ivi8ygivxin228r00";
+          rev = "f0eae25e9d5c7e426551c2ae2ba5695f0df2cff2";
+          sha256 = "1lxh2zangf0r8xd11h9fja6jcgxfs6miw2n5r89z92nj0b0vsh3g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -51018,6 +51123,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    pastery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+    melpaBuild {
+        pname = "pastery";
+        version = "20170206.1934";
+        src = fetchFromGitHub {
+          owner = "diasbruno";
+          repo = "pastery.el";
+          rev = "3f60a2660613c09be5a0b6e299828b44ee3c8732";
+          sha256 = "1dzbkiy2qjdq4isrpiwj25qj069nhydzngg6avyh2c2qmxkibjsr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6058218450071db0af9a5b8ce8ec09a735c4ab66/recipes/pastery";
+          sha256 = "006qawjc86spbbs2pxvhg9w94rcsxap577cndqwaiw1k0cc8vkhp";
+          name = "pastery";
+        };
+        packageRequires = [ emacs request ];
+        meta = {
+          homepage = "https://melpa.org/#/pastery";
+          license = lib.licenses.free;
+        };
+      }) {};
     path-headerline-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "path-headerline-mode";
@@ -51671,12 +51797,12 @@
     perspeen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
     melpaBuild {
         pname = "perspeen";
-        version = "20170121.1844";
+        version = "20170205.300";
         src = fetchFromGitHub {
           owner = "seudut";
           repo = "perspeen";
-          rev = "beff7fd743b0fcbc1091e1e9d28688e52962225e";
-          sha256 = "0csa5cqbzj3kggl10bf6mcq4v3nq9y282hlk68p6qbz79injg7bv";
+          rev = "8fc32cf57fe8f38bf47e8bce99058ba3cc2561ad";
+          sha256 = "1n69jshs35cafx6p7ibdr1mqzbp2k1gdknb1k9f9nfzasr0nma56";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19bead132fbc4c179bfe8720c28424028c9c1323/recipes/perspeen";
@@ -51773,6 +51899,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    phan = callPackage ({ composer, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "phan";
+        version = "20170205.604";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "phan.el";
+          rev = "6442663bf7618bc614b6c47b0ad7bc591c68f947";
+          sha256 = "0s38vbnsbpazca0jsahjmms7qgq74gsvfn2zkrfkhx9y8cpfxrrb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d591d9ba70b1e32f25204ad9409aad78fd68a93c/recipes/phan";
+          sha256 = "16r1d2bgbb2y7l141sw7nzhx0s50gzwq5ang00y7f4sfldqvshzf";
+          name = "phan";
+        };
+        packageRequires = [ composer emacs f ];
+        meta = {
+          homepage = "https://melpa.org/#/phan";
+          license = lib.licenses.free;
+        };
+      }) {};
     phi-autopair = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
     melpaBuild {
         pname = "phi-autopair";
@@ -51797,12 +51944,12 @@
     phi-grep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "phi-grep";
-        version = "20150212.724";
+        version = "20170206.2055";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "phi-grep";
-          rev = "9f1eb3548311816920864a171de303245a001301";
-          sha256 = "1rchxhp4kji5kbg8kzkzdbfy8sdbgbqd5g59cch7ia9agh5jvwyx";
+          rev = "efccc26f3beb6a3d8c1b655c31aa3c457115cfa4";
+          sha256 = "0r67zzc6b2f330zixywxcy4xxd9hxww7x77brrs242bcgi2d7ryc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/992655fa4bd209abdf1149572e95f853e595125e/recipes/phi-grep";
@@ -52053,8 +52200,8 @@
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "php-mode";
-          rev = "e41a44f39d5d78acc2bd59d2a614f5fc9ff80cd3";
-          sha256 = "0ykdi8k6qj97r6nx9icd5idakksw1p10digfgl8r8z4qgwb00gcr";
+          rev = "2a335398928a4fdab24335ed7aceed95c1bd0871";
+          sha256 = "0i8ns9jncih3s33wv66gkd45brixlc4smbssb3j47dqp3drpn0nw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -53998,22 +54145,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+    projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "projectile-variable";
-        version = "20161109.625";
+        version = "20170208.918";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "projectile-variable";
-          rev = "dedd0f1669d9498d59231912c4ee80a1080ac93b";
-          sha256 = "1wmwy5iamc2g5grhshss0cmxjspz83kl8iclkv42c4vc1l1nsgfw";
+          rev = "8d348ac70bdd6dc320c13a12941b32b38140e264";
+          sha256 = "0l38nldx6lwjb7mxixykiyj10xwb35249dxfg0k2wkmb2vy1fkxs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ff603b43235f546cd47f72e675aee88d5f41e855/recipes/projectile-variable";
           sha256 = "1cj8nwxf1jp5q5zzxp92fxla6jhwzd21gw649ar6mygi4hgymsji";
           name = "projectile-variable";
         };
-        packageRequires = [ cl-lib emacs projectile ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/projectile-variable";
           license = lib.licenses.free;
@@ -54085,12 +54232,12 @@
     promise = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "promise";
-        version = "20170203.2139";
+        version = "20170208.348";
         src = fetchFromGitHub {
           owner = "chuntaro";
           repo = "emacs-promise";
-          rev = "8b176ba4354e9b6e6c2fa87231b85424c25c511c";
-          sha256 = "11mx0gcyi4dmhh45n6r93xqvi9s94dhx7ii1iy4g35f4ki2cqfdx";
+          rev = "06161da00e73afa013f3de59f2cf2a2d5a721f36";
+          sha256 = "13k6cj3igvslwwiar92vg58vr8jd24ns927xxxjjb5wdgzvbj5i9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3eaf5ac668008759677b9cc6f11406abd573012a/recipes/promise";
@@ -54215,8 +54362,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "39756643df2f88805649595e651b719c8f5a4dea";
-          sha256 = "012d27q0b9cw1jahi47k0473w96l1wp6sr4rcm5ywa29nxrirgg0";
+          rev = "c6e0d0e7f3dca63c006edae515dfca2a89b9c1e4";
+          sha256 = "00808ymwd7y0qq3xkyxkn3bvmp806qwd6jil3x4kqhymnwqnah7g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -54323,22 +54470,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    psysh = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    psysh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "psysh";
-        version = "20160711.1048";
+        version = "20170205.1142";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "psysh.el";
-          rev = "6932f03447c3d821e4c03e99f1630928f0979452";
-          sha256 = "00dssrdsdvwdg6a6fwl3wv0y94axcd4jb3b3ndd1p3bcr56fxq49";
+          rev = "429b59ba8fd5ac7b6d3c6c4e3ad72867062c96db";
+          sha256 = "0ldv1lyra05g91hdsif131x7yqdmwld8hdpg4h3qi040kls9bix1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b3131d9a0ad359f15bc3550868a12f02476449a/recipes/psysh";
           sha256 = "0ygnfmfx1ifppg6j3vfz10srbcpr5ird2bhw6pvydijxkyd75vy5";
           name = "psysh";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/psysh";
           license = lib.licenses.free;
@@ -54958,8 +55105,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "854bfe802145355a659e0b1ec068d31d8000988d";
-          sha256 = "1hc17wqg5sp51j0k8iv7m0xkc483ay514c2mfc5nkbrq6kxz05dq";
+          rev = "a59a1581571c8f27708778a9ded58435c05f7703";
+          sha256 = "0r3pwq7hy8cawljk63lm239cjf4q9zfs1cmhjaq493dd9xjizwms";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -55101,12 +55248,12 @@
     python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-mode";
-        version = "20170203.606";
+        version = "20170208.237";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "7df57bba67d5c8aab9382d41a28018d1e0fda891";
-          sha256 = "1jyk8y7yijxwn0196fz75yxxmd8s53r240wi3555g3fr2898x16x";
+          rev = "ad91fe544cc8f361c718ca8a538bd44a4fb331d8";
+          sha256 = "1wcgaydw7fnix5c5ka2lkjliznbavls51sgzq5l5s6l48190a7l9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -55311,12 +55458,12 @@
     quelpa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build }:
     melpaBuild {
         pname = "quelpa";
-        version = "20160818.2249";
+        version = "20170205.2155";
         src = fetchFromGitHub {
           owner = "quelpa";
           repo = "quelpa";
-          rev = "d68a45fe0c4a1d4125b98adbeab65e3c8a30e908";
-          sha256 = "16sva8zl0hv6a6cr63d1g9038c304x6qxqgip117zxy1w36cfzdl";
+          rev = "c1fe1dce4740ca1fcc3ac4c72db6999579d867a1";
+          sha256 = "1m0mx8marrhc3wb925x66rpr15ynax2vx0crljqqsxk04bralj27";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa";
@@ -55773,12 +55920,12 @@
     ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ranger";
-        version = "20161002.2336";
+        version = "20170207.2133";
         src = fetchFromGitHub {
           owner = "ralesi";
           repo = "ranger.el";
-          rev = "584e4ae8cce1c54a44b40dd4c77fbb2f06d73ecb";
-          sha256 = "01rphv92g1r0cw5bwkbrh02s0na7fjrddxx1dckk2y7qr97s7l8j";
+          rev = "efd54e6090114138f6b3acaf21168eca29363cd4";
+          sha256 = "02hi45xd6vgaj98v772nmwhwqzlz68d9h5ywndp3i18zddnpr9y7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0207e754f424823fb48e9c065c3ed9112a0c445b/recipes/ranger";
@@ -57235,12 +57382,12 @@
     reverse-im = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "reverse-im";
-        version = "20160813.208";
+        version = "20170209.556";
         src = fetchFromGitHub {
           owner = "a13";
           repo = "reverse-im.el";
-          rev = "76a391a26957eaf5030f85cb0f302a45ea771df1";
-          sha256 = "0vjw7l0zgvailxvn1jqfn66hp7bzfixkd0qz75q7dg1b61fzz067";
+          rev = "47033e0597675a45d2b6852682e392e848a51af8";
+          sha256 = "0kd55p8hl7mhcbsqxhqqyfkzq31cnk4aaqzrka681dk6d1xzk8z5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f282ebbed8ad01b63b0e708ab273db51bf65fdbb/recipes/reverse-im";
@@ -57358,12 +57505,12 @@
     rg = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "rg";
-        version = "20170121.945";
+        version = "20170206.833";
         src = fetchFromGitHub {
           owner = "dajva";
           repo = "rg.el";
-          rev = "be8a125addb795a8f695c1064a4e0a90549ba4bf";
-          sha256 = "019h11faj6fzz54gpilxcqbl78wx9vfpqmwn31y5syjmjp9d3fxx";
+          rev = "ec9eb5240191612debf0392ee7a7f491c7dae27e";
+          sha256 = "0773d0n5jq42yr5p1xbbfji027j0kw4msv1p8b7zk82ij1yc7hyr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@@ -57761,8 +57908,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "9f9e3d1e915927a2e4202b411933261cc1599b4d";
-          sha256 = "1fzaaj5y9p13x3laycacxidf4lmhb9pz210w1iqlavyjsf6vdw6g";
+          rev = "4e4f6c01cda75dde0cba313751897c3b8c67b014";
+          sha256 = "097niszwri76g5sbwh4hnsv27wk1nfqd7gpx974rh1bwfk735jxg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
@@ -57823,7 +57970,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57535";
+          rev = "57597";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -57903,7 +58050,7 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57535";
+          rev = "57597";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -58533,8 +58680,8 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "757c43bdd3ff9f3d35f5714e7ee695dc964bf8dc";
-          sha256 = "0di1lzfx17002rssl7ys57kg56pmadwcsm7km3301qd8b95ihzvv";
+          rev = "2ef5333d8dbeddf7f862c76c84a8550275b13c3c";
+          sha256 = "0jxns9jzmlzr7qvsprid2ij26y246nb8yzhw9i8w2xv09gbmfxvw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -60603,12 +60750,12 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20170202.700";
+        version = "20170209.1932";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "4f5912550a876bcc08e8c4342c2faccd1e6ab5c6";
-          sha256 = "0mb7pszpgjpzkwsmsqpccssv5zzca0j92pgxpd453kjknp5l24ag";
+          rev = "97ed24213df302b5848b57b0e9a17a3af40cee32";
+          sha256 = "1pj8zl7nk31mr94izpqhhan7fav0n7k37yipwphs6f1sbxdi8h3l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -60666,12 +60813,12 @@
     slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
     melpaBuild {
         pname = "slime";
-        version = "20170203.1728";
+        version = "20170209.1240";
         src = fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "7a2b4694ab8f70cbaabfda83fc17cb23d7c0b987";
-          sha256 = "1izfrm0j98wdmd3lnxf62b6g4sqv4686m8lrx42m5s8y1knr5igk";
+          rev = "9eeb7163f07a88450871fff2be78446ee7a4fd52";
+          sha256 = "0pxc5ygjc3jz42nxim5l0yc0wns4rfzs2rxwpxy027rqwkk0ap6j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
@@ -60855,12 +61002,12 @@
     sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sly";
-        version = "20170110.629";
+        version = "20170205.1642";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "sly";
-          rev = "98962b4eacf1621699a2f6183fdc3ff9d7e0a07d";
-          sha256 = "0x5lwi0lcy2hnhnygcff2zrchjj5307086pqkiaisl940yhi0g5k";
+          rev = "8b676ee14a3bdfef503472e31d1a5e89fcee63ff";
+          sha256 = "1kyryixfmqzjyh6f2bcsrsqvklcvmf9saqm6f0cnxa86rvcdkln0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly";
@@ -61296,8 +61443,8 @@
         src = fetchFromGitHub {
           owner = "jcsalomon";
           repo = "smarttabs";
-          rev = "1b2f34cc33335486f2b08b864a8037092c1a2956";
-          sha256 = "07zc2iw5ijyn822z29g5xb6hhhdmg9b98pfrdwrm0kw86pypxyxk";
+          rev = "9cc2594b82b03e7d68645a4878f9359f8b8c34c5";
+          sha256 = "0bjl3j047jh674vyfmh9izwak2yic8f7aqv832hn1inhnavsl3xx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d712f0fb9538945713faf773772bb359fe6f509f/recipes/smart-tabs-mode";
@@ -61334,12 +61481,12 @@
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "20170129.956";
+        version = "20170209.246";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "add86ac3eeef160787728cad3e58b035dc540dba";
-          sha256 = "0d7rgj3b858w79g3nwimqaiqza2400y6c0v17ncsa7x1kvxrxk1f";
+          rev = "7647f790e005b0e3e18edcf54e425d01a30ae3b4";
+          sha256 = "1s0kz75m3hazgdhqi7a28v6qzxy2sbmlxlpqyix6874gvkfcwchz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -62905,12 +63052,12 @@
     ssh-agency = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-agency";
-        version = "20160101.1435";
+        version = "20170205.1306";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "ssh-agency";
-          rev = "f8042250174fb72dd935b3e65820580e3232a6fd";
-          sha256 = "0076g1yb8xvn6s8gz5jxiz8mn448fmab574yizgakbxaxd91s1dj";
+          rev = "94abffa716aff963175196066526c7ee8b4efae7";
+          sha256 = "1r41hgh0kaf9x56jllqjz7f9ypzgyf9pqqpm3r49xyi8fr1drbxc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a9e4bd0205908bfb99762c7daaf3be276bb03a/recipes/ssh-agency";
@@ -64083,12 +64230,12 @@
     swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "swift-mode";
-        version = "20170128.2303";
+        version = "20170205.348";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "swift-mode";
-          rev = "42669da0b68bba2d12f9d5fc38f30def118bb999";
-          sha256 = "0l7f7mm4a7qrw0i6fnakgy7payghjgmamln9ldbdx593hg1jjzr8";
+          rev = "75cbae223fbf84d19e14a7f7734ded4f46078654";
+          sha256 = "1ilawg15l6j3w2mlybz01h1dk9mym37wq4illz1llc3q3v9n7nny";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
@@ -64125,12 +64272,12 @@
     swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "swiper";
-        version = "20161213.719";
+        version = "20170208.2028";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "7c73f7166486eeca829446a62efdb9520802ebea";
-          sha256 = "0q8wjynrlq2n6wf0x2nnmvj9h1i2pl39xpz6b7f3jbm7720182ld";
+          rev = "d23d1feefccd658f013cbf7d1b052767bed9b2b6";
+          sha256 = "0fffs5l45hrz7qv4gxwdn4prabl49zgx74daxyflrlkmbffy0gr4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -64520,12 +64667,12 @@
     system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "system-packages";
-        version = "20160726.1344";
+        version = "20170205.1305";
         src = fetchFromGitHub {
           owner = "jabranham";
           repo = "system-packages";
-          rev = "19ab3e959c04dc084f0c679228ab675e5a559c30";
-          sha256 = "1slycdacara1y4zqw0vvn3rixx3r33lk9y7ls99bb87a8k2zxlll";
+          rev = "5b3f7f5ae08d306604423f48e9a2ab5daaf58584";
+          sha256 = "0b7hjgxr6pv6dj3q233mxlm8ssxpvkhckibn0cfr5xb7ycfkd6rm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages";
@@ -64855,12 +65002,12 @@
     tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tao-theme";
-        version = "20170126.1021";
+        version = "20170209.950";
         src = fetchFromGitHub {
           owner = "11111000000";
           repo = "tao-theme-emacs";
-          rev = "a808ce58441de6256e670d39b27079d8630b031a";
-          sha256 = "0yf0hqm20mgiks9098231ry5sdv702agfj5pasgyyb19inawk13z";
+          rev = "a3bcc27b53b08f2114261795d4b4422bd75c94a8";
+          sha256 = "1l439z9wa9jwb1ascfvjzm8699cjr8hxip20536ph8dql8hk7rsz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme";
@@ -64880,8 +65027,8 @@
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "tawny-owl";
-          rev = "944c523029a40a68ce8896ca69ebccfe8db8b0ec";
-          sha256 = "1c1vmvg007vrbxhrq41ylfckppkkijgf3n2bij3x5db86ylfd9qs";
+          rev = "1cb37c49e97aff263ecb5f20746256126b048628";
+          sha256 = "1310pw200l6jdlpdyscnhf9cwll5wc1vyayi55x7jyvm02nngbq1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode";
@@ -65300,8 +65447,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "21b4f4b7f1f36724a18d2f70c50b2e5b634cf6b1";
-          sha256 = "0kq56iiqpclf6yl9g1fhhi9pk4icv5k1f0nyips88nhsq41j395c";
+          rev = "db13aac6c89c48410d674bcddaf23716b77d0c16";
+          sha256 = "0d3grla09br7vxk91ncv2wzfwh5jfaniw62ydmccrnvm5sy32zgk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
@@ -65321,8 +65468,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "21b4f4b7f1f36724a18d2f70c50b2e5b634cf6b1";
-          sha256 = "0kq56iiqpclf6yl9g1fhhi9pk4icv5k1f0nyips88nhsq41j395c";
+          rev = "db13aac6c89c48410d674bcddaf23716b77d0c16";
+          sha256 = "0d3grla09br7vxk91ncv2wzfwh5jfaniw62ydmccrnvm5sy32zgk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
@@ -65793,8 +65940,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "a3d6be906b339ce4e55e8fb8d98ff11480792949";
-          sha256 = "1wf143c5d5kwg6a7rs3x56jf5pvcpba121pr8178rn45lqdnimr0";
+          rev = "3590f1e7ca49c3eea879008d510023edf30b6408";
+          sha256 = "0kh2ws9ryfk5qgnaszacsznrg3bwr9vx6riiy2za02in0dlbldk9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -65850,12 +65997,12 @@
     tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20170128.2207";
+        version = "20170210.255";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "13f6f64cb4e1236ba51d05b8acd70f36968851bd";
-          sha256 = "1xisk3s1sygb38gcr73m4iqpssbp6vms3162dn090g2sf0g4sssv";
+          rev = "1d000d8cebd5ae8768b0acba065cf267ba5d9c23";
+          sha256 = "059q2pijha146hpiz19ykckbcprdfmw825p45wfqqm4lll1dfd9y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -66582,8 +66729,8 @@
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "5444a8dd90691de941509f7cc9ac8329c442dbdd";
-          sha256 = "00dcdszskzqggg4gjp5f2k2v1a03jad52q2pqf04jqjycapkx227";
+          rev = "773e48624edc32022764d9b3bab861f32c336ac3";
+          sha256 = "0s0ksk4f8hz2jajh7hx8b5qv8vrv5mr8mvk8n51ycip0gmrl98nf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking";
@@ -67425,12 +67572,12 @@
     ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ujelly-theme";
-        version = "20170202.2206";
+        version = "20170209.24";
         src = fetchFromGitHub {
           owner = "marktran";
           repo = "color-theme-ujelly";
-          rev = "0a339a439390f9bec41f66b1f058e8e8ca90ba31";
-          sha256 = "13qsbncz6plld5y5n1klrliag6v8lzng7z4m5906vfw6sbpfyqx5";
+          rev = "2b54793859c0569b0e201f5c32cb796097250393";
+          sha256 = "07c25f129948j52vfy42fzfhpd9dvq2568iclnbhzn9jpiz8m9d8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme";
@@ -68014,22 +68161,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    use-package-chords = callPackage ({ bind-chord, bind-key, fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }:
+    use-package-chords = callPackage ({ bind-chord, bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild, use-package }:
     melpaBuild {
         pname = "use-package-chords";
-        version = "20160530.1042";
+        version = "20170208.1035";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "use-package-chords";
-          rev = "8dedc76617cbabd605f4c0d486018e3c4d3c8a9b";
-          sha256 = "0d69hckz6xbll1x2mll385kcw7mwx8cwxg1wdhphnww0s810isgp";
+          rev = "e8551ce8a514d865831d3a889acece79103fc627";
+          sha256 = "0500pqsszg7h7923i0kyjirdyhj8aza3a2h5wbqzdpli2aqra5a5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92fbae4e0bcc1d5ad9f3f42d01f08ab4c3450f1f/recipes/use-package-chords";
           sha256 = "18av8gkz3nzyqigyd88ajvylsz2nswsfywxrk2w8d0ykc3p37ass";
           name = "use-package-chords";
         };
-        packageRequires = [ bind-chord bind-key use-package ];
+        packageRequires = [ bind-chord bind-key key-chord use-package ];
         meta = {
           homepage = "https://melpa.org/#/use-package-chords";
           license = lib.licenses.free;
@@ -68395,12 +68542,12 @@
     vdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
     melpaBuild {
         pname = "vdiff";
-        version = "20170204.1156";
+        version = "20170204.1636";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-vdiff";
-          rev = "ff1fbc409f816574a230bfdaa17ea73f65196654";
-          sha256 = "1h2arynqw3ps960cb18nyhkj00rjn7xdrrn7vlbrvzxqawpjhn82";
+          rev = "c32fe46ad8362b4d918e194cca5ef84dd09981bf";
+          sha256 = "16xw159pydkqiki21axv3vhf56yqn8jgg9n97xws2swfkh4drafm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff";
@@ -68777,8 +68924,8 @@
         src = fetchFromGitLab {
           owner = "iankelling";
           repo = "visible-mark";
-          rev = "c1852e13b6b61982738b56977a452ec9026faf1b";
-          sha256 = "15zdbvv6c114mv6hdq375l7ax70sss06p9d7m86hgssc3kiv9vsv";
+          rev = "a584db9bc88953b23a9648b3e14ade90767207f8";
+          sha256 = "1rsi9irv9i03627cmfaqz03f9cvpm7555ga8n2gs622lzp6bb3jf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/76ac7178ee5381e08ae881f3fc6061106eeb1c1d/recipes/visible-mark";
@@ -69022,12 +69169,12 @@
     vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }:
     melpaBuild {
         pname = "vue-mode";
-        version = "20161227.133";
+        version = "20170206.120";
         src = fetchFromGitHub {
           owner = "CodeFalling";
           repo = "vue-mode";
-          rev = "1561da428a1a30170b71cab71c576a508e4f4367";
-          sha256 = "1081kypg9lhc0d3kjw4vkk9s3g9dbb5rr2rh4d2s1zicy7rxhadn";
+          rev = "0b159770abc865796a1fa02be2f5959138b2f8a6";
+          sha256 = "1i6a6g4l9xy45kllgr6kgai3mfg8b060dpspn6vv69kpwjcqiza7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode";
@@ -69185,12 +69332,12 @@
     wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }:
     melpaBuild {
         pname = "wanderlust";
-        version = "20161227.2220";
+        version = "20170204.530";
         src = fetchFromGitHub {
           owner = "wanderlust";
           repo = "wanderlust";
-          rev = "59a4d97286251a0c0871c085aea01fa1abc1e192";
-          sha256 = "1k7kkdr2kr7qivvbifqgw9hx111bscbh376q1f44p825flxnzyn8";
+          rev = "1a49ac05e9558edd4993d345c25cf2d166bfc17e";
+          sha256 = "1bvq0wwc013f6aapwql1rwv9r5nifgff2iwc17kaiwlwwqd6j70z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust";
@@ -69752,12 +69899,12 @@
     which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "which-key";
-        version = "20161222.1221";
+        version = "20170209.729";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-which-key";
-          rev = "49ab7afd93ef36e5f0261eff7151360edeeea4e6";
-          sha256 = "0cqq1w9cjrp61mjzi7y49yrbhclpf0cab9fcylq14v1ilhipfdxa";
+          rev = "0d56e4369b53af2c5960af4827b56b06d9162d62";
+          sha256 = "08dw13hn1w9m37gd2cch3z9af504x55w0hlinn05j1jgvja50c7f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -69963,8 +70110,8 @@
         src = fetchFromGitHub {
           owner = "foretagsplatsen";
           repo = "emacs-js";
-          rev = "b5bcc7d5dd37a658a1fa77ec2272c9b2a8ca30b8";
-          sha256 = "0jgrx90n17h9ib9vjymxxra2abjk7pbdk1h9whqby2jg2xvzp0hm";
+          rev = "0afc3a524ec4c900f7ac1291e37b4f7da19e9ae6";
+          sha256 = "15rjaxzwq7wh6zmyh8nzkbr4c75z8qjlbhpi8yjmf9bik3srr14d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
@@ -70331,8 +70478,8 @@
         version = "20160419.1232";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "280ab84bf8ad";
-          sha256 = "088khr4ha37nvxzg620a6gyq7pc40rb13bbi9vgqhgjgggpq61d9";
+          rev = "3a654cfe6632";
+          sha256 = "1ahmpk0302g375w9ikkzagjvx8qblkzx40w960ka0cqf7nzyk75d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -70936,12 +71083,12 @@
     xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20170129.304";
+        version = "20170210.354";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "fd63ec17a77d82c565f7ec181dbd928af3da8c9a";
-          sha256 = "0lgxw7vjy7kvh7lhp6a0yxgk0m77a5wpj7x45s1c33vcblwzsgdy";
+          rev = "7fd0ae4bd2afbe59273b224b299519aad564189c";
+          sha256 = "1di8i2x7gg8w3kviz7az7wrg6gfr06p67rkmkm2z7pwblbsbd57f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -70978,12 +71125,12 @@
     xah-lookup = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-lookup";
-        version = "20161218.2303";
+        version = "20170209.342";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "lookup-word-on-internet";
-          rev = "219b0d58760bad26b2e07c55c229d989b983c089";
-          sha256 = "1n1w9jcq1bz4qqps33p3dmmjv9hyvpa0zrxhxcp2q3vh7j0714qj";
+          rev = "55e4e539f65e260418ead77c138bc2af2bdfa638";
+          sha256 = "0b9q2y42v73c49l4s7z8qgsj02g2yvn2vbf4kv5m26k8x7547cja";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38e6609a846a3c7781e0f03730b79bbf8d0355a9/recipes/xah-lookup";
@@ -72569,15 +72716,35 @@
           license = lib.licenses.free;
         };
       }) {};
+    zpresent = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }:
+    melpaBuild {
+        pname = "zpresent";
+        version = "20170205.2239";
+        src = fetchhg {
+          url = "https://bitbucket.com/zck/zpresent.el";
+          rev = "b02b168a98c7";
+          sha256 = "0vkywpzlrpwasjnjksmsy7ab5vn1l3frb3ygvy0c98wds0g8dxgc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent";
+          sha256 = "0316qyspmdbg94aw620133ilh8kfpr3db1p2cifgccgcacjv3v5j";
+          name = "zpresent";
+        };
+        packageRequires = [ emacs org-parser ];
+        meta = {
+          homepage = "https://melpa.org/#/zpresent";
+          license = lib.licenses.free;
+        };
+      }) {};
     ztree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ztree";
-        version = "20170105.208";
+        version = "20170208.4";
         src = fetchFromGitHub {
           owner = "fourier";
           repo = "ztree";
-          rev = "3a4df17edddef84160194802acc034cfa2dbd678";
-          sha256 = "1a5sk4b00sgkgq23xmv0rlx89686dx3p8cmscrcf2lcddx8cq9pl";
+          rev = "bf343665c9d97a5cb370572364865e42074af95c";
+          sha256 = "1hpyymmg5mxrcmj0pngnj8fxyalfxzdqgpghk7lba2r35da05ph5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f151e057c05407748991f23c021e94c178b87248/recipes/ztree";

From 51285e886bc02be64a1f438699a13d27886b6df2 Mon Sep 17 00:00:00 2001
From: Mounium <muoniurn@gmail.com>
Date: Fri, 10 Feb 2017 19:01:53 +0100
Subject: [PATCH 716/899] libreoffice-still: Added support for Hungarian

---
 pkgs/applications/office/libreoffice/still.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 40ab4e6a2d6..26bb53c9b38 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -13,7 +13,7 @@
 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
 , gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas
 , defaultIconTheme, glib, ncurses
-, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" ]
+, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" ]
 , withHelp ? true
 , kdeIntegration ? false
 }:

From 8c6f81145efdb3acc048bfb38f8c899036e1b18f Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 6 Feb 2017 18:21:04 +0200
Subject: [PATCH 717/899] libvpx: 1.5.0 -> 1.6.1

The 'use-x86inc' option has simply disappeared from the upstream build
file.
---
 pkgs/development/libraries/libvpx/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index 53feba1d191..7efff3412a3 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -57,13 +57,13 @@ assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport;
 
 stdenv.mkDerivation rec {
   name = "libvpx-${version}";
-  version = "1.5.0";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "webmproject";
     repo = "libvpx";
     rev = "v${version}";
-    sha256 = "19ill4c7dak5f8m4pdbas87zknw3a34sca8a4i952q0l0jnif0np";
+    sha256 = "10fs7xilf2bsj5bqw206lb5r5dgl84p5m6nibiirk28lmjx1i3l0";
   };
 
   patchPhase = ''patchShebangs .'';
@@ -89,7 +89,6 @@ stdenv.mkDerivation rec {
     (enableFeature gcovSupport "gcov")
     # Required to build shared libraries
     (enableFeature (!isCygwin) "pic")
-    (enableFeature (isi686 || isx86_64) "use-x86inc")
     (enableFeature optimizationsSupport "optimizations")
     (enableFeature runtimeCpuDetectSupport "runtime-cpu-detect")
     (enableFeature thumbSupport "thumb")

From 6a48087bc3b2277814504a274c6da0ffd8bb7d44 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 10 Feb 2017 19:09:08 +0200
Subject: [PATCH 718/899] jade: Cleanup a bit

- Include version number the name so Nix knows about it.
- gcc and gzip are implicitly included, no need to add them here.
- Add meta.platforms
---
 pkgs/tools/text/sgml/jade/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/text/sgml/jade/default.nix b/pkgs/tools/text/sgml/jade/default.nix
index ffbf9784f80..e87a8bc0275 100644
--- a/pkgs/tools/text/sgml/jade/default.nix
+++ b/pkgs/tools/text/sgml/jade/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, pkgs, gcc, gzip, gnum4 }:
+{ stdenv, fetchurl, pkgs, gnum4 }:
 
-stdenv.mkDerivation (rec {
-  name = "jade";
+stdenv.mkDerivation rec {
+  name = "jade-${version}-${debpatch}";
   version = "1.2.1";
   debpatch = "47.3";
 
   src = fetchurl {
-    url = "ftp://ftp.jclark.com/pub/${name}/${name}-${version}.tar.gz";
+    url = "ftp://ftp.jclark.com/pub/jade/jade-${version}.tar.gz";
     sha256 = "84e2f8a2a87aab44f86a46b71405d4f919b219e4c73e03a83ab6c746a674b187";
   };
 
@@ -17,14 +17,14 @@ stdenv.mkDerivation (rec {
 
   patches = [ patchsrc ];
 
-  buildInputs = [ gcc gzip gnum4 ];
+  buildInputs = [ gnum4 ];
 
   NIX_CFLAGS_COMPILE = [ "-Wno-deprecated" ];
 
   preInstall = ''
     install -d -m755 "$out"/lib
   '';
-  
+
   postInstall = ''
     mv "$out/bin/sx" "$out/bin/sgml2xml"
   '';
@@ -33,6 +33,7 @@ stdenv.mkDerivation (rec {
     description = "James Clark's DSSSL Engine";
     license = "custom";
     homepage = http://www.jclark.com/jade/;
+    platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [ e-user ];
   };
-})
+}

From 6bf0a984ef7b164855f1dba154534ed852250001 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 10 Feb 2017 19:17:55 +0200
Subject: [PATCH 719/899] ding-libs: Some cleanups

- Add version to the name so Nix knows about it
- glibc is an implicit buildInput, no need to add it
- The docs don't seem to get build anyway, don't try to build them &
  remove the doxygen build input
- Add meta.platforms
---
 pkgs/tools/misc/ding-libs/default.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/ding-libs/default.nix b/pkgs/tools/misc/ding-libs/default.nix
index 547e3fb49eb..e5daee11b59 100644
--- a/pkgs/tools/misc/ding-libs/default.nix
+++ b/pkgs/tools/misc/ding-libs/default.nix
@@ -1,26 +1,23 @@
-{ stdenv, fetchurl, glibc, doxygen, check }:
+{ stdenv, fetchurl, check }:
 
-let
-  name = "ding-libs";
+stdenv.mkDerivation rec {
+  name = "ding-libs-${version}";
   version = "0.6.0";
-in stdenv.mkDerivation {
-  inherit name;
-  inherit version;
 
   src = fetchurl {
-    url = "https://fedorahosted.org/released/${name}/${name}-${version}.tar.gz";
+    url = "https://fedorahosted.org/released/ding-libs/ding-libs-${version}.tar.gz";
     sha1 = "c8ec86cb93a26e013a13b12a7b0b3fbc1bca16c1";
   };
 
   enableParallelBuilding = true;
-  buildInputs = [ glibc doxygen check ];
+  buildInputs = [ check ];
 
-  buildFlags = "docs";
   doCheck = true;
 
   meta = {
     description = "'D is not GLib' utility libraries";
     homepage = https://fedorahosted.org/sssd/;
+    platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [ e-user ];
     license = [ stdenv.lib.licenses.gpl3 stdenv.lib.licenses.lgpl3 ];
   };

From 1862a9a4fbeec27179195d7fd8fe18165ae12ada Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 10 Feb 2017 19:27:49 +0200
Subject: [PATCH 720/899] perlPackages.TextWrapI18N: Fix glibc path

Glibc is the one exception where ${glibc}/bin doesn't work (as the more
common usage is ${glibc}/lib-ld-linux.so.2)...
---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 70d01fbc143..6105fcf54aa 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13829,7 +13829,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ pkgs.glibc TextCharWidth ];
     preConfigure = ''
-      substituteInPlace WrapI18N.pm --replace '/usr/bin/locale' '${pkgs.glibc}/bin/locale'
+      substituteInPlace WrapI18N.pm --replace '/usr/bin/locale' '${pkgs.glibc.bin}/bin/locale'
     '';
     meta = {
       description = "Line wrapping module with support for multibyte, fullwidth, and combining characters and languages without whitespaces between words";

From 182a369ab9409d19938bf805843b63a6c76948f6 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 10 Feb 2017 19:47:13 +0200
Subject: [PATCH 721/899] sssd: Cleanup a bit

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

diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix
index 312ac0c281a..ea49f9e4029 100644
--- a/pkgs/os-specific/linux/sssd/default.nix
+++ b/pkgs/os-specific/linux/sssd/default.nix
@@ -6,25 +6,24 @@
   nss_wrapper, docbook_xml_dtd_44, ncurses, Po4a, http-parser, jansson }:
 
 let
-  name = "sssd-${version}";
-  version = "1.14.2";
-
   docbookFiles = "${pkgs.docbook_xml_xslt}/share/xml/docbook-xsl/catalog.xml:${pkgs.docbook_xml_dtd_44}/xml/dtd/docbook/catalog.xml";
 in
-stdenv.mkDerivation {
-  inherit name;
-  inherit version;
+stdenv.mkDerivation rec {
+  name = "sssd-${version}";
+  version = "1.14.2";
 
   src = fetchurl {
     url = "https://fedorahosted.org/released/sssd/${name}.tar.gz";
     sha1 = "167b2216c536035175ff041d0449e0a874c68601";
   };
 
+  # Something is looking for <libxml/foo.h> instead of <libxml2/libxml/foo.h>
+  NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2";
+
   preConfigure = ''
     export SGML_CATALOG_FILES="${docbookFiles}"
     export PYTHONPATH=${ldap}/lib/python2.7/site-packages
     export PATH=$PATH:${pkgs.openldap}/libexec
-    export CPATH=${pkgs.libxml2.dev}/include/libxml2
 
     configureFlagsArray=(
       --prefix=$out
@@ -82,6 +81,7 @@ stdenv.mkDerivation {
     description = "System Security Services Daemon";
     homepage = https://fedorahosted.org/sssd/;
     license = licenses.gpl3;
+    platforms = platforms.linux;
     maintainers = [ maintainers.e-user ];
   };
 }

From a14ef4ad5270a5ee51bdc28d405854ec69d18149 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 1 Dec 2016 16:59:53 +0200
Subject: [PATCH 722/899] open-vm-tools: 10.0.7 -> 10.1.0

Also add an option to disable all the X11 stuff.
---
 nixos/modules/virtualisation/vmware-guest.nix | 13 +++--
 .../virtualization/open-vm-tools/default.nix  | 50 +++++++++++--------
 .../open-vm-tools/recognize_nixos.patch       | 46 +++++++----------
 pkgs/top-level/all-packages.nix               |  1 +
 4 files changed, 57 insertions(+), 53 deletions(-)

diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix
index ac5f87817fe..ce1224a8f13 100644
--- a/nixos/modules/virtualisation/vmware-guest.nix
+++ b/nixos/modules/virtualisation/vmware-guest.nix
@@ -4,12 +4,19 @@ with lib;
 
 let
   cfg = config.services.vmwareGuest;
-  open-vm-tools = pkgs.open-vm-tools;
+  open-vm-tools = if cfg.headless then pkgs.open-vm-tools-headless else pkgs.open-vm-tools;
   xf86inputvmmouse = pkgs.xorg.xf86inputvmmouse;
 in
 {
   options = {
-    services.vmwareGuest.enable = mkEnableOption "VMWare Guest Support";
+    services.vmwareGuest = {
+      enable = mkEnableOption "VMWare Guest Support";
+      headless = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to disable X11-related features.";
+      };
+    };
   };
 
   config = mkIf cfg.enable {
@@ -28,7 +35,7 @@ in
 
     environment.etc."vmware-tools".source = "${pkgs.open-vm-tools}/etc/vmware-tools/*";
 
-    services.xserver = {
+    services.xserver = mkIf (!cfg.headless) {
       videoDrivers = mkOverride 50 [ "vmware" ];
       modules = [ xf86inputvmmouse ];
 
diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix
index dd8ddfd0e0b..78fa090f925 100644
--- a/pkgs/applications/virtualization/open-vm-tools/default.nix
+++ b/pkgs/applications/virtualization/open-vm-tools/default.nix
@@ -1,42 +1,48 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook,
-  libmspack, openssl, pam, xercesc, icu, libdnet, procps,
-  xlibsWrapper, libXinerama, libXi, libXrender, libXrandr, libXtst,
-  pkgconfig, glib, gtk, gtkmm, iproute, dbus, systemd }:
+  fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps,
+  libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst,
+  pkgconfig, glib, gtk, gtkmm, iproute, dbus, systemd, which,
+  withX ? true }:
 
-let
-  majorVersion = "10.0";
-  minorVersion = "7";
-  version = "${majorVersion}.${minorVersion}";
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "open-vm-tools-${version}";
+  version = "10.1.0";
+
   src = fetchFromGitHub {
     owner = "vmware";
     repo = "open-vm-tools";
     rev = "stable-${version}";
-    sha256 = "0xxgppxjisg3jly21r7mjk06rc4n7ssyvapasxhbi2d1bw0xkvrj";
+    sha256 = "1qzk4mvw618ca4j9agsfpqch9jgwghvdc4rpkvlyz8kirvh9iniz";
   };
 
   sourceRoot = "${src.name}/open-vm-tools";
 
-  buildInputs =
-    [ autoreconfHook makeWrapper libmspack openssl pam xercesc icu libdnet procps
-      pkgconfig glib gtk gtkmm xlibsWrapper libXinerama libXi libXrender libXrandr libXtst ];
+  outputs = [ "out" "dev" ];
 
-  postPatch = ''
-     sed -i s,-Werror,,g configure.ac
-     sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am
-     sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' services/vmtoolsd/Makefile.am
-  '';
+  nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ];
+  buildInputs = [ fuse glib icu libdnet libmspack openssl pam procps xercesc ]
+      ++ lib.optionals withX [ gtk gtkmm libX11 libXext libXinerama libXi libXrender libXrandr libXtst ];
 
   patches = [ ./recognize_nixos.patch ];
+  postPatch = ''
+     # Build bugfix for 10.1.0, stolen from Arch PKGBUILD
+     mkdir -p common-agent/etc/config
+     sed -i 's|.*common-agent/etc/config/Makefile.*|\\|' configure.ac
 
-  configureFlags = "--without-kernel-modules --without-xmlsecurity";
+     sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am
+     sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' services/vmtoolsd/Makefile.am
+     sed -i 's,$(PAM_PREFIX),''${prefix}/$(PAM_PREFIX),' services/vmtoolsd/Makefile.am
+     sed -i 's,$(UDEVRULESDIR),''${prefix}/$(UDEVRULESDIR),' udev/Makefile.am
+  '';
+
+  configureFlags = [ "--without-kernel-modules" "--without-xmlsecurity" ]
+    ++ lib.optional (!withX) "--without-x";
+
+  enableParallelBuilding = true;
 
   postInstall = ''
-	sed -i 's,which ,command -v ,' "$out/etc/vmware-tools/scripts/vmware/network"
-	wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \
-		--prefix PATH ':' "${lib.makeBinPath [ iproute dbus systemd ]}"
+    wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \
+      --prefix PATH ':' "${lib.makeBinPath [ iproute dbus systemd which ]}"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch b/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch
index 64991a152bc..46d8ea7f7f3 100644
--- a/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch
+++ b/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch
@@ -1,30 +1,20 @@
-diff -ruN open-vm-tools.orig/lib/include/guest_os.h open-vm-tools/lib/include/guest_os.h
---- open-vm-tools.orig/lib/include/guest_os.h	2016-02-12 00:50:33.000000000 +0000
-+++ open-vm-tools/lib/include/guest_os.h	2016-04-18 20:07:41.677251511 +0000
-@@ -222,6 +222,7 @@
+diff --git a/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
+index ef202e3..c7a105d 100644
+--- a/lib/include/guest_os.h
++++ b/lib/include/guest_os.h
+@@ -238,6 +238,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
  #define STR_OS_MANDRAKE_FULL      "Mandrake Linux"
  #define STR_OS_MANDRIVA           "mandriva"
  #define STR_OS_MKLINUX            "MkLinux"
 +#define STR_OS_NIXOS              "NixOS"
  #define STR_OS_NOVELL             "nld9"
  #define STR_OS_NOVELL_FULL        "Novell Linux Desktop 9"
- #define STR_OS_ORACLE             "oraclelinux"
-diff -ruN open-vm-tools.orig/lib/include/vmblock.h open-vm-tools/lib/include/vmblock.h
---- open-vm-tools.orig/lib/include/vmblock.h	2016-02-12 00:50:33.000000000 +0000
-+++ open-vm-tools/lib/include/vmblock.h	2016-04-18 21:51:15.651235848 +0000
-@@ -145,7 +145,7 @@
- # define VMBLOCK_DEVICE_MODE           VMBLOCK_FUSE_DEVICE_MODE
- # define VMBLOCK_MOUNT_POINT           VMBLOCK_FUSE_MOUNT_POINT
- 
--#elif defined(linux)
-+#elif defined(__linux__)
- # define VMBLOCK_ADD_FILEBLOCK         98
- # define VMBLOCK_DEL_FILEBLOCK         99
- # ifdef VMX86_DEVEL
-diff -ruN open-vm-tools.orig/lib/misc/hostinfoPosix.c open-vm-tools/lib/misc/hostinfoPosix.c
---- open-vm-tools.orig/lib/misc/hostinfoPosix.c	2016-02-12 00:50:33.000000000 +0000
-+++ open-vm-tools/lib/misc/hostinfoPosix.c	2016-04-18 20:09:45.841668252 +0000
-@@ -195,6 +195,7 @@
+ #define STR_OS_ORACLE6            "oraclelinux6"
+diff --git a/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
+index 0f55070..2d8467c 100644
+--- a/lib/misc/hostinfoPosix.c
++++ b/lib/misc/hostinfoPosix.c
+@@ -195,6 +195,7 @@ static const DistroInfo distroArray[] = {
     {"Mandrake",           "/etc/mandrake-release"},
     {"Mandriva",           "/etc/mandriva-release"},
     {"MkLinux",            "/etc/mklinux-release"},
@@ -32,12 +22,12 @@ diff -ruN open-vm-tools.orig/lib/misc/hostinfoPosix.c open-vm-tools/lib/misc/hos
     {"Novell",             "/etc/nld-release"},
     {"OracleLinux",        "/etc/oracle-release"},
     {"Photon",             "/etc/lsb-release"},
-@@ -619,6 +620,8 @@
-       Str_Strcpy(distroShort, STR_OS_MANDRIVA, distroShortSize);
-    } else if (strstr(distroLower, "mklinux")) {
-       Str_Strcpy(distroShort, STR_OS_MKLINUX, distroShortSize);
+@@ -554,6 +555,8 @@ HostinfoGetOSShortName(char *distro,         // IN: full distro name
+       }
+    } else if (strstr(distroLower, "mandrake")) {
+       Str_Strcpy(distroShort, STR_OS_MANDRAKE, distroShortSize);
 +   } else if (strstr(distroLower, "nixos")) {
 +      Str_Strcpy(distroShort, STR_OS_NIXOS, distroShortSize);
-    } else if (strstr(distroLower, "pld")) {
-       Str_Strcpy(distroShort, STR_OS_PLD, distroShortSize);
-    } else if (strstr(distroLower, "slackware")) {
+    } else if (strstr(distroLower, "turbolinux")) {
+       Str_Strcpy(distroShort, STR_OS_TURBO, distroShortSize);
+    } else if (strstr(distroLower, "sun")) {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b06f761ea90..f1038dade74 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11606,6 +11606,7 @@ with pkgs;
   open-vm-tools = callPackage ../applications/virtualization/open-vm-tools {
     inherit (gnome2) gtk gtkmm;
   };
+  open-vm-tools-headless = open-vm-tools.override { withX = false; };
 
   delve = callPackage ../development/tools/delve { };
 

From f0d0e21a5ecb9fdb2c10f240b6e942b8ce93b038 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sat, 11 Feb 2017 02:39:15 +0800
Subject: [PATCH 723/899] neovim-qt: clean up

---
 pkgs/applications/editors/neovim/qt.nix | 52 ++++++++++++-------------
 pkgs/top-level/all-packages.nix         |  5 +--
 2 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix
index 07660eaddf6..66c538a1976 100644
--- a/pkgs/applications/editors/neovim/qt.nix
+++ b/pkgs/applications/editors/neovim/qt.nix
@@ -1,46 +1,46 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, pythonPackages, libmsgpack
-, makeWrapper, neovim
-}:
+{ stdenv, fetchFromGitHub, cmake, doxygen
+, libmsgpack, makeWrapper, neovim, pythonPackages, qtbase }:
 
-let # not very usable ATM
-  version = "0.2.4";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "neovim-qt-${version}";
+  version = "0.2.4";
 
   src = fetchFromGitHub {
-    owner = "equalsraf";
-    repo = "neovim-qt";
-    rev = "v${version}";
+    owner  = "equalsraf";
+    repo   = "neovim-qt";
+    rev    = "v${version}";
     sha256 = "0yf9wwkl0lbbj3vyf8hxnlsk7jhk5ggivszyqxply69dbar9ww59";
   };
 
-  # It tries to download libmsgpack; let's use ours.
-  postPatch = let use-msgpack = ''
-    cmake_minimum_required(VERSION 2.8.11)
-    project(neovim-qt-deps)
-
-    # Similar enough to FindMsgpack
-    set(MSGPACK_INCLUDE_DIRS ${libmsgpack}/include PARENT_SCOPE)
-    set(MSGPACK_LIBRARIES msgpackc PARENT_SCOPE)
-  '';
-    in "echo '${use-msgpack}' > third-party/CMakeLists.txt";
-
-  buildInputs = with pythonPackages; [
-    cmake qt5.qtbase
-    python msgpack jinja2 libmsgpack
-    makeWrapper
+  cmakeFlags = [
+    "-DMSGPACK_INCLUDE_DIRS=${libmsgpack}/include"
+    "-DMSGPACK_LIBRARIES=${libmsgpack}/lib/libmsgpackc.so"
   ];
 
+  doCheck = false; # 5 out of 7 fail
+
+  buildInputs = with pythonPackages; [
+    qtbase libmsgpack
+  ] ++ (with pythonPackages; [
+    jinja2 msgpack python
+  ]);
+
+  nativeBuildInputs = [ cmake doxygen makeWrapper ];
+
   enableParallelBuilding = true;
 
+  # avoid cmake trying to download libmsgpack
+  preConfigure = "echo \"\" > third-party/CMakeLists.txt";
+
   postInstall = ''
     wrapProgram "$out/bin/nvim-qt" --prefix PATH : "${neovim}/bin"
   '';
 
   meta = with stdenv.lib; {
-    description = "A prototype Qt5 GUI for neovim";
+    description = "Neovim client library and GUI, in Qt5";
     license = licenses.isc;
+    maintainers = with maintainers; [ peterhoeg ];
     inherit (neovim.meta) platforms;
+    inherit version;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47535f0ac0a..fdd613e7b3f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15394,10 +15394,7 @@ with pkgs;
 
   neovim = callPackage ../applications/editors/neovim { };
 
-  neovim-qt = callPackage ../applications/editors/neovim/qt.nix {
-    qt5 = qt55;
-    libmsgpack = libmsgpack_1_4;
-  };
+  neovim-qt = qt5.callPackage ../applications/editors/neovim/qt.nix { };
 
   neovim-pygui = pythonPackages.neovim_gui;
 

From cc79f1808c6c046d42e8a7734ec65ad292aa31dd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 10 Feb 2017 12:47:51 -0600
Subject: [PATCH 724/899] melpa-stable-packages 2017-02-10

---
 .../emacs-modes/melpa-stable-generated.nix    | 270 +++++++++++++-----
 1 file changed, 198 insertions(+), 72 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 07748209b7e..cc794cc6cf2 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -2470,6 +2470,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    better-shell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "better-shell";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "killdash9";
+          repo = "better-shell";
+          rev = "6ae157da700a4473734dca75925f6bf60e6b3ba7";
+          sha256 = "14ym7gp57yflf86hxpsjnagxnc0z1jrdc4mbq7wcbh5z8kjkbfpd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fc553c9fb6de69dafe9fbe44a955b307f4d9507f/recipes/better-shell";
+          sha256 = "1mr39xz8chnc28zw1rrw5yqf44v44pby7ki22yyz6rp1j5ishp4v";
+          name = "better-shell";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/better-shell";
+          license = lib.licenses.free;
+        };
+      }) {};
     biblio = callPackage ({ biblio-core, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "biblio";
@@ -3565,12 +3586,12 @@
     chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
     melpaBuild {
         pname = "chinese-pyim";
-        version = "1.5.1";
+        version = "1.5.2";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-pyim";
-          rev = "b210c0d5275e1e8c0b78bed186cc18fc27061dd4";
-          sha256 = "1jixkb7jw07lykbfv022ccnys4xypcbv03f9bxl2r16wizzymvvd";
+          rev = "577a3438d14e1a1f08baf0399ec8138c9d1dcba4";
+          sha256 = "0i9nqhqbj12ilr5fsa4cwai9kf2ydv84m606zqca2xyvvdzw22as";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim";
@@ -3838,12 +3859,12 @@
     cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "cliphist";
-        version = "0.5.2";
+        version = "0.5.3";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "cliphist";
-          rev = "8aaee153e0561625c35a8c178e57385c2ec92731";
-          sha256 = "0swsvzz20szfcgfaarga9apla1kl0ph0lrpk0ccl6mcf93zbnvby";
+          rev = "acbd9782d82d7ae6bfb22fb0955597b9c5fcbb6c";
+          sha256 = "1gj5fqjyr4m4qim9qjsvzzk42rm3vw3yycvq3nj0wpj90zb1yh14";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82d86dae4ad8efc8ef342883c164c56e43079171/recipes/cliphist";
@@ -4143,12 +4164,12 @@
     cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cmake-mode";
-        version = "3.7.2";
+        version = "3.8.0pre1";
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "35413bf2c1b33980afd418030af27f184872af6b";
-          sha256 = "1kk0xri88h4lla8r8y5gksiwpyxb468h8qn0f61sfa1kni73z09s";
+          rev = "84df4a49500e51ac6e2a19a77e385e66234386f7";
+          sha256 = "1kkycphqbz8j3jp70n9vh3lgpb2fxy2461q6x365h8mg5ab4w7x3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -5094,12 +5115,12 @@
     copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "copy-as-format";
-        version = "0.0.2";
+        version = "0.0.3";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "copy-as-format";
-          rev = "6c47295597c69b3b08dd8f137f6a5973a5588674";
-          sha256 = "1d4x8rvmzqi3cby01ahgr3fqcsq4kpd6sglr9slxcw7hp7rlih0i";
+          rev = "edc6d2313b321988fdf780fac229d395e4752702";
+          sha256 = "1gnm9r42nkp349d5ry2bv9in83ikmh5pnrfcw96yigxrzkbajb2s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format";
@@ -9066,12 +9087,12 @@
     erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "19.2.2";
+        version = "19.2.3";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "51faafa9a20c4afa7944b8089b26f22c774bed19";
-          sha256 = "0shy3ckxw9scsg3j8brzk5r3p0rdpfbr9ys7akmdp2pq88d867i9";
+          rev = "aa315e1cf1b79ab782e5b4c944595495ebf4e2f4";
+          sha256 = "1lsmjpz2g4hj44fz95w7sswzj40iv7jq5jk64x0095lhvxmlf57c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -9170,12 +9191,12 @@
     es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, spark }:
     melpaBuild {
         pname = "es-mode";
-        version = "4.2.0";
+        version = "4.3.0";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "es-mode";
-          rev = "f5e6054a1d25d5eb8e21ddb931b7f65b0735c5f8";
-          sha256 = "04lll5sscbpqcq3sv5gsfky5qcj6asqql7fw1bp6g12qqf9r02nd";
+          rev = "996730ebce57d810d2c275c7fadb11c2b1134dea";
+          sha256 = "1qhfnd5anp5qrmravv7ks5ix763xnki2f5jwcyj70qyxwr0l60cg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode";
@@ -9566,6 +9587,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    evil = callPackage ({ fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
+    melpaBuild {
+        pname = "evil";
+        version = "1.2.12";
+        src = fetchFromGitHub {
+          owner = "emacs-evil";
+          repo = "evil";
+          rev = "0ad4c2dae1249558f7b59a78a685e4f8092009c9";
+          sha256 = "1z7ysn0h62i674pw47k905713m4ch7hrisk4834rf53zq3c9sabn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil";
+          sha256 = "044k9p32y4cys3zwdfanr1zddgkxz16ahqspfz7vfszyw8yml1jb";
+          name = "evil";
+        };
+        packageRequires = [ goto-chg undo-tree ];
+        meta = {
+          homepage = "https://melpa.org/#/evil";
+          license = lib.licenses.free;
+        };
+      }) {};
     evil-anzu = callPackage ({ anzu, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-anzu";
@@ -9842,12 +9884,12 @@
     evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-nerd-commenter";
-        version = "2.3.1";
+        version = "2.3.3";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-nerd-commenter";
-          rev = "54c618aada776bfda0742819ff9e91845a91e095";
-          sha256 = "04iyr6ys453pyfvif91qnhn6xyhl4z4cz2apj6vga61pa8lc70da";
+          rev = "01a98a20c536a575ee5bc897f38116155154d5fe";
+          sha256 = "160h4qasqr04fnv9w5dar327i074dsyac2md5y7p3hnz1c05skhl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
@@ -10574,22 +10616,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    find-by-pinyin-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    find-by-pinyin-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pinyinlib }:
     melpaBuild {
         pname = "find-by-pinyin-dired";
-        version = "0.0.2";
+        version = "0.0.3";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "find-by-pinyin-dired";
-          rev = "3137c367d58958858daa6d3dee1993b2eb9dd9b4";
-          sha256 = "1xjb66pydm3yf0jxnm2mri98pxq3b26xvwjkaj1488qgj27i05jr";
+          rev = "2c48434637bd63840fca4d2c6cf9ebd5dd44658f";
+          sha256 = "0ial0lbvg0xbrwn8cm68xc5wxj3xgp110y2zgypkdpak8gkv8b5h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0aa68b4603bf4071d7d12b40de0138ecab1989d7/recipes/find-by-pinyin-dired";
           sha256 = "150hvih3mdd1dqffgdcv3nn4qhy86s4lhjkfq0cfzgngfwif8qqq";
           name = "find-by-pinyin-dired";
         };
-        packageRequires = [];
+        packageRequires = [ pinyinlib ];
         meta = {
           homepage = "https://melpa.org/#/find-by-pinyin-dired";
           license = lib.licenses.free;
@@ -14105,6 +14147,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    green-screen-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "green-screen-theme";
+        version = "1.0.0.1";
+        src = fetchFromGitHub {
+          owner = "rbanffy";
+          repo = "green-screen-emacs";
+          rev = "e47e3eb903b4d9dbcc66342d91915947b35e5e1e";
+          sha256 = "0gv434aab9ar624l4r7ky4ksvkchzlgj8pyvkc73kfqcxg084pdn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/821744ca106f1b74941524782e4581fc93800fed/recipes/green-screen-theme";
+          sha256 = "0a45xcl74kp3v39bl169sq46mqxiwvvis6jzwcy6yrl2vqqi4mab";
+          name = "green-screen-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/green-screen-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     grin = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "grin";
         version = "1.0";
@@ -14376,22 +14439,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    hacker-typer = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    hacker-typer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hacker-typer";
-        version = "1.0.1";
+        version = "1.0.6";
         src = fetchFromGitHub {
           owner = "therockmandolinist";
           repo = "emacs-hacker-typer";
-          rev = "de208bb6d69f6f45eca8522d41012c7f729b8c9f";
-          sha256 = "0lhsj9j17sd43w96zk84ssfvk5q518znbp1zkb5znl2q7ky8cwrg";
+          rev = "d5a23714a4ccc5071580622f278597d5973f40bd";
+          sha256 = "13wp7cg9d9ij44inxxyk1knczglxrbfaq50wyhc4x5zfhz5yw7wx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/561661965a7a500f24671454b3b680816457e180/recipes/hacker-typer";
-          sha256 = "0i9kkxcz0fz4yviksl3f0ggh9kpwr9sidg7945r46bmblni3f0j9";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8e04a3a1606ea23865c04d93e3dc77cb55b9931f/recipes/hacker-typer";
+          sha256 = "128y562cxi8rblnqjdzhqc6b58bxi67f6hz569gqw4jywz0xcd0g";
           name = "hacker-typer";
         };
-        packageRequires = [ async ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/hacker-typer";
           license = lib.licenses.free;
@@ -14735,12 +14798,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "2.5.1";
+        version = "2.5.2";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "b54d937634986dbebe97c0283137bcde07ed2275";
-          sha256 = "0cq4pcx0rn9kzf55pbad1lcn1xq58vcdng9sx50485wdxqr0bxzc";
+          rev = "7d7c16f10103aeee591daf46b143d23efdf3a825";
+          sha256 = "0mn36dxd70nsk1dwn0mzz94sy28hk41af8chdpl2cd09bkpw113l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -14777,12 +14840,12 @@
     helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ag";
-        version = "0.57";
+        version = "0.58";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-ag";
-          rev = "49e1f66fa80674513ca898e32d62d6dad875cb90";
-          sha256 = "0vzgiix2c8jwpk2hhxvz9gqb78glmd4dk1myrgvxs9fhsj54dkk3";
+          rev = "39ed137823665fca2fa5b215f7c3e8701173f7b7";
+          sha256 = "0a6yls52pkqsaj6s5nsi70kzpvssdvb87bfnp8gp26q2y3syx4ni";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag";
@@ -15029,12 +15092,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "2.5.1";
+        version = "2.5.2";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "b54d937634986dbebe97c0283137bcde07ed2275";
-          sha256 = "0cq4pcx0rn9kzf55pbad1lcn1xq58vcdng9sx50485wdxqr0bxzc";
+          rev = "7d7c16f10103aeee591daf46b143d23efdf3a825";
+          sha256 = "0mn36dxd70nsk1dwn0mzz94sy28hk41af8chdpl2cd09bkpw113l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -23129,12 +23192,12 @@
     org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "org-jira";
-        version = "2.5.2";
+        version = "2.6.0";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "org-jira";
-          rev = "af4115f4e8b4e77de5642fb28ce6d5e0d7cb0b70";
-          sha256 = "1g775f9gpl0nqq3vn6h9cnjazimn9bjwk31dc7fdylz3nf7f3h03";
+          rev = "0ff62665231df2be5d5bc84c4748c272664eeff3";
+          sha256 = "0qn203bw0v7g8kmpkqp9vwh7m8cjjhklvwbhgmr8szaz1i1m9d0i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
@@ -23230,22 +23293,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-mime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    org-mime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-mime";
-        version = "0.0.4";
+        version = "0.0.5";
         src = fetchFromGitHub {
           owner = "org-mime";
           repo = "org-mime";
-          rev = "3c4f24c8d43c24332c4f2f4bf763459b11ead956";
-          sha256 = "04xs06sgdigi9hpciqb0d12rsgzg5b5vyf08rlvkjiddkqclp5pw";
+          rev = "a0b82a6c1a0dbcf5b7bebfe2e5817d54a1cd3cc8";
+          sha256 = "11wldx6c53ncw3pmdwxn31q82vkcffqvr2cfphl5bhb4q8r5lrjn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime";
           sha256 = "14154pajl2bbawdd8iqfwgc67pcjp2lxl6f92c62nwq12wkcnny6";
           name = "org-mime";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "https://melpa.org/#/org-mime";
           license = lib.licenses.free;
@@ -24734,6 +24797,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    pastery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+    melpaBuild {
+        pname = "pastery";
+        version = "0.1.14";
+        src = fetchFromGitHub {
+          owner = "diasbruno";
+          repo = "pastery.el";
+          rev = "3f60a2660613c09be5a0b6e299828b44ee3c8732";
+          sha256 = "1dzbkiy2qjdq4isrpiwj25qj069nhydzngg6avyh2c2qmxkibjsr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6058218450071db0af9a5b8ce8ec09a735c4ab66/recipes/pastery";
+          sha256 = "006qawjc86spbbs2pxvhg9w94rcsxap577cndqwaiw1k0cc8vkhp";
+          name = "pastery";
+        };
+        packageRequires = [ emacs request ];
+        meta = {
+          homepage = "https://melpa.org/#/pastery";
+          license = lib.licenses.free;
+        };
+      }) {};
     pathify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pathify";
@@ -25069,6 +25153,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    phan = callPackage ({ composer, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "phan";
+        version = "0.0.2";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "phan.el";
+          rev = "4e3528f490e77d3aa6d81729b30b569434ef679f";
+          sha256 = "1aif1hshwpzi353k2gcpwk9s76jlmz3s5dyf357qfv14b5ddhw6l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d591d9ba70b1e32f25204ad9409aad78fd68a93c/recipes/phan";
+          sha256 = "16r1d2bgbb2y7l141sw7nzhx0s50gzwq5ang00y7f4sfldqvshzf";
+          name = "phan";
+        };
+        packageRequires = [ composer emacs f ];
+        meta = {
+          homepage = "https://melpa.org/#/phan";
+          license = lib.licenses.free;
+        };
+      }) {};
     phi-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "phi-search";
@@ -26032,22 +26137,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+    projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "projectile-variable";
-        version = "0.0.1";
+        version = "0.0.2";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "projectile-variable";
-          rev = "810394eabf330325a86ec6f60c69e160eb837ac3";
-          sha256 = "183azck3bi4qwpprcc07kvwm3piwqgql7ryy1czvmw3kbdmk1rpj";
+          rev = "8d348ac70bdd6dc320c13a12941b32b38140e264";
+          sha256 = "0l38nldx6lwjb7mxixykiyj10xwb35249dxfg0k2wkmb2vy1fkxs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ff603b43235f546cd47f72e675aee88d5f41e855/recipes/projectile-variable";
           sha256 = "1cj8nwxf1jp5q5zzxp92fxla6jhwzd21gw649ar6mygi4hgymsji";
           name = "projectile-variable";
         };
-        packageRequires = [ cl-lib emacs projectile ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/projectile-variable";
           license = lib.licenses.free;
@@ -27505,12 +27610,12 @@
     rg = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "rg";
-        version = "1.0.0";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "dajva";
           repo = "rg.el";
-          rev = "f1af862ba50b344d2f039f18fe83e32b6f0829a9";
-          sha256 = "18i5rspwx48xik8yaw0znsfqarwab7nra6wiiznjkpzm0cgh4av1";
+          rev = "ec9eb5240191612debf0392ee7a7f491c7dae27e";
+          sha256 = "0773d0n5jq42yr5p1xbbfji027j0kw4msv1p8b7zk82ij1yc7hyr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@@ -28322,12 +28427,12 @@
     selectric-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "selectric-mode";
-        version = "1.1";
+        version = "1.2";
         src = fetchFromGitHub {
           owner = "rbanffy";
           repo = "selectric-mode";
-          rev = "0dd7ef28a9d9d6fbb95fdeeab6b576ad8762ad16";
-          sha256 = "18xdkisxvdizsk51pnyimp9mwc6k9cpcxqr5hgndkz9q97p5dp79";
+          rev = "a8e8c8899c749bd36bdd161e161cdc51301defc6";
+          sha256 = "1dj8vccdk1s0ynl5znpg02xp182srn3s8cqcxqrxjllp7wbgab31";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08922071b9854142eab726302e75f1db2d326ec5/recipes/selectric-mode";
@@ -28994,12 +29099,12 @@
     slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
     melpaBuild {
         pname = "slime";
-        version = "2.18";
+        version = "2.19";
         src = fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "2da9fef009f2380daf9404022ca69cb87573f509";
-          sha256 = "0d1fcjv11my4sa11zim99ylzfsc5q989x4izrrxs3y9ii0nq8kax";
+          rev = "6e20d01e446334848ea31ace0ce041cec25647ab";
+          sha256 = "1ywlbdk9ywfkv8z6pb69r29nh03krfdg676d086i8qjaas7ly2yp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
@@ -29915,6 +30020,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ssh-agency = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ssh-agency";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "ssh-agency";
+          rev = "94abffa716aff963175196066526c7ee8b4efae7";
+          sha256 = "1r41hgh0kaf9x56jllqjz7f9ypzgyf9pqqpm3r49xyi8fr1drbxc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a9e4bd0205908bfb99762c7daaf3be276bb03a/recipes/ssh-agency";
+          sha256 = "0lci3fhl2p9mwilvq1njzy13dkq5cp5ighymf3zs4gzm3w0ih3h8";
+          name = "ssh-agency";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/ssh-agency";
+          license = lib.licenses.free;
+        };
+      }) {};
     ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-deploy";
@@ -30419,12 +30545,12 @@
     swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "swift-mode";
-        version = "2.2.2";
+        version = "2.2.3";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "swift-mode";
-          rev = "42669da0b68bba2d12f9d5fc38f30def118bb999";
-          sha256 = "0l7f7mm4a7qrw0i6fnakgy7payghjgmamln9ldbdx593hg1jjzr8";
+          rev = "75cbae223fbf84d19e14a7f7734ded4f46078654";
+          sha256 = "1ilawg15l6j3w2mlybz01h1dk9mym37wq4illz1llc3q3v9n7nny";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
@@ -32838,12 +32964,12 @@
     which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "which-key";
-        version = "1.2.1";
+        version = "2.0";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-which-key";
-          rev = "17f4b0069273f9c9877dc079e5cf49ed9cb4d278";
-          sha256 = "1h673yjl0hp6p244pkk6hmazgfrj2sbz9cvd1r6rnrp1lpn8z1dl";
+          rev = "ea6f1dc5aacff2f3d909e410db05af01966555aa";
+          sha256 = "0pckvxk2vpwqfypz5vyk0ig6g5697ibnlk8vspvqpanahvgaj0nh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -33114,8 +33240,8 @@
         version = "0.9.1";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "280ab84bf8ad";
-          sha256 = "088khr4ha37nvxzg620a6gyq7pc40rb13bbi9vgqhgjgggpq61d9";
+          rev = "3a654cfe6632";
+          sha256 = "1ahmpk0302g375w9ikkzagjvx8qblkzx40w960ka0cqf7nzyk75d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";

From ae160b582cefbf20a2c4d2443624198f31194d3a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 10 Feb 2017 12:51:22 -0600
Subject: [PATCH 725/899] melpa-packages: init w3m at 20170203.647

---
 .../editors/emacs-modes/melpa-generated.nix   | 19 +++++++++++++++++++
 .../editors/emacs-modes/melpa-packages.nix    | 13 ++++++++++++-
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/emacs-packages.nix             |  2 +-
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 8dfad041b9f..a47b5d69760 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -69224,6 +69224,25 @@
           license = lib.licenses.free;
         };
       }) {};
+    w3m = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "w3m";
+        version = "20170203.647";
+        src = fetchcvs {
+          cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot";
+          module = "emacs-w3m";
+          sha256 = "ac08d29a884ac5e692a18fd47a7d3a43f1fe7464c3acb923e63da39201bf6453";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbb18b0db057b9cca78ae7280674fd1beb56443/recipes/w3m";
+          sha256 = "17mzs126fvlnsvxgfpbil9wmka0i87psblq49phky7dywcwz27lc";
+          name = "w3m";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/w3m";
+          license = lib.licenses.free;
+        };
+      }) {};
     wacspace = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wacspace";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 6081c96006a..60cbf486777 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -13,7 +13,7 @@ To update the list of packages from MELPA,
 
 */
 
-{ lib }:
+{ lib, external }:
 
 self:
 
@@ -174,6 +174,17 @@ self:
 
       # upstream issue: missing file header
       zeitgeist = markBroken super.zeitgeist;
+
+      w3m = super.w3m.override (args: {
+        melpaBuild = drv: args.melpaBuild (drv // {
+          prePatch =
+            let w3m = "${lib.getBin external.w3m}/bin/w3m"; in ''
+              substituteInPlace w3m.el \
+                --replace 'defcustom w3m-command nil' \
+                          'defcustom w3m-command "${w3m}"'
+            '';
+        });
+      });
     };
 
     melpaPackages = super // overrides;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 66c20853019..42d7c142cf7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13121,7 +13121,7 @@ with pkgs;
     external = {
       inherit (haskellPackages) ghc-mod structured-haskell-mode Agda hindent;
       inherit (pythonPackages) elpy;
-      inherit rtags libffi autoconf automake libpng zlib poppler pkgconfig;
+      inherit rtags libffi autoconf automake libpng zlib poppler pkgconfig w3m;
     };
   };
 
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 092f352ec5b..5c50fe383bb 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -56,7 +56,7 @@ let
   };
 
   melpaPackages = import ../applications/editors/emacs-modes/melpa-packages.nix {
-    inherit lib;
+    inherit external lib;
   };
 
   orgPackages = import ../applications/editors/emacs-modes/org-packages.nix {

From 7031e8fd01550763d95d7346b1d1fcc642c2ec16 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 10 Feb 2017 21:02:56 +0100
Subject: [PATCH 726/899] gnugrep: 2.27 -> 3.0

See https://lists.gnu.org/archive/html/info-gnu/2017-02/msg00005.html
and https://lists.gnu.org/archive/html/info-gnu/2017-02/msg00006.html
for release information.
---
 pkgs/tools/text/gnugrep/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index b9dca2e8709..b33ea716978 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/pkgs/tools/text/gnugrep/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pcre, libiconv, perl }:
 
-let version = "2.27"; in
+let version = "3.0"; in
 
 stdenv.mkDerivation {
   name = "gnugrep-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/grep/grep-${version}.tar.xz";
-    sha256 = "1syadppgpxpfhpwhhqcsibrn131azypzps5aicx1qjh74d6w8k5d";
+    sha256 = "1dcasjp3a578nrvzrcn38mpizb8w1q6mvfzhjmcqqgkf0nsivj72";
   };
 
   # Perl is needed for testing

From 38099382083bc1475f66d57062f109dcacb6defd Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Fri, 10 Feb 2017 15:16:17 -0500
Subject: [PATCH 727/899] ecs-agent module: remove debug print

Whoops :)
---
 nixos/modules/virtualisation/ecs-agent.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/virtualisation/ecs-agent.nix b/nixos/modules/virtualisation/ecs-agent.nix
index 5e28d8379cb..ed17fbf4931 100644
--- a/nixos/modules/virtualisation/ecs-agent.nix
+++ b/nixos/modules/virtualisation/ecs-agent.nix
@@ -31,7 +31,6 @@ in {
 
       script = ''
         if [ ! -z "$ECS_DATADIR" ]; then
-          echo "FOOOO"
           mkdir -p "$ECS_DATADIR"
         fi
         ${cfg.package.bin}/bin/agent

From 9c4653cf46562314fdb388cf7d3a9c178a7daeab Mon Sep 17 00:00:00 2001
From: Nick Novitski <nicknovitski@gmail.com>
Date: Sat, 11 Feb 2017 09:42:12 +1300
Subject: [PATCH 728/899] bash-completion: call readlink without errors on
 Darwin

---
 pkgs/shells/bash-completion/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix
index 0c96c72ffd0..3ac1ca2172d 100644
--- a/pkgs/shells/bash-completion/default.nix
+++ b/pkgs/shells/bash-completion/default.nix
@@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i -e 's/readlink -f/readlink/g' bash_completion completions/*
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://github.com/scop/bash-completion;
     description = "Programmable completion for the bash shell";

From 349bc2e1e240241d5faef246da2451c2b0200321 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 10 Feb 2017 22:12:21 +0100
Subject: [PATCH 729/899] phpPackages.composer: 1.2.0 -> 1.3.2

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 1808d65b75c..f0ebdf0096c 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -235,11 +235,11 @@ let
 
   composer = pkgs.stdenv.mkDerivation rec {
     name = "composer-${version}";
-    version = "1.2.0";
+    version = "1.3.2";
 
     src = pkgs.fetchurl {
       url = "https://getcomposer.org/download/${version}/composer.phar";
-      sha256 = "15chwfsqmwmhry3bv13a5y4ih1vzb0j8h1dfd49pnzzd8lai706w";
+      sha256 = "0s85zglzwx5i0hw9zlpwy1385jink1g1lhdwhv59zdjblcd7ckva";
     };
 
     phases = [ "installPhase" ];

From ed8a0d8e5e1b1de29db72373471b201b69865812 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Fri, 10 Feb 2017 22:44:10 +0100
Subject: [PATCH 730/899] modules/searx: add package option (#22636)

The user should be able to specify a patched version of searx.
---
 nixos/modules/services/networking/searx.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix
index b29db58af99..b852e4e6dc8 100644
--- a/nixos/modules/services/networking/searx.nix
+++ b/nixos/modules/services/networking/searx.nix
@@ -34,6 +34,11 @@ in
         ";
       };
 
+      package = mkOption {
+        default = pkgs.pythonPackages.searx;
+        description = "searx package to use.";
+      };
+
     };
 
   };
@@ -61,14 +66,13 @@ in
         wantedBy = [ "multi-user.target" ];
         serviceConfig = {
           User = "searx";
-          ExecStart = "${pkgs.pythonPackages.searx}/bin/searx-run";
+          ExecStart = "${cfg.package}/bin/searx-run";
         };
       } // (optionalAttrs (configFile != "") {
         environment.SEARX_SETTINGS_PATH = configFile;
       });
-        
 
-    environment.systemPackages = [ pkgs.pythonPackages.searx ];
+    environment.systemPackages = [ cfg.package ];
 
   };
 

From 4f74f9158a474fec5940baf17b375597b514144b Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Fri, 10 Feb 2017 14:06:28 -0800
Subject: [PATCH 731/899] kakoune: 2016-12-30 -> 2017-02-09

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

diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix
index 14b13c394f3..4590939b516 100644
--- a/pkgs/applications/editors/kakoune/default.nix
+++ b/pkgs/applications/editors/kakoune/default.nix
@@ -4,12 +4,12 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "kakoune-nightly-${version}";
-  version = "2016-12-30";
+  version = "2017-02-09";
   src = fetchFromGitHub {
     repo = "kakoune";
     owner = "mawww";
-    rev = "76c58aa022a896dc170c207ff821992ee354d934";
-    sha256 = "0hgpcp6444cyg4bm0a9ypywjwfh19qpqpfr5w0wcd2y3clnsvsdz";
+    rev = "9ba1665e58ee84b6596d89e6ef75f7c32e7c6c14";
+    sha256 = "1l25mzq64a481qlsyh25rzp5rzajrkx4dq29677z85lnjqn30wbi";
   };
   buildInputs = [ ncurses boost asciidoc docbook_xsl libxslt ];
 

From 564e0c120be9f317a7c43eb246882065b1909c67 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 10 Feb 2017 17:35:52 -0500
Subject: [PATCH 732/899] kde4, kdm: mark services as deprecated

---
 nixos/modules/services/x11/desktop-managers/kde4.nix | 3 +++
 nixos/modules/services/x11/display-managers/kdm.nix  | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix
index 3aa4821a052..f0de9120c69 100644
--- a/nixos/modules/services/x11/desktop-managers/kde4.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde4.nix
@@ -87,6 +87,9 @@ in
 
 
   config = mkIf (xcfg.enable && cfg.enable) {
+    warnings = [
+      "KDE4 is long unmaintained and will be removed. Please update to KDE5."
+    ];
 
     # If KDE 4 is enabled, make it the default desktop manager (unless
     # overridden by the user's configuration).
diff --git a/nixos/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix
index 04701a1640c..bfb763f2858 100644
--- a/nixos/modules/services/x11/display-managers/kdm.nix
+++ b/nixos/modules/services/x11/display-managers/kdm.nix
@@ -35,7 +35,7 @@ let
       ${optionalString (cfg.setupScript != "")
       ''
         Setup=${cfg.setupScript}
-      ''} 
+      ''}
 
       [X-*-Greeter]
       HiddenUsers=root,${concatStringsSep "," dmcfg.hiddenUsers}
@@ -128,6 +128,9 @@ in
   ###### implementation
 
   config = mkIf cfg.enable {
+    warnings = [
+      "KDM is long unmaintained and will be removed. Please update to SDDM."
+    ];
 
     services.xserver.displayManager.slim.enable = false;
 

From 5ebdbe493a4e4e7c92698728b8b3feda28d2ac41 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 11 Feb 2017 00:28:11 +0100
Subject: [PATCH 733/899] mimeo: 2016.11 -> 2017.2.9

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

diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix
index aff329e04b6..2333a6576e4 100644
--- a/pkgs/tools/misc/mimeo/default.nix
+++ b/pkgs/tools/misc/mimeo/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   name = "mimeo-${version}";
-  version = "2016.11";
+  version = "2017.2.9";
 
   src = fetchurl {
     url = "http://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz";
-    sha256 = "1yygdxqnkh506fknxsp9xa3rnxn0901dzqc7c7qjjj80lk6xnfxb";
+    sha256 = "1xbhz08aanix4bibz5jla58cmi6rnf946pf64wb0ka3s8jx0l5a0";
   };
 
   buildInputs = [ file desktop_file_utils ];

From 922413c0439ef0e9b98b2da7ec35a76ed0ac48bb Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 11 Feb 2017 00:28:38 +0100
Subject: [PATCH 734/899] gmic: 1.7.8 -> 1.7.9

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

diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix
index ccee4f21314..edcfc67ee29 100644
--- a/pkgs/tools/graphics/gmic/default.nix
+++ b/pkgs/tools/graphics/gmic/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gmic-${version}";
-  version = "1.7.8";
+  version = "1.7.9";
 
   src = fetchurl {
     url = "http://gmic.eu/files/source/gmic_${version}.tar.gz";
-    sha256 = "1921s0n2frj8q95l8lm8was64cypnychgcgcavx9q8qljzbk4brs";
+    sha256 = "0cvi5kmcrrg5pm774ligyy33fasgsfp3mr6ingjzd99rn4710bqm";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 405ec4496aca149f77d68f7fb6d501f129e7b66a Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 11 Feb 2017 00:28:52 +0100
Subject: [PATCH 735/899] josm: 11223 -> 11526

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

diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 30398747d43..fb60babebe2 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "josm-${version}";
-  version = "11223";
+  version = "11526";
 
   src = fetchurl {
     url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "0fv1hlp98f178jy7lxnvq2rk6rq1zj62q6dv0vn02fvm00ia53s8";
+    sha256 = "1164vfqbbys0032amk85219y0paihvi8jkx0kwc5lramwsk57pld";
   };
 
   phases = [ "installPhase" ];

From 5e8499f4472b552131c905e2fe81ec8b28a3843c Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 11 Feb 2017 00:29:14 +0100
Subject: [PATCH 736/899] gpsprune: 18.5 -> 18.6

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

diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix
index 1f263a2b1dd..07fcf31ed26 100644
--- a/pkgs/applications/misc/gpsprune/default.nix
+++ b/pkgs/applications/misc/gpsprune/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gpsprune-${version}";
-  version = "18.5";
+  version = "18.6";
 
   src = fetchurl {
     url = "http://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar";
-    sha256 = "0xd97b7rs5i41hyih6zdbvls090903yfr1r9lflq93dyqhmzpdhn";
+    sha256 = "1ii9pkj24jcwzs225nyi17ks07dfc5x3940hpqrsb5xzxy2vkw7q";
   };
 
   phases = [ "installPhase" ];

From d4766e789b9020a68e16080a2ef969bf21f79445 Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Sat, 11 Feb 2017 01:44:29 +0100
Subject: [PATCH 737/899] caddy: set file descriptor limit to 8192, fixes
 #22454

the value is recommended for production use
a warning is produced when not set
---
 nixos/modules/services/web-servers/caddy.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix
index 619e0f90b12..a49838c876f 100644
--- a/nixos/modules/services/web-servers/caddy.nix
+++ b/nixos/modules/services/web-servers/caddy.nix
@@ -61,6 +61,7 @@ in
         User = "caddy";
         Group = "caddy";
         AmbientCapabilities = "cap_net_bind_service";
+        LimitNOFILE = 8192;
       };
     };
 

From d9ab783f581f5dc8aba02ba1d08cdc7e6706f431 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 10 Feb 2017 22:52:08 -0500
Subject: [PATCH 738/899] nixos manual: correct reference to sddm

---
 nixos/doc/manual/development/option-declarations.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml
index cab721f2e55..d62d0896bb7 100644
--- a/nixos/doc/manual/development/option-declarations.xml
+++ b/nixos/doc/manual/development/option-declarations.xml
@@ -135,8 +135,8 @@ services.xserver.displayManager.enable = mkOption {
   type = with types; nullOr (enum [ "slim" ]);
 };</screen></example>
 
-<example xml:id='ex-option-declaration-eot-backend-sdm'><title>Extending
-    <literal>services.foo.backend</literal> in the <literal>sdm</literal>
+<example xml:id='ex-option-declaration-eot-backend-sddm'><title>Extending
+    <literal>services.foo.backend</literal> in the <literal>sddm</literal>
     module</title>
 <screen>
 services.xserver.displayManager.enable = mkOption {

From 56153133d1592d5143abab026a3d1bf2289837e1 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 11 Feb 2017 02:29:24 +0100
Subject: [PATCH 739/899] mattermost: 3.3.0 -> 3.6.2

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

diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix
index 977df396755..477338a3317 100644
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mattermost-${version}";
-  version = "3.3.0";
+  version = "3.6.2";
 
   src = fetchurl {
     url = "https://releases.mattermost.com/${version}/mattermost-team-${version}-linux-amd64.tar.gz";
-    sha256 = "16mp75hv4lzkj99lj18c5vyqsmk9kqk5r81hirq41fgb6bdqx509";
+    sha256 = "1wf8xvy8njmhym45dwag6mdwhfgzg5xccvhyv7c68rz5h57vfgsb";
   };
 
   installPhase = ''

From 9973f490f24ce910b0fa3838d392281b79be076b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 11 Feb 2017 02:29:41 +0100
Subject: [PATCH 740/899] matterircd: 0.9.0 -> 0.11.2

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

diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix
index f3b20add96d..d830af19bdc 100644
--- a/pkgs/servers/mattermost/matterircd.nix
+++ b/pkgs/servers/mattermost/matterircd.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   name = "matterircd-${version}";
-  version = "0.9.0";
+  version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "42wim";
     repo = "matterircd";
     rev = "v${version}";
-    sha256 = "1sh34vwi8ycmdsgpzqwa7gcjzb0rn46aig6n40hxy6q1lk2l6m3c";
+    sha256 = "0yxqlckir50kdlbi36kak5ncfzl6sh811hzicdar5yzanzcip8ja";
   };
 
   goPackagePath = "github.com/42vim/matterircd";

From 3fd44e2912795db39ad9c5c9bb977663a4d129c7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 9 Feb 2017 23:09:07 +0100
Subject: [PATCH 741/899] network-interfaces service: add metric option for
 defaultGateways

---
 nixos/modules/tasks/network-interfaces-scripted.nix | 10 +++++++---
 nixos/modules/tasks/network-interfaces.nix          |  7 +++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index aa86fc85feb..062598de83e 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -104,15 +104,19 @@ in
                 # Set the default gateway.
                 ${optionalString (cfg.defaultGateway != null && cfg.defaultGateway.address != "") ''
                   # FIXME: get rid of "|| true" (necessary to make it idempotent).
-                  ip route add default via "${cfg.defaultGateway.address}" ${
+                  ip route add default ${optionalString (cfg.defaultGateway.metric != null)
+                      "metric ${toString cfg.defaultGateway.metric}"
+                    } via "${cfg.defaultGateway.address}" ${
                     optionalString (cfg.defaultGatewayWindowSize != null)
                       "window ${toString cfg.defaultGatewayWindowSize}"} ${
                     optionalString (cfg.defaultGateway.interface != null)
-                      "dev ${cfg.defaultGateway.interface}"}|| true
+                      "dev ${cfg.defaultGateway.interface}"} || true
                 ''}
                 ${optionalString (cfg.defaultGateway6 != null && cfg.defaultGateway6.address != "") ''
                   # FIXME: get rid of "|| true" (necessary to make it idempotent).
-                  ip -6 route add ::/0 via "${cfg.defaultGateway6.address}" ${
+                  ip -6 route add ::/0 ${optionalString (cfg.defaultGateway6.metric != null)
+                      "metric ${toString cfg.defaultGateway6.metric}"
+                    } via "${cfg.defaultGateway6.address}" ${
                     optionalString (cfg.defaultGatewayWindowSize != null)
                       "window ${toString cfg.defaultGatewayWindowSize}"} ${
                     optionalString (cfg.defaultGateway6.interface != null)
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 3f56419d2a6..d8ebe0af088 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -134,6 +134,13 @@ let
         description = "The default gateway interface.";
       };
 
+      metric = mkOption {
+        type = types.nullOr types.int;
+        default = null;
+        example = 42;
+        description = "The default gateway metric/preference.";
+      };
+
     };
 
   };

From c5fcd969700e05bc4f002ee1fbaf4321216ac450 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sat, 11 Feb 2017 12:26:17 +0800
Subject: [PATCH 742/899] sdl: fix very long filename

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

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index fb61233dfcb..8330dada4d3 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -77,6 +77,7 @@ stdenv.mkDerivation rec {
     # Workaround X11 bug to allow changing gamma
     # Ticket: https://bugs.freedesktop.org/show_bug.cgi?id=27222
     (fetchpatch {
+      name = "SDL_SetGamma.patch";
       url = "http://pkgs.fedoraproject.org/cgit/rpms/SDL.git/plain/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch?id=04a3a7b1bd88c2d5502292fad27e0e02d084698d";
       sha256 = "0x52s4328kilyq43i7psqkqg7chsfwh0aawr50j566nzd7j51dlv";
     })

From 09800030408183de089e7d852bfdd05c744924b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertugrul=20S=C3=B6ylemez?= <esz@posteo.de>
Date: Thu, 9 Feb 2017 22:37:09 +0100
Subject: [PATCH 743/899] zdbsp: init at 1.19

---
 pkgs/games/zdoom/zdbsp.nix      | 27 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/games/zdoom/zdbsp.nix

diff --git a/pkgs/games/zdoom/zdbsp.nix b/pkgs/games/zdoom/zdbsp.nix
new file mode 100644
index 00000000000..e3453628ba9
--- /dev/null
+++ b/pkgs/games/zdoom/zdbsp.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, cmake, unzip, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "zdbsp-${version}";
+  version = "1.19";
+
+  src = fetchurl {
+    url = "https://zdoom.org/files/utils/zdbsp/zdbsp-${version}-src.zip";
+    sha256 = "0j82q7g7hgvnahk6gdyhmn9880mqii3b4agqc98f5xaj3kxmd2dr";
+  };
+
+  nativeBuildInputs = [cmake unzip];
+  buildInputs = [zlib];
+  sourceRoot = ".";
+  enableParallelBuilding = true;
+  installPhase = ''
+    install -Dm755 zdbsp $out/bin/zdbsp
+  '';
+
+  meta = with stdenv.lib; {
+    description = "ZDoom's internal node builder for DOOM maps";
+    homepage = "https://zdoom.org/wiki/ZDBSP";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ertes];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8dfff8e831e..d60b7a08097 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16512,6 +16512,8 @@ with pkgs;
 
   zangband = callPackage ../games/zangband { };
 
+  zdbsp = callPackage ../games/zdoom/zdbsp.nix { };
+
   zdoom = callPackage ../games/zdoom { };
 
   zod = callPackage ../games/zod { };

From 357c536321abbe8c93b7ddac7d071f5872344a4f Mon Sep 17 00:00:00 2001
From: Ruben Astudillo <ruben.astud@gmail.com>
Date: Sat, 11 Feb 2017 01:09:50 -0300
Subject: [PATCH 744/899] hakuneko: 1.4.1 -> 1.4.2

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

diff --git a/pkgs/tools/misc/hakuneko/default.nix b/pkgs/tools/misc/hakuneko/default.nix
index 50d75de69cc..2a4de41332e 100644
--- a/pkgs/tools/misc/hakuneko/default.nix
+++ b/pkgs/tools/misc/hakuneko/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "hakuneko-${version}";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/hakuneko/hakuneko_${version}_src.tar.gz";
-    sha256 = "d7e066e3157445f273ccf14172c05077759da036ffe700a28a409fde862b69a7";
+    sha256 = "76a63fa05e91b082cb5a70a8abacef005354e99978ff8b1369f7aa0af7615d52";
   };
 
   preConfigure = ''

From 2667a8696b318840851dd178630fcd8d8dcb9262 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sat, 11 Feb 2017 10:44:07 +0800
Subject: [PATCH 745/899] terragrunt: 0.9.9 -> 0.10.0

---
 .../networking/cluster/terragrunt/default.nix             | 4 ++--
 pkgs/applications/networking/cluster/terragrunt/deps.nix  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index 9325d074fea..48d05fa9663 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "terragrunt-${version}";
-  version = "0.9.9";
+  version = "0.10.0";
 
   goPackagePath = "github.com/gruntwork-io/terragrunt";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev    = "v${version}";
     owner  = "gruntwork-io";
     repo   = "terragrunt";
-    sha256 = "08rygmcjlcdj4g575cpx2lfdq69r450ri5q2dngvnhbvzk8nvnr0";
+    sha256 = "1cdhl7rqd2jslvp1ia1gph1lg0sjzsnvj7dj6lg85jfdcffafygj";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix
index 573f5acbd6e..91425c30121 100644
--- a/pkgs/applications/networking/cluster/terragrunt/deps.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix
@@ -5,8 +5,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/aws/aws-sdk-go";
-      rev = "4590e9b51cd6698144a025a75608fa7a90752d5d";
-      sha256 = "13hczsimaanfmbhj8aki8zib7fi161f7p7cjm7z9x8hwwa9q4nld";
+      rev = "63102d196e0996a2910839857c3584f62be907cc";
+      sha256 = "0n207g4bf5fjq23f63nkhh14shj7kjdrr4qn6h28d7x2vqfb9pss";
     };
   }
   {
@@ -32,8 +32,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/go-getter";
-      rev = "cc80f38c726badeae53775d179755e1c4953d6cf";
-      sha256 = "1xbflbgg3gfh3zy5ibfzxv4gbzg62rkzr4l2i9igvz8m7sxgyy1f";
+      rev = "c3d66e76678dce180a7b452653472f949aedfbcd";
+      sha256 = "0ykpkiszcwp3hnvnnyl95zdrsziwrzr989ynyvbfkgpnkqfdhfy7";
     };
   }
   {

From 2f755b76d9f0a120d9320ce4c9e4f3852c81851f Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sat, 11 Feb 2017 15:21:03 +0800
Subject: [PATCH 746/899] syncthing-inotify: 0.8.4 -> 0.8.5

---
 .../applications/networking/syncthing/inotify-deps.nix |  5 +++--
 pkgs/applications/networking/syncthing/inotify.nix     | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/syncthing/inotify-deps.nix b/pkgs/applications/networking/syncthing/inotify-deps.nix
index 7b0be65c8af..d8b087dcb80 100644
--- a/pkgs/applications/networking/syncthing/inotify-deps.nix
+++ b/pkgs/applications/networking/syncthing/inotify-deps.nix
@@ -1,3 +1,4 @@
+# This file was generated by go2nix.
 [
   {
     goPackagePath = "github.com/cenkalti/backoff";
@@ -13,8 +14,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/syncthing/syncthing";
-      rev = "7fba8cf759a3b48cfc1507a8c32355865500a571";
-      sha256 = "1s8l528fqq661ks70cna5cx1bawpv7szcx88z33bs4gkaq2fbws5";
+      rev = "fb6d453c74d8420af847460e42e05779e90311b6";
+      sha256 = "18fya44i80ij5wqpwg0bff2hp058rh87b9zld2rpw0z8r04bnsv0";
     };
   }
   {
diff --git a/pkgs/applications/networking/syncthing/inotify.nix b/pkgs/applications/networking/syncthing/inotify.nix
index 8d9a813f961..db99a1aa109 100644
--- a/pkgs/applications/networking/syncthing/inotify.nix
+++ b/pkgs/applications/networking/syncthing/inotify.nix
@@ -2,15 +2,15 @@
 
 buildGoPackage rec {
   name = "syncthing-inotify-${version}";
-  version = "0.8.4";
+  version = "0.8.5";
 
   goPackagePath = "github.com/syncthing/syncthing-inotify";
 
   src = fetchFromGitHub {
-    owner = "syncthing";
-    repo = "syncthing-inotify";
-    rev = "v${version}";
-    sha256 = "0iix4gd5zh2ydn429jmcf0pr1pxxd1wq1vp5ciq9bavhvnim9clw";
+    owner  = "syncthing";
+    repo   = "syncthing-inotify";
+    rev    = "v${version}";
+    sha256 = "13qfppwlqrx3fs44ghnffdp9x0hs7mn1gal2316p7jb0klkcpfzh";
   };
 
   goDeps = ./inotify-deps.nix;

From 6cf8875abd679b1f41d07cf37217cb5dedf3089c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Feb 2017 16:04:37 +0100
Subject: [PATCH 747/899] xorg.{libXi,libXpm}: minor update

---
 pkgs/servers/x11/xorg/default.nix       | 12 ++++++------
 pkgs/servers/x11/xorg/tarballs-7.7.list |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index b825d86ac8d..f95650f07e1 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -812,11 +812,11 @@ let
   }) // {inherit fontconfig freetype libX11 xproto libXrender ;};
 
   libXi = (mkDerivation "libXi" {
-    name = "libXi-1.7.8";
+    name = "libXi-1.7.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXi-1.7.8.tar.bz2;
-      sha256 = "1fr7mi4nbcxsa88qin9g2ipmzh595ydxy9qnabzl270laf6zmwnq";
+      url = mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2;
+      sha256 = "0idg1wc01hndvaa820fvfs7phvd1ymf0lldmq6386i7rhkzvirn2";
     };
     buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
@@ -856,11 +856,11 @@ let
   }) // {inherit printproto libX11 libXau libXext xextproto ;};
 
   libXpm = (mkDerivation "libXpm" {
-    name = "libXpm-3.5.11";
+    name = "libXpm-3.5.12";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXpm-3.5.11.tar.bz2;
-      sha256 = "07041q4k8m4nirzl7lrqn8by2zylx0xvh6n0za301qqs3njszgf5";
+      url = mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2;
+      sha256 = "1v5xaiw4zlhxspvx76y3hq4wpxv7mpj6parqnwdqvpj8vbinsspx";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index c0d2065a9ff..7df1b223094 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -71,11 +71,11 @@ mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2
 mirror://xorg/individual/lib/libXfont-1.5.2.tar.bz2
 mirror://xorg/individual/lib/libXfont2-2.0.1.tar.bz2
 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2
-mirror://xorg/individual/lib/libXi-1.7.8.tar.bz2
+mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2
 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2
 mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2
 mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2
-mirror://xorg/individual/lib/libXpm-3.5.11.tar.bz2
+mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2
 mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2
 mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2
 mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2

From 201f0cec12c103ba4648f4693971f5144d4c491d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Feb 2017 16:05:30 +0100
Subject: [PATCH 748/899] xorg.presentproto: 1.0 -> 1.1

---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index f95650f07e1..b7703aa815e 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1120,11 +1120,11 @@ let
   }) // {inherit libfontenc freetype xproto zlib ;};
 
   presentproto = (mkDerivation "presentproto" {
-    name = "presentproto-1.0";
+    name = "presentproto-1.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/proto/presentproto-1.0.tar.bz2;
-      sha256 = "1kir51aqg9cwazs14ivcldcn3mzadqgykc9cg87rm40zf947sb41";
+      url = mirror://xorg/individual/proto/presentproto-1.1.tar.bz2;
+      sha256 = "1f96dlgfwhsd0834z8ydjzjnb0cwha5r6lxgia4say4zhsl276zn";
     };
     buildInputs = [pkgconfig ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 7df1b223094..7a1ec0d2608 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -6,7 +6,7 @@ mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/dmxproto-2.3.1.tar.bz2
 mirror://xorg/individual/proto/dri2proto-2.8.tar.bz2
 mirror://xorg/individual/proto/dri3proto-1.0.tar.bz2
-mirror://xorg/individual/proto/presentproto-1.0.tar.bz2
+mirror://xorg/individual/proto/presentproto-1.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/encodings-1.0.4.tar.bz2
 mirror://xorg/X11R7.7/src/everything/fixesproto-5.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-1.0.3.tar.bz2

From 78a115dd4717ff3194fa2f093afd08100f4753aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Feb 2017 16:05:58 +0100
Subject: [PATCH 749/899] xorg util-macros: 1.19.0 -> 1.19.1

---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index b7703aa815e..0d4d7cb2dd5 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1241,11 +1241,11 @@ let
   }) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;};
 
   utilmacros = (mkDerivation "utilmacros" {
-    name = "util-macros-1.19.0";
+    name = "util-macros-1.19.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/util/util-macros-1.19.0.tar.bz2;
-      sha256 = "1fnhpryf55l0yqajxn0cxan3kvsjzi67nlanz8clwqzf54cb2d98";
+      url = mirror://xorg/individual/util/util-macros-1.19.1.tar.bz2;
+      sha256 = "19h6wflpmh7xxqr6lk5z8pds6r9r0dn7ijbvaacymx2q0m05km0q";
     };
     buildInputs = [pkgconfig ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 7a1ec0d2608..adb192ea30c 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -100,7 +100,7 @@ mirror://xorg/individual/app/sessreg-1.1.0.tar.bz2
 mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2
 mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2
 mirror://xorg/individual/app/twm-1.0.9.tar.bz2
-mirror://xorg/individual/util/util-macros-1.19.0.tar.bz2
+mirror://xorg/individual/util/util-macros-1.19.1.tar.bz2
 mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2
 mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2

From 473f95d80924504f07b483c94784fff169f90b61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Feb 2017 16:06:41 +0100
Subject: [PATCH 750/899] xorg.xauth: 1.0.9 -> 1.0.10

---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 0d4d7cb2dd5..c85d2c7140c 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1285,11 +1285,11 @@ let
   }) // {inherit libX11 libXext libXft libXmu xproto libXrender ;};
 
   xauth = (mkDerivation "xauth" {
-    name = "xauth-1.0.9";
+    name = "xauth-1.0.10";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xauth-1.0.9.tar.bz2;
-      sha256 = "13y2invb0894b1in03jbglximbz6v31y2kr4yjjgica8xciibkjn";
+      url = mirror://xorg/individual/app/xauth-1.0.10.tar.bz2;
+      sha256 = "0kgwz9rmxjfdvi2syf8g0ms5rr5cgyqx4n0n1m960kyz7k745zjs";
     };
     buildInputs = [pkgconfig libX11 libXau libXext libXmu xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index adb192ea30c..e832146db6c 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -104,7 +104,7 @@ mirror://xorg/individual/util/util-macros-1.19.1.tar.bz2
 mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2
 mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2
-mirror://xorg/individual/app/xauth-1.0.9.tar.bz2
+mirror://xorg/individual/app/xauth-1.0.10.tar.bz2
 mirror://xorg/individual/app/xbacklight-1.2.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2

From a750890b0e885ff6f638c064fb7b19069b919b64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Feb 2017 16:07:06 +0100
Subject: [PATCH 751/899] xorg xkeyboard-config: 2.19 -> 2.20

---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index c85d2c7140c..0d36f2a0290 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2232,11 +2232,11 @@ let
   }) // {inherit inputproto libX11 libXaw xproto libXt ;};
 
   xkeyboardconfig = (mkDerivation "xkeyboardconfig" {
-    name = "xkeyboard-config-2.19";
+    name = "xkeyboard-config-2.20";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.19.tar.bz2;
-      sha256 = "09sqyi430bbg13pp8j0j60p9p9xn2lpqx38xw1lyv77bp63d3pw3";
+      url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.20.tar.bz2;
+      sha256 = "0d619g4r0w1f6q5qmaqjnsc0956gi02fqgpisqffzqy4acjwggyi";
     };
     buildInputs = [pkgconfig libX11 xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index e832146db6c..d95de81a737 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -175,7 +175,7 @@ mirror://xorg/individual/app/xinput-1.6.2.tar.bz2
 mirror://xorg/individual/app/xkbcomp-1.3.1.tar.bz2
 mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2
 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2
-mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.19.tar.bz2
+mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.20.tar.bz2
 mirror://xorg/individual/app/xkill-1.0.4.tar.bz2
 mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2
 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2

From 9b185b6b87f560dc9a5e2e98bde527d614731880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 9 Feb 2017 21:27:40 +0100
Subject: [PATCH 752/899] xfce.xfconf: minor update 4.12.0 -> 4.12.1

---
 pkgs/desktops/xfce/core/xfconf.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix
index 3696cb6ed88..edbc11b8605 100644
--- a/pkgs/desktops/xfce/core/xfconf.nix
+++ b/pkgs/desktops/xfce/core/xfconf.nix
@@ -2,14 +2,14 @@
 let
   p_name  = "xfconf";
   ver_maj = "4.12";
-  ver_min = "0";
+  ver_min = "1";
 in
 stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "0mmi0g30aln3x98y5p507g17pipq0dj0bwypshan8cq5hkmfl44r";
+    sha256 = "0dns190bwb615wy9ma2654sw4vz1d0rcv061zmaalkv9wmj8bx1m";
   };
 
   outputs = [ "out" "dev" "devdoc" ];

From b4588ee03c64b5e5b1921daf835cd779f8b80296 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 9 Feb 2017 21:31:21 +0100
Subject: [PATCH 753/899] xfce4-panel: maintenance 4.12.0 -> 4.12.1

---
 pkgs/desktops/xfce/core/xfce4-panel.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix
index dde8481b519..9a5d390f3b8 100644
--- a/pkgs/desktops/xfce/core/xfce4-panel.nix
+++ b/pkgs/desktops/xfce/core/xfce4-panel.nix
@@ -7,14 +7,14 @@ let
   inherit (stdenv.lib) optional;
   p_name  = "xfce4-panel";
   ver_maj = "4.12";
-  ver_min = "0";
+  ver_min = "1";
 in
 stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "1c4p3ckghvsad1sj5v8wmar5mh9cbhail9mmhad2f9pwwb10z4ih";
+    sha256 = "1s52k80911pkp65zkxw9mrnczxsd81svr0djmmcfpjd9rj08pmck";
   };
 
   patches = [ ./xfce4-panel-datadir.patch ];

From f4d1bcb9a706a18669e027cb6bbeac4439e9c9ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 11 Feb 2017 11:03:59 +0100
Subject: [PATCH 754/899] llvm: fix #22567 oversaturated red icons

---
 pkgs/development/compilers/llvm/3.9/llvm.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix
index b64cf4fed5b..64996ced54f 100644
--- a/pkgs/development/compilers/llvm/3.9/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.9/llvm.nix
@@ -1,5 +1,6 @@
 { stdenv
 , fetch
+, fetchpatch
 , perl
 , groff
 , cmake
@@ -45,6 +46,13 @@ in stdenv.mkDerivation rec {
   propagatedBuildInputs = [ ncurses zlib ];
 
   postPatch = ""
+  + ''
+    patch -p1 --reverse < ${fetchpatch {
+      name = "fix-red-icons.diff"; # https://bugs.freedesktop.org/show_bug.cgi?id=99078
+      url = https://github.com/llvm-mirror/llvm/commit/c280d74837d8.diff;
+      sha256 = "11sq86spw41v72f676igksapdlsgh7fiqp5qkkmgfj0ndqcn9skf";
+    }}
+  ''
   # hacky fix: New LLVM releases require a newer OS X SDK than
   # 10.9. This is a temporary measure until nixpkgs darwin support is
   # updated.

From 6f48d6291f0692cae4a3fe8be5cc3abc03e63990 Mon Sep 17 00:00:00 2001
From: Mica Semrick <mica@silentumbrella.com>
Date: Wed, 8 Feb 2017 20:36:03 -0800
Subject: [PATCH 755/899] gimpPlugins.gmic: 1.6.5.0 -> 1.7.8

---
 pkgs/applications/graphics/gimp/plugins/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index fa6db4e7f02..29d950ec695 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -125,7 +125,7 @@ rec {
       Filters/Enhance/Smart remove selection
     */
     name = "resynthesizer-2.0.1";
-    buildInputs = [ gimp pkgs.fftw pkgs.autoreconfHook ] 
+    buildInputs = [ gimp pkgs.fftw pkgs.autoreconfHook ]
       ++ gimp.nativeBuildInputs;
     makeFlags = "GIMP_LIBDIR=$out/lib/gimp/2.0/";
     src = fetchFromGitHub {
@@ -178,13 +178,13 @@ rec {
 
   gmic =
     pluginDerivation rec {
-      name = "gmic-1.6.5.0";
+      name = "gmic-1.7.8";
 
       buildInputs = [pkgconfig pkgs.fftw pkgs.opencv gimp] ++ gimp.nativeBuildInputs;
 
       src = fetchurl {
-        url = http://gmic.eu/files/source/gmic_1.6.5.0.tar.gz;
-        sha256 = "1vb6zm5zpqfnzxjvb9yfvczaqacm55rf010ib0yk9f28b17qrjgb";
+        url = "http://gmic.eu/files/source/gmic_1.7.8.tar.gz";
+        sha256 = "1921s0n2frj8q95l8lm8was64cypnychgcgcavx9q8qljzbk4brs";
       };
 
       sourceRoot = "${name}/src";

From 970753317ca698e65784574fbf00fb5fa2471221 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 10 Feb 2017 18:56:46 +0100
Subject: [PATCH 756/899] gimpPlugins.gmic: use attribues from gmic expression

---
 .../graphics/gimp/plugins/default.nix         | 21 +++----------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 29d950ec695..20a9648e839 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -178,31 +178,16 @@ rec {
 
   gmic =
     pluginDerivation rec {
-      name = "gmic-1.7.8";
+      inherit (pkgs.gmic) name src meta;
 
-      buildInputs = [pkgconfig pkgs.fftw pkgs.opencv gimp] ++ gimp.nativeBuildInputs;
-
-      src = fetchurl {
-        url = "http://gmic.eu/files/source/gmic_1.7.8.tar.gz";
-        sha256 = "1921s0n2frj8q95l8lm8was64cypnychgcgcavx9q8qljzbk4brs";
-      };
+      nativeBuildInputs = [ pkgconfig ];
+      buildInputs = [ pkgs.fftw pkgs.opencv gimp ] ++ gimp.nativeBuildInputs;
 
       sourceRoot = "${name}/src";
 
       buildFlags = "gimp";
 
       installPhase = "installPlugins gmic_gimp";
-
-      meta = {
-        description = "Script language for image processing which comes with its open-source interpreter";
-        homepage = http://gmic.eu/gimp.shtml;
-        license = stdenv.lib.licenses.cecill20;
-        /*
-        The purpose of this Free Software license agreement is to grant users
-        the right to modify and redistribute the software governed by this
-        license within the framework of an open source distribution model.
-        [ ... ] */
-      };
   };
 
   # this is more than a gimp plugin !

From 52d692741383d7ba2a2514098fb1fd81235a2f3b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sat, 11 Feb 2017 11:15:41 +0800
Subject: [PATCH 757/899] libxml2: add optional icu support

---
 pkgs/development/libraries/libxml2/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 80354b10f3b..930227ed243 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,8 +1,11 @@
-{ stdenv, lib, fetchurl, zlib, xz, python2, findXMLCatalogs, libiconv, fetchpatch
-, pythonSupport ? (! stdenv ? cross) }:
+{ stdenv, lib, fetchurl, fetchpatch
+, zlib, xz, python2, findXMLCatalogs, libiconv
+, pythonSupport ? (! stdenv ? cross)
+, icuSupport ? false, icu ? null }:
 
 let
   python = python2;
+
 in stdenv.mkDerivation rec {
   name = "libxml2-${version}";
   version = "2.9.4";
@@ -37,9 +40,11 @@ in stdenv.mkDerivation rec {
     # RUNPATH for that, leading to undefined references for its users.
     ++ lib.optional stdenv.isFreeBSD xz;
 
-  propagatedBuildInputs = [ zlib findXMLCatalogs ];
+  propagatedBuildInputs = [ zlib findXMLCatalogs ] ++ lib.optional icuSupport icu;
 
-  configureFlags = lib.optional pythonSupport "--with-python=${python}"
+  configureFlags =
+       lib.optional pythonSupport "--with-python=${python}"
+    ++ lib.optional icuSupport    "--with-icu"
     ++ [ "--exec_prefix=$dev" ];
 
   enableParallelBuilding = true;

From 607be4d88e9f9287a16e0b3c7836c4618320ebc5 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 11 Feb 2017 12:23:16 +0200
Subject: [PATCH 758/899] sd-image-*: Copy all RPi firmware files

Turns out all variants of start.elf and fixup.dat are needed (depending
on what's in config.txt). I was under the mistaken impression that you
were supposed to rename one of the variants to switch using them, but
nope.
---
 nixos/modules/installer/cd-dvd/sd-image-aarch64.nix           | 4 +---
 .../installer/cd-dvd/sd-image-armv7l-multiplatform.nix        | 4 +---
 nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix       | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
index 8cf349fbd07..c769bc80a48 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
@@ -52,9 +52,7 @@ in
         enable_uart=1
       '';
       in ''
-        for f in bootcode.bin fixup.dat start.elf; do
-          cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/$f boot/
-        done
+        (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/boot/)
         cp ${patchedUboot}/u-boot.bin boot/u-boot-rpi3.bin
         cp ${configTxt} boot/config.txt
         ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./boot
diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
index 76f5d4bf647..0b858746ff0 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
@@ -44,9 +44,7 @@ in
         enable_uart=1
       '';
       in ''
-        for f in bootcode.bin fixup.dat start.elf; do
-          cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/$f boot/
-        done
+        (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/boot/)
         cp ${pkgs.ubootRaspberryPi2}/u-boot.bin boot/u-boot-rpi2.bin
         cp ${pkgs.ubootRaspberryPi3_32bit}/u-boot.bin boot/u-boot-rpi3.bin
         cp ${configTxt} boot/config.txt
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
index c7915b578d8..886ffd9a092 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
@@ -34,9 +34,7 @@ in
 
   sdImage = {
     populateBootCommands = ''
-      for f in bootcode.bin fixup.dat start.elf; do
-        cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/$f boot/
-      done
+      (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/boot/)
       cp ${pkgs.ubootRaspberryPi}/u-boot.bin boot/u-boot-rpi.bin
       echo 'kernel u-boot-rpi.bin' > boot/config.txt
       ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./boot

From 00c80a247d2d6a3fc7188ce168c35743e861c6b3 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 11 Feb 2017 12:24:49 +0200
Subject: [PATCH 759/899] updateAutotoolsGnuConfigScriptsHook: Only fix files

Some package had a broken symlink named config.sub, and the script would
fail.
---
 .../setup-hooks/update-autotools-gnu-config-scripts.sh          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh b/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh
index 5e33ace42b3..66f4e91c7bb 100644
--- a/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh
+++ b/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh
@@ -4,7 +4,7 @@ updateAutotoolsGnuConfigScriptsPhase() {
     if [ -n "$dontUpdateAutotoolsGnuConfigScripts" ]; then return; fi
 
     for script in config.sub config.guess; do
-        for f in $(find . -name "$script"); do
+        for f in $(find . -type f -name "$script"); do
             echo "Updating Autotools / GNU config script to a newer upstream version: $f"
             cp -f "@gnu_config@/$script" "$f"
         done

From 166464b5ad293e4ce5c50a9e150c00d10f836f93 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Fri, 3 Feb 2017 20:25:38 -0500
Subject: [PATCH 760/899] patch ati-drivers for kernel 4.9

uses patch from https://github.com/imageguy/fglrx-for-Fedora/blob/master/fglrx_kernel_4.9.diff
---
 .../os-specific/linux/ati-drivers/default.nix |  5 +++-
 .../patches/4.9-get_user_pages.patch          | 28 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/ati-drivers/patches/4.9-get_user_pages.patch

diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index 395850384d1..d9e6ec3cf62 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -80,7 +80,10 @@ stdenv.mkDerivation rec {
                  ./patches/kernel-4.6-page_cache_release-put_page.patch ]
   ++ optionals ( kernel != null &&
                  (lib.versionAtLeast kernel.version "4.7") )
-               [ ./patches/4.7-arch-cpu_has_pge-v2.patch ];
+               [ ./patches/4.7-arch-cpu_has_pge-v2.patch ]
+  ++ optionals ( kernel != null &&
+                 (lib.versionAtLeast kernel.version "4.9") )
+               [ ./patches/4.9-get_user_pages.patch ];
 
   buildInputs =
     [ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM
diff --git a/pkgs/os-specific/linux/ati-drivers/patches/4.9-get_user_pages.patch b/pkgs/os-specific/linux/ati-drivers/patches/4.9-get_user_pages.patch
new file mode 100644
index 00000000000..8a6c42cdb1f
--- /dev/null
+++ b/pkgs/os-specific/linux/ati-drivers/patches/4.9-get_user_pages.patch
@@ -0,0 +1,28 @@
+commit b3e4353fc68a6a024dcb95e2d61aa0afd7370233
+Author: Matt McHenry <matt@mchenryfamily.org>
+Date:   Fri Feb 3 20:19:41 2017
+
+    patch for 4.9 only
+
+diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
+index 4ce095f..3b591e1 100755
+--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
+@@ -3224,7 +3224,7 @@ int ATI_API_CALL KCL_LockUserPages(unsigned long vaddr, unsigned long* page_list
+     int ret;
+ 
+     down_read(&current->mm->mmap_sem);
+-    ret = get_user_pages(vaddr, page_cnt, 1, 0, (struct page **)page_list, NULL);
++    ret = get_user_pages(vaddr, page_cnt, 1, (struct page **)page_list, NULL);
+     up_read(&current->mm->mmap_sem);
+ 
+     return ret;
+@@ -3242,7 +3242,7 @@ int ATI_API_CALL KCL_LockReadOnlyUserPages(unsigned long vaddr, unsigned long* p
+     int ret;
+ 
+     down_read(&current->mm->mmap_sem);
+-    ret = get_user_pages(vaddr, page_cnt, 0, 0, (struct page **)page_list, NULL);
++    ret = get_user_pages(vaddr, page_cnt, 0, (struct page **)page_list, NULL);
+     up_read(&current->mm->mmap_sem);
+ 
+     return ret;

From d4bf624f968fa7b94988080be231285a95ea2ce8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 11 Feb 2017 12:47:15 +0100
Subject: [PATCH 761/899] nixos manual: add grub option to avoid #21830

Close #22659.  vcunat edited this slightly.
---
 nixos/doc/manual/configuration/luks-file-systems.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/doc/manual/configuration/luks-file-systems.xml b/nixos/doc/manual/configuration/luks-file-systems.xml
index 2062456703f..00c795cd089 100644
--- a/nixos/doc/manual/configuration/luks-file-systems.xml
+++ b/nixos/doc/manual/configuration/luks-file-systems.xml
@@ -37,6 +37,10 @@ boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-
 fileSystems."/".device = "/dev/mapper/crypted";
 </programlisting>
 
+Should grub be used as bootloader, and <filename>/boot</filename> is located
+on an encrypted partition, it is necessary to add the following grub option:
+<programlisting>boot.loader.grub.enableCryptodisk = true;</programlisting>
+
 </para>
 
 </section>

From 980565bca078e6a8754990c3ea610aaf3c69dfa1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 11 Feb 2017 13:46:42 +0100
Subject: [PATCH 762/899] smtube: 16.7.2 -> 17.1.0

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

diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix
index 5026e6c4831..ea0bd083b1d 100644
--- a/pkgs/applications/video/smtube/default.nix
+++ b/pkgs/applications/video/smtube/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, qmakeHook, qtscript, qtwebkit }:
 
 stdenv.mkDerivation rec {
-  version = "16.7.2";
+  version = "17.1.0";
   name = "smtube-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2";
-    sha256 = "0k64hc6grn4nlp739b0w5fznh0k9xx9qdwx6s7w3fb5m5pfkdrmm";
+    sha256 = "1kg45qkr7nvchy9ih24vlbpkn6vd8v8qw5xqsjhjpjkizcmzaa61";
   };
 
   makeFlags = [

From c4a47bdb5e5c17e93b3be0f0257b919e8892231e Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Sat, 11 Feb 2017 13:49:33 +0100
Subject: [PATCH 763/899] libretro: add mednafen-saturn core

---
 pkgs/misc/emulators/retroarch/cores.nix | 12 ++++++++++++
 pkgs/top-level/all-packages.nix         |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 259a6007975..775fc21a3db 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -170,6 +170,18 @@ in
     buildPhase = "make";
   };
 
+  mednafen-saturn = (mkLibRetroCore rec {
+    core = "mednafen-saturn";
+    src = fetchRetro {
+      repo = "beetle-saturn-libretro";
+      rev = "bb5d0c126feb25cf980f5cc1fc57d6a5a6f6e7ab";
+      sha256 = "0bnsdy27378b71y6aa65k4jxxy2xw6ky2ici3z53hkky2jnnjq0b";
+    };
+    description = "Port of Mednafen's Saturn core to libretro";
+  }).override {
+    buildPhase = "make";
+  };
+
   mupen64plus = (mkLibRetroCore rec {
     core = "mupen64plus";
     src = fetchRetro {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 105890e654a..c8c3207327f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15598,6 +15598,7 @@ with pkgs;
       ++ optional (cfg.enableMAME or false) mame
       ++ optional (cfg.enableMednafenPCEFast or false) mednafen-pce-fast
       ++ optional (cfg.enableMednafenPSX or false) mednafen-psx
+      ++ optional (cfg.enableMednafenSaturn or false) mednafen-saturn
       ++ optional (cfg.enableMupen64Plus or false) mupen64plus
       ++ optional (cfg.enableNestopia or false) nestopia
       ++ optional (cfg.enablePicodrive or false) picodrive

From 44641997799d97f7aea83d8c8e01334197273b3a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 11 Feb 2017 13:55:07 +0100
Subject: [PATCH 764/899] smplayer: 17.1.0 -> 17.2.0

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

diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index 0801dc8573d..9c2f6d04119 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, qmakeHook, qtscript }:
 
 stdenv.mkDerivation rec {
-  name = "smplayer-17.1.0";
+  name = "smplayer-17.2.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
-    sha256 = "0wgw940gxf3gqh6xzxvz037ipvr1xcw86gf0myvpb4lkwqh5jds0";
+    sha256 = "05nqwpyh3zlyzip7chs711sz97cgijb92h44cd5aqbwbx06hihdd";
   };
 
   buildInputs = [ qtscript ];

From 5712ac6a721879f481dc0d2955cc3d99fca38320 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 28 Jan 2017 06:35:57 +0000
Subject: [PATCH 765/899] coqPackages.{ssreflect,mathcomp}: 1.6 -> 1.6.1

---
 pkgs/development/coq-modules/mathcomp/default.nix  | 11 +----------
 pkgs/development/coq-modules/mathcomp/generic.nix  |  7 ++-----
 pkgs/development/coq-modules/ssreflect/default.nix | 11 +----------
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix
index dba6a3abbea..a80c934c6c1 100644
--- a/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/pkgs/development/coq-modules/mathcomp/default.nix
@@ -1,20 +1,11 @@
 { callPackage, fetchurl, coq }:
 
 let param =
-  let v16 = {
-    version = "1.6";
-    url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz;
-    sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8";
-  }; v161 = {
+  {
     version = "1.6.1";
     url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz;
     sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
   }; in
-{
-  "8.4" = v16;
-  "8.5" = v16;
-  "8.6" = v161;
-}."${coq.coq-version}"; in
 
 callPackage ./generic.nix {
   name = "coq${coq.coq-version}-mathcomp-${param.version}";
diff --git a/pkgs/development/coq-modules/mathcomp/generic.nix b/pkgs/development/coq-modules/mathcomp/generic.nix
index 1c150c9e69f..564cb6f6571 100644
--- a/pkgs/development/coq-modules/mathcomp/generic.nix
+++ b/pkgs/development/coq-modules/mathcomp/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, coq, ssreflect, ncurses, which
+{ stdenv, fetchurl, coq, ncurses, which
 , graphviz, withDoc ? false
 , src, name
 }:
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
   buildInputs = [ coq.ocaml coq.findlib coq.camlp5 ncurses which ];
-  propagatedBuildInputs = [ coq ssreflect ];
+  propagatedBuildInputs = [ coq ];
 
   enableParallelBuilding = true;
 
@@ -24,9 +24,6 @@ stdenv.mkDerivation {
 
   installPhase = ''
     make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
-    rm -fr $out/lib/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect*
-    rm -fr $out/lib/coq/${coq.coq-version}/user-contrib/ssrmatching.cmi
-    rm -fr $out/share/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect*
   '' + stdenv.lib.optionalString withDoc ''
     make -f Makefile.coq install-doc DOCDIR=$out/share/coq/${coq.coq-version}/
   '';
diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix
index 18eafe5e9c2..352b98ab88b 100644
--- a/pkgs/development/coq-modules/ssreflect/default.nix
+++ b/pkgs/development/coq-modules/ssreflect/default.nix
@@ -1,20 +1,11 @@
 { callPackage, fetchurl, coq }:
 
 let param =
-  let v16 = {
-    version = "1.6";
-    url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz;
-    sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8";
-  }; v161 = {
+  {
     version = "1.6.1";
     url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz;
     sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
   }; in
-{
-  "8.4" = v16;
-  "8.5" = v16;
-  "8.6" = v161;
-}."${coq.coq-version}"; in
 
 callPackage ./generic.nix {
   name = "coq${coq.coq-version}-ssreflect-${param.version}";

From dedba2a32d39bebe94ed5d3268616eabd53ed26b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 28 Jan 2017 06:52:23 +0000
Subject: [PATCH 766/899] coqPackages.coquelicot: 2.1.1 -> 2.1.2

keeping old 2.1.1 version for Coq-8.4,
as newer versions of the library do not support older Coq versions
---
 .../coq-modules/coquelicot/default.nix        | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix
index a57686177c4..a81b76849bc 100644
--- a/pkgs/development/coq-modules/coquelicot/default.nix
+++ b/pkgs/development/coq-modules/coquelicot/default.nix
@@ -1,11 +1,26 @@
 { stdenv, fetchurl, which, coq, ssreflect }:
 
-stdenv.mkDerivation {
-  name = "coq${coq.coq-version}-coquelicot-2.1.1";
-  src = fetchurl {
+let param =
+  let
+  v2_1_1 = {
+    version = "2.1.1";
     url = https://gforge.inria.fr/frs/download.php/file/35429/coquelicot-2.1.1.tar.gz;
     sha256 = "1wxds73h26q03r2xiw8shplh97rsbim2i2s0r7af0fa490bp44km";
   };
+  v2_1_2 = {
+    version = "2.1.2";
+    url = https://gforge.inria.fr/frs/download.php/file/36320/coquelicot-2.1.2.tar.gz;
+    sha256 = "09q9xbzyndx8i68hn3ir4pmzgqd1q33qpk3xghf2l849g8w3q5an";
+  };
+  in {
+  "8.4" = v2_1_1;
+  "8.5" = v2_1_2;
+  "8.6" = v2_1_2;
+}."${coq.coq-version}"; in
+
+stdenv.mkDerivation {
+  name = "coq${coq.coq-version}-coquelicot-${param.version}";
+  src = fetchurl { inherit (param) url sha256; };
 
   nativeBuildInputs = [ which ];
   buildInputs = [ coq ];

From 8bfce240457124eef57edab73faaea7c059ad722 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 28 Jan 2017 06:54:33 +0000
Subject: [PATCH 767/899] coqPackages.interval: 2.2.1 -> 3.1.1

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

diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix
index f367dad1fca..e07c7c80ac0 100644
--- a/pkgs/development/coq-modules/interval/default.nix
+++ b/pkgs/development/coq-modules/interval/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, which, coq, coquelicot, flocq, mathcomp }:
 
 stdenv.mkDerivation {
-  name = "coq-interval-${coq.coq-version}-2.2.1";
+  name = "coq${coq.coq-version}-interval-3.1.1";
 
   src = fetchurl {
-    url = https://gforge.inria.fr/frs/download.php/file/35431/interval-2.2.1.tar.gz;
-    sha256 = "1i6v7da9mf6907sa803xa0llsf9lj4akxbrl8rma6gsdgff2d78n";
+    url = https://gforge.inria.fr/frs/download.php/file/36342/interval-3.1.1.tar.gz;
+    sha256 = "0jzkb0xykiz9bfaminy9yd88b5w0gxcpw506yaaqmnmb43gdksyf";
   };
 
   nativeBuildInputs = [ which ];

From 8ea925b2404ac7b4d22ea3a3ec69241b757e7fb2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 11 Feb 2017 13:26:17 +0100
Subject: [PATCH 768/899] ansible_2_1: windowsSupport off by default

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

diff --git a/pkgs/development/python-modules/ansible/2.1.nix b/pkgs/development/python-modules/ansible/2.1.nix
index 5af0837387d..077bfa198aa 100644
--- a/pkgs/development/python-modules/ansible/2.1.nix
+++ b/pkgs/development/python-modules/ansible/2.1.nix
@@ -10,7 +10,8 @@
 , six
 , netaddr
 , dns
-, pywinrm
+, windowsSupport ? false
+, pywinrm ? null
 }:
 
 let
@@ -43,7 +44,6 @@ in buildPythonPackage rec {
   dontStrip = true;
   dontPatchELF = true;
   dontPatchShebangs = false;
-  windowsSupport = true;
 
   propagatedBuildInputs = [ pycrypto paramiko jinja pyyaml httplib2
     boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm;

From 1ba17987f7bb1439791af8cf2b2d373ca00d8e09 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 11 Feb 2017 13:26:52 +0100
Subject: [PATCH 769/899] ansible_2_2: windows support off by default

this was accidentally enabled when moving the expression.
---
 pkgs/development/python-modules/ansible/2.2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ansible/2.2.nix b/pkgs/development/python-modules/ansible/2.2.nix
index 48a325fec33..d62c1e74822 100644
--- a/pkgs/development/python-modules/ansible/2.2.nix
+++ b/pkgs/development/python-modules/ansible/2.2.nix
@@ -10,7 +10,8 @@
 , six
 , netaddr
 , dns
-, pywinrm
+, windowsSupport ? false
+, pywinrm ? null
 }:
 
 let
@@ -44,7 +45,6 @@ in buildPythonPackage rec {
   dontStrip = true;
   dontPatchELF = true;
   dontPatchShebangs = false;
-  windowsSupport = true;
 
   propagatedBuildInputs = [ pycrypto paramiko jinja pyyaml httplib2
     boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm;

From 6cf3667bc91913556bd1dd905088cab811a830bb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 11 Feb 2017 13:27:18 +0100
Subject: [PATCH 770/899] pythonPackages.cinderclient: mark as broken

The whole python openstack needs some maintenance...
---
 pkgs/top-level/python-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0588ab5b3e2..88ee5425f88 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17036,6 +17036,7 @@ in {
     meta = with stdenv.lib; {
       description = "Python bindings to the OpenStack Cinder API";
       homepage = "http://www.openstack.org/";
+      broken = true;
     };
   };
 

From e655ab08ee95b1563599539212798c8cfcd1d207 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 11 Feb 2017 13:28:24 +0100
Subject: [PATCH 771/899] pythonPackages.ryu: mark as broken

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 88ee5425f88..fc1f676ecf8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17316,6 +17316,8 @@ in {
       url = "mirror://pypi/r/ryu/${name}.tar.gz";
       sha256 = "1fhriqi7qnvvx9mbvlfm94i5drh920lg204zy3v0qjz43sinkih6";
     };
+
+    meta.broken = true;
   };
 
   WSME = buildPythonPackage rec {

From 049a031e34f0855acbff260569979b6a6aecb6fb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 11 Feb 2017 14:13:36 +0100
Subject: [PATCH 772/899] pythonPackages.paramiko: 2.0.2 -> 2.1.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fc1f676ecf8..c25be593e27 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18078,15 +18078,16 @@ in {
   };
 
   paramiko = buildPythonPackage rec {
-    name = "paramiko-${version}";
-    version = "2.0.2";
+    pname = "paramiko";
+    version = "2.1.1";
+    name = "${pname}-${version}";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/paramiko/${name}.tar.gz";
-      sha256 = "1p21s7psqj18k9a97nq26yas058i5ivzk7pi7y98l1rbl87zj6s1";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "0xdmamqgx2ymhdm46q8flpj4fncj4wv2dqxzz0bc2dh7mnkss7fm";
     };
 
-    propagatedBuildInputs = with self; [ cryptography cryptography_vectors ];
+    propagatedBuildInputs = with self; [ cryptography pyasn1 ];
 
     # https://github.com/paramiko/paramiko/issues/449
     doCheck = !(isPyPy || isPy33);

From 20578372e1e72a19e9c42e31d1f21cd8a3b6df39 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 11 Feb 2017 15:53:01 +0200
Subject: [PATCH 773/899] U-Boot: Fix ubootBananaPi & ubootPcduino3Nano by
 adding python2

Also enable parallel building.
---
 pkgs/misc/uboot/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 6179f05d42b..f0ec5f483d4 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bc, dtc }:
+{ stdenv, fetchurl, bc, dtc, python2 }:
 
 let
   buildUBoot = { targetPlatforms
@@ -17,7 +17,7 @@ let
       sha256 = "1wpc51jm3zyibgcr78jng2yksqvrya76bxgsr4pcyjrsz5sm2hkc";
     };
 
-    nativeBuildInputs = [ bc dtc ];
+    nativeBuildInputs = [ bc dtc python2 ];
 
     hardeningDisable = [ "all" ];
 
@@ -34,6 +34,7 @@ let
       runHook postInstall
     '';
 
+    enableParallelBuilding = true;
     dontStrip = true;
 
     crossAttrs = {

From e2834ca6113acc263ea7ed857fc1cdcf509510e2 Mon Sep 17 00:00:00 2001
From: Lprndn <lprndn@gmail.com>
Date: Sat, 4 Feb 2017 18:30:00 +0100
Subject: [PATCH 774/899] Sile: Init at 0.9.4

---
 pkgs/tools/typesetting/sile/default.nix | 48 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  4 +++
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/tools/typesetting/sile/default.nix

diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix
new file mode 100644
index 00000000000..890103a0f98
--- /dev/null
+++ b/pkgs/tools/typesetting/sile/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, makeWrapper, pkgconfig
+, harfbuzz, icu, lpeg, luaexpat, luazlib, luafilesystem
+, fontconfig, lua, libiconv
+}:
+
+with stdenv.lib;
+
+let
+
+  libs          = [lpeg luaexpat luazlib luafilesystem];
+  getPath       = lib : type : "${lib}/lib/lua/${lua.luaversion}/?.${type};${lib}/share/lua/${lua.luaversion}/?.${type}";
+  getLuaPath    = lib : getPath lib "lua";
+  getLuaCPath   = lib : getPath lib "so";
+  luaPath       = concatStringsSep ";" (map getLuaPath libs);
+  luaCPath      = concatStringsSep ";" (map getLuaCPath libs);
+  in
+
+  stdenv.mkDerivation rec {
+    name = "sile-${version}";
+    version = "0.9.4";
+    src = fetchurl {
+      url = "https://github.com/simoncozens/sile/releases/download/v${version}/${name}.tar.bz2";
+      sha256 = "1mald727hy9bi17rcaph8q400yn5xqkn5f2xf1408g94wmwncs8w";
+    };
+
+  nativeBuildInputs = [pkgconfig makeWrapper];
+  buildInputs = [ harfbuzz icu lua lpeg luaexpat luazlib luafilesystem fontconfig libiconv ];
+
+  LUA_PATH = luaPath;
+  LUA_CPATH = luaCPath;
+
+  postInstall = ''
+    wrapProgram $out/bin/sile \
+      --set LUA_PATH "${luaPath};" \
+      --set LUA_CPATH "${luaCPath};" \
+  '';
+
+  meta = {
+    description = "A typesetting system";
+    longDescription = ''
+      SILE is a typesetting system; its job is to produce beautiful printed documents.
+      Conceptually, SILE is similar to TeX—from which it borrows some concepts and even syntax and algorithms—but the similarities end there. Rather than being a derivative of the TeX family SILE is a new typesetting and layout engine written from the ground up using modern technologies and borrowing some ideas from graphical systems such as InDesign.
+    '';
+    homepage = "http://www.sile-typesetter.org";
+    platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b7b5cd5599..96420aeb048 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3805,6 +3805,10 @@ with pkgs;
 
   silc_server = callPackage ../servers/silc-server { };
 
+  sile = callPackage ../tools/typesetting/sile {
+  inherit (lua52Packages) lua luaexpat luazlib luafilesystem lpeg;
+  };
+
   silver-searcher = callPackage ../tools/text/silver-searcher { };
   ag = self.silver-searcher;
 

From 9550686be85b70be95967fbfcb4293ad3f44206b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sat, 11 Feb 2017 22:48:18 +0800
Subject: [PATCH 775/899] subsurface: 4.5.97 -> 4.6.0 (#22615)

We do a few more things:

 - libmarble and libdivecomputer with the subsurface patches have both been
   inlined for 2 reasons:
   a) nobody else is using these forks
   b) they need to be updated in lockstep with subsurface

 - instead of building libmarble against qtquick1, we now build using
   qtquickcontrols (qtquick2)

 - getting rid of qtquick1 also allows us to use the default qt (currently 5.6)

 - we get rid of some hacks to deal with library dependencies

 - instead of manually overriding various phases, we simply use cmakeFlags to
   pass proper parameters
---
 pkgs/applications/misc/subsurface/default.nix | 103 +++++++++++++-----
 .../libraries/libdivecomputer/subsurface.nix  |  25 -----
 .../libraries/libmarble-ssrf/default.nix      |  33 ------
 pkgs/top-level/all-packages.nix               |   8 +-
 4 files changed, 76 insertions(+), 93 deletions(-)
 delete mode 100644 pkgs/development/libraries/libdivecomputer/subsurface.nix
 delete mode 100644 pkgs/development/libraries/libmarble-ssrf/default.nix

diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index 06b367fa6e7..bb23f46d733 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -1,49 +1,97 @@
 {
   stdenv,
-  cmake,
+  cmake, doxygen, pkgconfig, autoreconfHook,
   curl,
   fetchgit,
   grantlee,
-  libdivecomputer,
   libgit2,
-  libmarble-ssrf,
+  libusb,
   libssh2,
   libxml2,
   libxslt,
   libzip,
-  pkgconfig,
-  qtbase,
-  qtconnectivity,
-  qttools,
-  qtwebkit,
+  qtbase, qtconnectivity, qtquickcontrols, qtscript, qtsvg, qttools, qtwebkit,
   sqlite
 }:
 
-stdenv.mkDerivation rec {
-  version = "4.5.97";
+let
+  version = "4.6.0";
+
+  libmarble = stdenv.mkDerivation rec {
+    name = "libmarble-ssrf-${version}";
+
+    src = fetchgit {
+      url    = "git://git.subsurface-divelog.org/marble";
+      rev    = "refs/tags/v${version}";
+      sha256 = "1dm2hdk6y36ls7pxbzkqmyc46hdy2cd5f6pkxa6nfrbhvk5f31zd";
+    };
+
+    buildInputs = [ qtbase qtquickcontrols qtscript qtwebkit ];
+    nativeBuildInputs = [ doxygen pkgconfig cmake ];
+
+    enableParallelBuilding = true;
+
+    cmakeFlags = [
+      "-DQTONLY=TRUE"
+      "-DQT5BUILD=ON"
+      "-DBUILD_MARBLE_TESTS=NO"
+      "-DWITH_DESIGNER_PLUGIN=NO"
+      "-DBUILD_MARBLE_APPS=NO"
+    ];
+
+    meta = with stdenv.lib; {
+      description = "Qt library for a slippy map with patches from the Subsurface project";
+      homepage = http://subsurface-divelog.org;
+      license = licenses.lgpl21;
+      maintainers = with maintainers; [ mguentner ];
+      platforms = platforms.all;
+    };
+  };
+
+  libdc = stdenv.mkDerivation rec {
+    name = "libdivecomputer-ssrf-${version}";
+
+    src = fetchgit {
+      url    = "git://subsurface-divelog.org/libdc";
+      rev    = "refs/tags/v${version}";
+      sha256 = "0s82c8bvqph9c9chwzd76iwrw968w7lgjm3pj4hmad1jim67bs6n";
+    };
+
+    nativeBuildInputs = [ autoreconfHook ];
+
+    enableParallelBuilding = true;
+
+    meta = with stdenv.lib; {
+      homepage = http://www.libdivecomputer.org;
+      description = "A cross-platform and open source library for communication with dive computers from various manufacturers";
+      maintainers = with maintainers; [ mguentner ];
+      license = licenses.lgpl21;
+      platforms = platforms.all;
+    };
+  };
+
+in stdenv.mkDerivation rec {
   name = "subsurface-${version}";
 
   src = fetchgit {
-    sha256 = "035ywhicadmr9sh7zhfxsvpchwa9sywccacbspfam39n2hpyqnmm";
-    url = "git://git.subsurface-divelog.org/subsurface";
-    rev = "72bcb6481f3b935444d7868a74599dda133f9b43";
-    branchName = "master";
+    url    = "git://git.subsurface-divelog.org/subsurface";
+    rev    = "refs/tags/v${version}";
+    sha256 = "1rk5n52p6cnyjrgi7ybhmvh7y31zxrjny0mqpnc1wql69f90h94c";
   };
 
-  buildInputs = [ qtbase libdivecomputer libmarble-ssrf libxslt
-                  libzip libxml2 grantlee qtwebkit qttools
-                  qtconnectivity libgit2 libssh2 curl ];
-  nativeBuildInputs = [ pkgconfig cmake ];
+  buildInputs = [
+    libdc libmarble
+    curl grantlee libgit2 libssh2 libusb libxml2 libxslt libzip
+    qtbase qtconnectivity qtsvg qttools qtwebkit
+  ];
+  nativeBuildInputs = [ cmake pkgconfig ];
 
-  #enableParallelBuilding = true; # fatal error: ui_mainwindow.h: No such file or directory
+  enableParallelBuilding = true;
 
-  # hack incoming...
-  preConfigure = ''
-    marble_libs=$(echo $(echo $CMAKE_LIBRARY_PATH | grep -o "/nix/store/[[:alnum:]]*-libmarble-ssrf-[a-zA-Z0-9\-]*/lib")/libssrfmarblewidget.so)
-    cmakeFlags="$cmakeFlags -DCMAKE_BUILD_TYPE=Debug \
-                            -DMARBLE_LIBRARIES=$marble_libs \
-                            -DNO_PRINTING=OFF"
-  '';
+  cmakeFlags = [
+    "-DMARBLE_LIBRARIES=${libmarble}/lib/libssrfmarblewidget.so"
+    "-DNO_PRINTING=OFF"
+  ];
 
   meta = with stdenv.lib; {
     description = "Subsurface is an open source divelog program that runs on Windows, Mac and Linux";
@@ -55,8 +103,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = https://subsurface-divelog.org;
     license = licenses.gpl2;
-    maintainers = [ maintainers.mguentner ];
+    maintainers = with maintainers; [ mguentner ];
     platforms = platforms.all;
   };
-
 }
diff --git a/pkgs/development/libraries/libdivecomputer/subsurface.nix b/pkgs/development/libraries/libdivecomputer/subsurface.nix
deleted file mode 100644
index 5840ea2ef85..00000000000
--- a/pkgs/development/libraries/libdivecomputer/subsurface.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchgit, autoreconfHook }:
-
-stdenv.mkDerivation rec {
-  name = "libdivecomputer-${version}";
-  version = "ssrf-0.5.0";
-
-  src = fetchgit {
-    url = "git://subsurface-divelog.org/libdc";
-    rev = "534dd2f34b8271b2a1cac0e3151bfdc81da40e47";
-    branchName = "Subsurface-branch";
-    sha256 = "0iw9pczmwqlfjlgrik79b2pd4lmipxhjzj60ysk8qzl3axadjycp";
-  };
-
-  nativeBuildInputs = [ autoreconfHook ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = http://www.libdivecomputer.org;
-    description = "A cross-platform and open source library for communication with dive computers from various manufacturers";
-    maintainers = [ maintainers.mguentner ];
-    license = licenses.lgpl21;
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/development/libraries/libmarble-ssrf/default.nix b/pkgs/development/libraries/libmarble-ssrf/default.nix
deleted file mode 100644
index 1d6c5413439..00000000000
--- a/pkgs/development/libraries/libmarble-ssrf/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchgit, doxygen, pkgconfig, cmake, qtbase, qtscript, qtquick1 }:
-
-stdenv.mkDerivation rec {
-  name = "libmarble-ssrf-${version}";
-  version = "2016-11-09";
-
-  src = fetchgit {
-    sha256 = "1dm2hdk6y36ls7pxbzkqmyc46hdy2cd5f6pkxa6nfrbhvk5f31zd";
-    url = "git://git.subsurface-divelog.org/marble";
-    rev = "4325da93b7516abb6f93a1417adc10593dacd794";
-  };
-
-  buildInputs = [ qtbase qtscript qtquick1 ];
-  nativeBuildInputs = [ doxygen pkgconfig cmake ];
-
-  enableParallelBuilding = true;
-
-  preConfigure = ''
-    cmakeFlags="$cmakeFlags -DCMAKE_BUILD_TYPE=Release \
-                            -DQTONLY=TRUE -DQT5BUILD=ON \
-                            -DBUILD_MARBLE_TESTS=NO \
-                            -DWITH_DESIGNER_PLUGIN=NO \
-                            -DBUILD_MARBLE_APPS=NO"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Qt library for a slippy map with patches from the Subsurface project";
-    homepage = "http://subsurface-divelog.org";
-    license = licenses.lgpl21;
-    maintainers = [ maintainers.mguentner ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96420aeb048..98dbd70fe96 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2488,8 +2488,6 @@ with pkgs;
 
   makebootfat = callPackage ../tools/misc/makebootfat { };
 
-  libmarble-ssrf = qt55.callPackage ../development/libraries/libmarble-ssrf { };
-
   matrix-synapse = callPackage ../servers/matrix-synapse { };
 
   memtester = callPackage ../tools/system/memtester { };
@@ -3904,9 +3902,7 @@ with pkgs;
 
   su-exec = callPackage ../tools/security/su-exec {};
 
-  subsurface = qt55.callPackage ../applications/misc/subsurface {
-    libdivecomputer = libdivecomputer_ssrf;
-  };
+  subsurface = qt5.callPackage ../applications/misc/subsurface { };
 
   sudo = callPackage ../tools/security/sudo { };
 
@@ -8004,8 +8000,6 @@ with pkgs;
 
   libdivecomputer = callPackage ../development/libraries/libdivecomputer { };
 
-  libdivecomputer_ssrf = callPackage ../development/libraries/libdivecomputer/subsurface.nix { };
-
   libdivsufsort = callPackage ../development/libraries/libdivsufsort { };
 
   libdmtx = callPackage ../development/libraries/libdmtx { };

From bab37c73ac14e91c9fda22a1e7a7b54ffd2e9a7e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 11 Feb 2017 15:33:24 +0100
Subject: [PATCH 776/899] nvidia-x11: undo parallel building

In ffc498c4900bbc993b88ef5525698e06fd91beca -j$NIX_BUILD_JOBS was added.
Somehow this caused my machine to run many many more parallel jobs than
it was supposed to, freezing the system.

If you don't experience this, feel free to revert.
---
 pkgs/os-specific/linux/nvidia-x11/builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 98858c4c985..523396faf3d 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -21,7 +21,7 @@ buildPhase() {
         sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source)
         sysOut=$(echo $kernel/lib/modules/$kernelVersion/build)
         unset src # used by the nv makefile
-        make SYSSRC=$sysSrc SYSOUT=$sysOut module -j$NIX_BUILD_JOBS
+        make SYSSRC=$sysSrc SYSOUT=$sysOut module
 
         cd ..
     fi

From bbbd3c09701500c0d322f24c840e453a2973bf5f Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 11 Feb 2017 15:52:50 +0100
Subject: [PATCH 777/899] sile: minor cleanup

---
 pkgs/tools/typesetting/sile/default.nix | 28 ++++++++++++++++---------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix
index 890103a0f98..382219a0a3a 100644
--- a/pkgs/tools/typesetting/sile/default.nix
+++ b/pkgs/tools/typesetting/sile/default.nix
@@ -13,15 +13,17 @@ let
   getLuaCPath   = lib : getPath lib "so";
   luaPath       = concatStringsSep ";" (map getLuaPath libs);
   luaCPath      = concatStringsSep ";" (map getLuaCPath libs);
-  in
 
-  stdenv.mkDerivation rec {
-    name = "sile-${version}";
-    version = "0.9.4";
-    src = fetchurl {
-      url = "https://github.com/simoncozens/sile/releases/download/v${version}/${name}.tar.bz2";
-      sha256 = "1mald727hy9bi17rcaph8q400yn5xqkn5f2xf1408g94wmwncs8w";
-    };
+in
+
+stdenv.mkDerivation rec {
+  name = "sile-${version}";
+  version = "0.9.4";
+
+  src = fetchurl {
+    url = "https://github.com/simoncozens/sile/releases/download/v${version}/${name}.tar.bz2";
+    sha256 = "1mald727hy9bi17rcaph8q400yn5xqkn5f2xf1408g94wmwncs8w";
+  };
 
   nativeBuildInputs = [pkgconfig makeWrapper];
   buildInputs = [ harfbuzz icu lua lpeg luaexpat luazlib luafilesystem fontconfig libiconv ];
@@ -38,8 +40,14 @@ let
   meta = {
     description = "A typesetting system";
     longDescription = ''
-      SILE is a typesetting system; its job is to produce beautiful printed documents.
-      Conceptually, SILE is similar to TeX—from which it borrows some concepts and even syntax and algorithms—but the similarities end there. Rather than being a derivative of the TeX family SILE is a new typesetting and layout engine written from the ground up using modern technologies and borrowing some ideas from graphical systems such as InDesign.
+      SILE is a typesetting system; its job is to produce beautiful
+      printed documents. Conceptually, SILE is similar to TeX—from
+      which it borrows some concepts and even syntax and
+      algorithms—but the similarities end there. Rather than being a
+      derivative of the TeX family SILE is a new typesetting and
+      layout engine written from the ground up using modern
+      technologies and borrowing some ideas from graphical systems
+      such as InDesign.
     '';
     homepage = "http://www.sile-typesetter.org";
     platforms = stdenv.lib.platforms.unix;

From 0b7fec62726613b2c9703cfa43dd8c440ad7da75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 11 Feb 2017 17:46:00 +0100
Subject: [PATCH 778/899] knot-resolver: maintenance 1.2.1 -> 1.2.2

In particular, trust anchor bootstrapping is fixed after IANA publishing
an additional key.
---
 pkgs/servers/dns/knot-resolver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 6b4f1522e21..b74f50beb61 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -10,11 +10,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "knot-resolver-${version}";
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
-    sha256 = "1b6f55ea1dfec90f45c437f23e1ab440e478570498161d0f8a8f94a439305f8c";
+    sha256 = "89ab2ac8058b297c1f73f1c12e0f16d6e160aa86363e99ffa590bee7fe307931";
   };
 
   outputs = [ "out" "dev" ];

From 45b1d0cb8cc153f83c47ef2ab6c8ba351b6367a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 11 Feb 2017 17:51:57 +0100
Subject: [PATCH 779/899] knot-dns: maintenance 2.4.0 -> 2.4.1

---
 pkgs/servers/dns/knot-dns/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index c7b2032a579..cba21fbeb8e 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -5,20 +5,13 @@
 # Note: ATM only the libraries have been tested in nixpkgs.
 stdenv.mkDerivation rec {
   name = "knot-dns-${version}";
-  version = "2.4.0";
+  version = "2.4.1";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "0y9nhp9lfmxv4iy1xg7l4lfxv4168qhag26wwg0dbi0zjpkd790b";
+    sha256 = "c064ddf99bf5fc24dd3c6a3a523394760357e204c8b69f0e691e49bc0d9b704c";
   };
 
-  patches = stdenv.lib.optional stdenv.isDarwin
-      (fetchpatch {
-        name = "before-sierra.diff";
-        url = "https://gitlab.labs.nic.cz/labs/knot/merge_requests/664.diff";
-        sha256 = "0g4gm2m3pi0lfpkp53xayf6jq6yn3ifidh40maiy1a46dfadvw6w";
-      });
-
   outputs = [ "bin" "out" "dev" ];
 
   nativeBuildInputs = [ pkgconfig ];

From a749b73ff8fd88a98417659cce37ce194f2c0a7c Mon Sep 17 00:00:00 2001
From: Langston Barrett <langston.barrett@gmail.com>
Date: Sun, 29 Jan 2017 21:35:49 +0000
Subject: [PATCH 780/899] ne: migrate from (broken) tetex to texlive

related: #21770.  vcunat re-indented the longDescription.
---
 pkgs/applications/editors/ne/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix
index c7dbff366db..7feb7f22e22 100644
--- a/pkgs/applications/editors/ne/default.nix
+++ b/pkgs/applications/editors/ne/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ncurses, texinfo, tetex, perl, ghostscript }:
+{ stdenv, fetchFromGitHub, ncurses, texinfo, texlive, perl, ghostscript }:
 
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     rev = version;
     sha256 = "05inzhlqlf4ka22q78q389pr34bsb4lgp1i5qh550vjkb2cvbdfp";
   };
-  buildInputs = [ ncurses tetex texinfo perl ghostscript ];
+  buildInputs = [ ncurses texlive.combined.scheme-medium texinfo perl ghostscript ];
   dontBuild = true;
   installPhase = ''
     substituteInPlace src/makefile --replace "CC=c99" "cc=gcc"
@@ -20,14 +20,15 @@ stdenv.mkDerivation rec {
     cd src && make && cd ..
     make PREFIX=$out install
   '';
-  
+
   meta = {
     description = "The nice editor";
     homepage = https://github.com/vigna/ne;
     longDescription = ''
-      ne is a free (GPL'd) text editor based on the POSIX standard that runs (we hope) on almost any 
-UN*X machine. ne is easy to use for the beginner, but powerful and fully configurable for the wizard, 
-and most sparing in its resource usage. See the manual for some highlights of ne's features.      
+      ne is a free (GPL'd) text editor based on the POSIX standard that runs
+      (we hope) on almost any UN*X machine.  ne is easy to use for the beginner,
+      but powerful and fully configurable for the wizard, and most sparing in its
+      resource usage.  See the manual for some highlights of ne's features.
     '';
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.unix;

From b9d6a6cbd0437c5482e5805594ed62394c74bdca Mon Sep 17 00:00:00 2001
From: Langston Barrett <langston.barrett@gmail.com>
Date: Sun, 29 Jan 2017 21:36:26 +0000
Subject: [PATCH 781/899] enblend-enfuse: migrate from (broken) tetex to
 texlive

related: #21770
---
 pkgs/tools/graphics/enblend-enfuse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix
index 00cc5e385fe..2a0796699fb 100644
--- a/pkgs/tools/graphics/enblend-enfuse/default.nix
+++ b/pkgs/tools/graphics/enblend-enfuse/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , boost, freeglut, glew, gsl, lcms2, libpng, libtiff, mesa, vigra
-, help2man, pkgconfig, perl, tetex }:
+, help2man, pkgconfig, perl, texlive }:
 
 stdenv.mkDerivation rec {
   name = "enblend-enfuse-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff mesa vigra ];
 
-  nativeBuildInputs = [ help2man perl pkgconfig tetex ];
+  nativeBuildInputs = [ help2man perl pkgconfig texlive.combined.scheme-small ];
 
   preConfigure = ''
     patchShebangs src/embrace

From 2aff29c7b202725933dd5306eed4241fe86be0b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 11 Feb 2017 18:09:43 +0100
Subject: [PATCH 782/899] tex4ht: deprecate in favor of texlive.tex4ht

I don't make an alias, as the attribute is used in a different way.
---
 pkgs/tools/typesetting/tex/tex4ht/default.nix | 1 +
 pkgs/top-level/all-packages.nix               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/typesetting/tex/tex4ht/default.nix b/pkgs/tools/typesetting/tex/tex4ht/default.nix
index 5aaae2c06b2..6f387b5bf8b 100644
--- a/pkgs/tools/typesetting/tex/tex4ht/default.nix
+++ b/pkgs/tools/typesetting/tex/tex4ht/default.nix
@@ -34,5 +34,6 @@ stdenv.mkDerivation rec {
     description = "A system to convert (La)TeX documents to HTML and various other formats";
     license = stdenv.lib.licenses.lppl12;
     platforms = stdenv.lib.platforms.unix;
+    broken = true; # use the one from texlive.tex4ht
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98dbd70fe96..317903b4988 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17815,7 +17815,7 @@ with pkgs;
 
   tewi-font = callPackage ../data/fonts/tewi  {};
 
-  tex4ht = callPackage ../tools/typesetting/tex/tex4ht { };
+  tex4ht = callPackage ../tools/typesetting/tex/tex4ht { tetex = null; };
 
   texFunctions = callPackage ../tools/typesetting/tex/nix pkgs;
 

From a7096107f34535f4f730c38f86708ad98a3df942 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 11 Feb 2017 18:18:27 +0100
Subject: [PATCH 783/899] audacious: 3.8 -> 3.8.2

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

diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix
index e9d7b5da79a..6d4b18e29b0 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@@ -8,16 +8,16 @@
 
 stdenv.mkDerivation rec {
   name = "audacious-${version}";
-  version = "3.8";
+  version = "3.8.2";
 
   src = fetchurl {
     url = "http://distfiles.audacious-media-player.org/audacious-${version}-gtk3.tar.bz2";
-    sha256 = "0rpdzf9pb52lcswxypwh4nq3qkjzliw42v39nm5rlwwxdq6bm99q";
+    sha256 = "1g08xprc9q0lyw3knq723j7xr7i15f8v1x1j3k5wvi8jv21bvijf";
   };
 
   pluginsSrc = fetchurl {
     url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}-gtk3.tar.bz2";
-    sha256 = "0j9svdqdjvj5spx1vfp0m63xh8xwk8naqsikdxfxbb68xk33rxb9";
+    sha256 = "1vqcxwqinlwb2l0kkrarg33sw1brjzrnq5jbhzrql6z6x95h4jbq";
   };
 
   nativeBuildInputs = [

From c512ba7e7e8cbd19737b659fb6edb9baaa75f174 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 11 Feb 2017 18:19:17 +0100
Subject: [PATCH 784/899] audaciousQt5: 3.8.1 -> 3.8.2, rename to audacious-qt5

The name is changed as well so it won't upgrade from the gtk3 version.
---
 pkgs/applications/audio/audacious/qt-5.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix
index b86efe7eb97..663e0eb0cc8 100644
--- a/pkgs/applications/audio/audacious/qt-5.nix
+++ b/pkgs/applications/audio/audacious/qt-5.nix
@@ -10,23 +10,23 @@
 }:
 
 let
-  version = "3.8.1";
+  version = "3.8.2";
   sources = {
     "audacious-${version}" = fetchurl {
       url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
-      sha256 = "1k9blmgqia0df18l39bd2bbcwmjfxak6bd286vcd9zzmjhqs4qdc";
+      sha256 = "14xyvmxdax0aj1gqcz8z23cjcavsysyh6b3lkiczkv4vrqf4gwdx";
     };
 
     "audacious-plugins-${version}" = fetchurl {
       url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
-      sha256 = "0f16ivcp8nd83r781hnw1qgbs9hi2b2v22zwv7c3sw3jq1chb70h";
+      sha256 = "1m7xln93zc4qvb1fi83icyd5x2r6azqlvs5nigjz8az3l2kzrknp";
     };
   };
 in
 
 stdenv.mkDerivation {
   inherit version;
-  name = "audacious-${version}";
+  name = "audacious-qt5-${version}";
 
   sourceFiles = lib.attrValues sources;
   sourceRoots = lib.attrNames sources;

From a3523022e704cfeda7c5c38166ff00343ed739ef Mon Sep 17 00:00:00 2001
From: David Terry <xwvvvvwx@users.noreply.github.com>
Date: Sat, 11 Feb 2017 19:10:46 +0100
Subject: [PATCH 785/899] range-v3: init at 2017-01-30 (#22661)

---
 lib/maintainers.nix                           |  1 +
 .../libraries/range-v3/default.nix            | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/libraries/range-v3/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 1afd32bc763..8c778921fac 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -523,6 +523,7 @@
   womfoo = "Kranium Gikos Mendoza <kranium@gikos.net>";
   wscott = "Wayne Scott <wsc9tt@gmail.com>";
   wyvie = "Elijah Rum <elijahrum@gmail.com>";
+  xwvvvvwx = "David Terry <davidterry@posteo.de>";
   yarr = "Dmitry V. <savraz@gmail.com>";
   yochai = "Yochai <yochai@titat.info>";
   yorickvp = "Yorick van Pelt <yorickvanpelt@gmail.com>";
diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix
new file mode 100644
index 00000000000..f1d9026b5f9
--- /dev/null
+++ b/pkgs/development/libraries/range-v3/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "range-v3-${version}";
+  version = "2017-01-30";
+
+  src = fetchFromGitHub {
+    owner = "ericniebler";
+    repo = "range-v3";
+    rev = "bab29767cce120e11872d79a2537bc6f0be76963";
+    sha256 = "0kncpxms3f0nmn6jppp484244xq15d9298g3h3nlm1wvq8ib1jhi";
+  };
+
+  dontBuild = true;
+  installPhase = ''
+    mkdir -p $out/include
+    mv include/ $out/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Experimental range library for C++11/14/17";
+    homepage = https://github.com/ericniebler/range-v3;
+    license = licenses.boost;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ xwvvvvwx ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 317903b4988..8837a65fba7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9347,6 +9347,8 @@ with pkgs;
 
   rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {};
 
+  range-v3 = callPackage ../development/libraries/range-v3 {};
+
   rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {};
 
   raul = callPackage ../development/libraries/audio/raul { };

From e644f9f8ecd4888b3a1a1c06e1c9f4edeaf83d60 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 11 Feb 2017 19:24:06 +0100
Subject: [PATCH 786/899] python-packages: update "osc" to latest version from
 git

---
 pkgs/top-level/python-packages.nix | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c25be593e27..2ddaa2a4fc1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16679,22 +16679,23 @@ in {
     };
   });
 
-  osc = buildPythonPackage (rec {
-    name = "osc-0.133+git";
+  osc = buildPythonPackage {
+    name = "osc-0.156.0-16-g9e6d1a5";
     disabled = isPy3k;
-
-    src = pkgs.fetchgit {
-      url = https://github.com/openSUSE/osc;
-      rev = "6cd541967ee2fca0b89e81470f18b97a3ffc23ce";
-      sha256 = "0bf0yc4y1q87k7hq40xnr687lyw3ma93b3zprjlgn9pr8s1cn9xw";
+    src = pkgs.fetchFromGitHub {
+      owner = "openSUSE";
+      repo = "osc";
+      rev = "9e6d1a592e89e8ee9fd40a96cfcf97bf74f68715";
+      sha256 = "13svha5zh1xn3jv4kn9h3d620p65qh5nnhhghjbscp9lzlwwba3g";
     };
-
-    doCheck = false;
+    propagatedBuildInputs = with self; [ urlgrabber m2crypto pyyaml ];
     postInstall = "ln -s $out/bin/osc-wrapper.py $out/bin/osc";
-
-    propagatedBuildInputs = with self; [ self.m2crypto ];
-
-  });
+    meta = {
+      description = "opensuse-commander with svn like handling";
+      maintainers = [ maintainers.peti ];
+      license = licenses.gpl2;
+    };
+  };
 
   oslosphinx = buildPythonPackage rec {
     name = "oslosphinx-3.3.1";

From 3cec7d10dfb80b7466f171e7a59ac9af3bab2862 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 11 Feb 2017 13:55:09 -0500
Subject: [PATCH 787/899] kdm: drop service

---
 nixos/modules/misc/ids.nix                    |   4 +-
 nixos/modules/module-list.nix                 |   1 -
 .../services/x11/desktop-managers/kde4.nix    | 202 ------------------
 .../services/x11/display-managers/default.nix |   3 -
 .../services/x11/display-managers/kdm.nix     | 161 --------------
 .../system/boot/loader/grub/install-grub.pl   |   2 -
 .../modules/testing/test-instrumentation.nix  |   9 -
 nixos/tests/kde4.nix                          |  70 ------
 8 files changed, 2 insertions(+), 450 deletions(-)
 delete mode 100644 nixos/modules/services/x11/desktop-managers/kde4.nix
 delete mode 100644 nixos/modules/services/x11/display-managers/kdm.nix
 delete mode 100644 nixos/tests/kde4.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 60e00ce874a..1566dbe1677 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -64,7 +64,7 @@
       cups = 36;
       foldingathome = 37;
       sabnzbd = 38;
-      kdm = 39;
+      #kdm = 39; # dropped in 17.03
       ghostone = 40;
       git = 41;
       fourstore = 42;
@@ -333,7 +333,7 @@
       #cups = 36; # unused
       #foldingathome = 37; # unused
       #sabnzd = 38; # unused
-      #kdm = 39; # unused
+      #kdm = 39; # unused, even before 17.03
       ghostone = 40;
       git = 41;
       fourstore = 42;
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index afaaccb0156..7c9c9ac2a1e 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -559,7 +559,6 @@
   ./services/x11/display-managers/auto.nix
   ./services/x11/display-managers/default.nix
   ./services/x11/display-managers/gdm.nix
-  ./services/x11/display-managers/kdm.nix
   ./services/x11/display-managers/lightdm.nix
   ./services/x11/display-managers/sddm.nix
   ./services/x11/display-managers/slim.nix
diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix
deleted file mode 100644
index f0de9120c69..00000000000
--- a/nixos/modules/services/x11/desktop-managers/kde4.nix
+++ /dev/null
@@ -1,202 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  xcfg = config.services.xserver;
-  cfg = xcfg.desktopManager.kde4;
-  xorg = pkgs.xorg;
-  kde_workspace = config.services.xserver.desktopManager.kde4.kdeWorkspacePackage;
-
-  # Disable Nepomuk and Strigi by default.  As of KDE 4.7, they don't
-  # really work very well (e.g. searching files often fails to find
-  # files), segfault sometimes and consume significant resources.
-  # They can be re-enabled in the KDE System Settings under "Desktop
-  # Search".
-  disableNepomuk = pkgs.writeTextFile
-    { name = "nepomuk-config";
-      destination = "/share/config/nepomukserverrc";
-      text =
-        ''
-          [Basic Settings]
-          Start Nepomuk=false
-
-          [Service-nepomukstrigiservice]
-          autostart=false
-        '';
-    };
-
-  phononBackends = {
-    gstreamer = [
-      pkgs.phonon-backend-gstreamer
-      pkgs.gst_all.gstPluginsBase
-      pkgs.gst_all.gstPluginsGood
-      pkgs.gst_all.gstPluginsUgly
-      pkgs.gst_all.gstPluginsBad
-      pkgs.gst_all.gstFfmpeg # for mp3 playback
-      pkgs.gst_all.gstreamer # needed?
-    ];
-
-    vlc = [pkgs.phonon-backend-vlc];
-  };
-
-  phononBackendPackages = flip concatMap cfg.phononBackends
-    (name: attrByPath [name] (throw "unknown phonon backend `${name}'") phononBackends);
-
-in
-
-{
-  options = {
-
-    services.xserver.desktopManager.kde4 = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Enable the KDE 4 desktop environment.";
-      };
-
-      phononBackends = mkOption {
-        type = types.listOf types.str;
-        default = ["gstreamer"];
-        example = ["gstreamer" "vlc"];
-        description = "Which phonon multimedia backend kde should use";
-      };
-
-      kdeWorkspacePackage = mkOption {
-        internal = true;
-        default = pkgs.kde4.kde_workspace;
-        defaultText = "pkgs.kde4.kde_workspace";
-        type = types.package;
-        description = "Custom kde-workspace, used for NixOS rebranding.";
-      };
-
-      enablePIM = mkOption {
-        type = types.bool;
-        default = true;
-        description = "Whether to enable PIM support. Note that enabling this pulls in Akonadi and MariaDB as dependencies.";
-      };
-
-      enableNepomuk = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Whether to enable Nepomuk (deprecated).";
-      };
-    };
-  };
-
-
-  config = mkIf (xcfg.enable && cfg.enable) {
-    warnings = [
-      "KDE4 is long unmaintained and will be removed. Please update to KDE5."
-    ];
-
-    # If KDE 4 is enabled, make it the default desktop manager (unless
-    # overridden by the user's configuration).
-    # !!! doesn't work yet ("Multiple definitions. Only one is allowed
-    # for this option.")
-    # services.xserver.desktopManager.default = mkOverride 900 "kde4";
-
-    services.xserver.desktopManager.session = singleton
-      { name = "kde4";
-        bgSupport = true;
-        start =
-          ''
-            # The KDE icon cache is supposed to update itself
-            # automatically, but it uses the timestamp on the icon
-            # theme directory as a trigger.  Since in Nix the
-            # timestamp is always the same, this doesn't work.  So as
-            # a workaround, nuke the icon cache on login.  This isn't
-            # perfect, since it may require logging out after
-            # installing new applications to update the cache.
-            # See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
-            rm -fv $HOME/.kde/cache-*/icon-cache.kcache
-
-            # Qt writes a weird ‘libraryPath’ line to
-            # ~/.config/Trolltech.conf that causes the KDE plugin
-            # paths of previous KDE invocations to be searched.
-            # Obviously using mismatching KDE libraries is potentially
-            # disastrous, so here we nuke references to the Nix store
-            # in Trolltech.conf.  A better solution would be to stop
-            # Qt from doing this wackiness in the first place.
-            if [ -e $HOME/.config/Trolltech.conf ]; then
-                sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
-            fi
-
-            # Load PulseAudio module for routing support.
-            # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/
-            ${optionalString config.hardware.pulseaudio.enable ''
-              ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
-            ''}
-
-            # Start KDE.
-            exec ${kde_workspace}/bin/startkde
-          '';
-      };
-
-    security.setuidOwners = singleton
-      { program = "kcheckpass";
-        source = "${kde_workspace}/lib/kde4/libexec/kcheckpass";
-        owner = "root";
-        group = "root";
-        setuid = true;
-      };
-
-    environment.systemPackages =
-        [ pkgs.kde4.kdelibs
-
-          pkgs.kde4.kde_baseapps # Splitted kdebase
-          kde_workspace
-          pkgs.kde4.kde_runtime
-          pkgs.kde4.konsole
-          pkgs.kde4.kate
-
-          pkgs.kde4.kde_wallpapers # contains kdm's default background
-          pkgs.kde4.oxygen_icons
-
-          # Starts KDE's Polkit authentication agent.
-          pkgs.kde4.polkit_kde_agent
-
-          # Miscellaneous runtime dependencies.
-          pkgs.kde4.qt4 # needed for qdbus
-          pkgs.shared_mime_info
-          xorg.xmessage # so that startkde can show error messages
-          xorg.xset # used by startkde, non-essential
-          xorg.xauth # used by kdesu
-        ]
-      ++ optionals cfg.enablePIM
-        [ pkgs.kde4.kdepim_runtime
-          pkgs.kde4.akonadi
-          pkgs.mysql # used by akonadi
-        ]
-      ++ (if cfg.enableNepomuk then
-        [ pkgs.shared_desktop_ontologies # used by nepomuk
-          pkgs.strigi # used by nepomuk
-          pkgs.virtuoso # to enable Nepomuk to find Virtuoso
-        ] else
-        [ disableNepomuk ])
-      ++ optional config.hardware.pulseaudio.enable pkgs.kde4.kmix  # Perhaps this should always be enabled
-      ++ optional config.hardware.bluetooth.enable pkgs.kde4.bluedevil
-      ++ optional config.networking.networkmanager.enable pkgs.kde4.plasma-nm
-      ++ phononBackendPackages;
-
-    environment.pathsToLink = [ "/share" ];
-
-    environment.profileRelativeEnvVars = mkIf (elem "gstreamer" cfg.phononBackends) {
-      GST_PLUGIN_SYSTEM_PATH = [ "/lib/gstreamer-0.10" ];
-    };
-
-    environment.etc = singleton
-      { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
-        target = "X11/xkb";
-      };
-
-    # Enable helpful DBus services.
-    services.udisks2.enable = true;
-    services.upower.enable = config.powerManagement.enable;
-
-    security.pam.services.kde = { allowNullPassword = true; };
-
-  };
-
-}
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 98d2d0ea834..7418ce56357 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -55,9 +55,6 @@ let
         fi
       ''}
 
-      # Handle being called by kdm.
-      if test "''${1:0:1}" = /; then eval exec "$1"; fi
-
       # Start PulseAudio if enabled.
       ${optionalString (config.hardware.pulseaudio.enable) ''
         ${optionalString (!config.hardware.pulseaudio.systemWide)
diff --git a/nixos/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix
deleted file mode 100644
index bfb763f2858..00000000000
--- a/nixos/modules/services/x11/display-managers/kdm.nix
+++ /dev/null
@@ -1,161 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  dmcfg = config.services.xserver.displayManager;
-  cfg = dmcfg.kdm;
-
-  inherit (pkgs.kde4) kdebase_workspace;
-
-  defaultConfig =
-    ''
-      [Shutdown]
-      HaltCmd=${config.systemd.package}/sbin/shutdown -h now
-      RebootCmd=${config.systemd.package}/sbin/shutdown -r now
-      ${optionalString (config.system.boot.loader.id == "grub") ''
-        BootManager=${if config.boot.loader.grub.version == 2 then "Grub2" else "Grub"}
-      ''}
-
-      [X-*-Core]
-      Xrdb=${pkgs.xorg.xrdb}/bin/xrdb
-      SessionsDirs=${dmcfg.session.desktops}
-      Session=${dmcfg.session.script}
-      FailsafeClient=${pkgs.xterm}/bin/xterm
-
-      [X-:*-Core]
-      ServerCmd=${dmcfg.xserverBin} ${toString dmcfg.xserverArgs}
-      # KDM calls `rm' somewhere to clean up some temporary directory.
-      SystemPath=${pkgs.coreutils}/bin
-      # The default timeout (15) is too short in a heavily loaded boot process.
-      ServerTimeout=60
-      # Needed to prevent the X server from dying on logout and not coming back:
-      TerminateServer=true
-      ${optionalString (cfg.setupScript != "")
-      ''
-        Setup=${cfg.setupScript}
-      ''}
-
-      [X-*-Greeter]
-      HiddenUsers=root,${concatStringsSep "," dmcfg.hiddenUsers}
-      PluginsLogin=${kdebase_workspace}/lib/kde4/kgreet_classic.so
-      ${optionalString (cfg.themeDirectory != null)
-      ''
-        UseTheme=true
-        Theme=${cfg.themeDirectory}
-      ''
-      }
-
-      ${optionalString (cfg.enableXDMCP)
-      ''
-        [Xdmcp]
-        Enable=true
-      ''}
-    '';
-
-  kdmrc = pkgs.runCommand "kdmrc"
-    { config = defaultConfig + cfg.extraConfig;
-      preferLocalBuild = true;
-    }
-    ''
-      echo "$config" > $out
-
-      # The default kdmrc would add "-nolisten tcp", and we already
-      # have that managed by nixos. Hence the grep.
-      cat ${kdebase_workspace}/share/config/kdm/kdmrc | grep -v nolisten >> $out
-    '';
-
-in
-
-{
-
-  ###### interface
-
-  options = {
-
-    services.xserver.displayManager.kdm = {
-
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether to enable the KDE display manager.
-        '';
-      };
-
-      enableXDMCP = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether to enable XDMCP, which allows remote logins.
-        '';
-      };
-
-      themeDirectory = mkOption {
-        type = types.nullOr types.str;
-        default = null;
-        description = ''
-          The path to a KDM theme directory. This theme
-          will be used by the KDM greeter.
-        '';
-      };
-
-      setupScript = mkOption {
-        type = types.lines;
-        default = "";
-        description = ''
-          The path to a KDM setup script. This script is run as root just
-          before KDM starts. Can be used for setting up
-          monitors with xrandr, for example.
-        '';
-      };
-
-      extraConfig = mkOption {
-        type = types.lines;
-        default = "";
-        description = ''
-          Options appended to <filename>kdmrc</filename>, the
-          configuration file of KDM.
-        '';
-      };
-
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = mkIf cfg.enable {
-    warnings = [
-      "KDM is long unmaintained and will be removed. Please update to SDDM."
-    ];
-
-    services.xserver.displayManager.slim.enable = false;
-
-    services.xserver.displayManager.job =
-      { execCmd =
-          ''
-            mkdir -m 0755 -p /var/lib/kdm
-            chown kdm /var/lib/kdm
-            ${(optionalString (config.system.boot.loader.id == "grub" && config.system.build.grub != null) "PATH=${config.system.build.grub}/sbin:$PATH ") +
-              "KDEDIRS=/run/current-system/sw exec ${kdebase_workspace}/bin/kdm -config ${kdmrc} -nodaemon -logfile /dev/stderr"}
-          '';
-        logsXsession = true;
-      };
-
-    security.pam.services.kde = { allowNullPassword = true; startSession = true; };
-
-    users.extraUsers = singleton
-      { name = "kdm";
-        uid = config.ids.uids.kdm;
-        description = "KDM user";
-      };
-
-    environment.systemPackages =
-      [ pkgs.kde4.kde_wallpapers ]; # contains kdm's default background
-
-  };
-
-}
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 24442ca12a3..f92b17720f6 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -256,8 +256,6 @@ else {
         # ‘grub-reboot’ sets a one-time saved entry, which we process here and
         # then delete.
         if [ \"\${next_entry}\" ]; then
-          # FIXME: KDM expects the next line to be present.
-          set default=\"\${saved_entry}\"
           set default=\"\${next_entry}\"
           set next_entry=
           save_env next_entry
diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index 099ead3d846..7f5b55d5cca 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -123,15 +123,6 @@ let kernel = config.boot.kernelPackages.kernel; in
     users.extraUsers.root.initialHashedPassword = mkOverride 150 "";
 
     services.xserver.displayManager.logToJournal = true;
-
-    # Bump kdm's X server start timeout to account for heavily loaded
-    # VM host systems.
-    services.xserver.displayManager.kdm.extraConfig =
-      ''
-        [X-:*-Core]
-        ServerTimeout=240
-      '';
-
   };
 
 }
diff --git a/nixos/tests/kde4.nix b/nixos/tests/kde4.nix
deleted file mode 100644
index 9ecfe687056..00000000000
--- a/nixos/tests/kde4.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-import ./make-test.nix ({ pkgs, ... }: {
-  name = "kde4";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ domenkozar eelco chaoflow ];
-  };
-
-  machine =
-    { config, pkgs, ... }:
-
-    { imports = [ ./common/user-account.nix ];
-
-      virtualisation.memorySize = 1024;
-
-      services.xserver.enable = true;
-
-      services.httpd.enable = true;
-      services.httpd.adminAddr = "foo@example.org";
-      services.httpd.documentRoot = "${pkgs.valgrind.doc}/share/doc/valgrind/html";
-
-      services.xserver.displayManager.kdm.enable = true;
-      services.xserver.displayManager.kdm.extraConfig =
-        ''
-          [X-:0-Core]
-          AutoLoginEnable=true
-          AutoLoginUser=alice
-          AutoLoginPass=foobar
-        '';
-
-      services.xserver.desktopManager.kde4.enable = true;
-
-      # Include most of KDE. We don't really test these here, but at
-      # least they should build.
-      environment.systemPackages =
-        [ pkgs.kde4.kdemultimedia
-          pkgs.kde4.kdegraphics
-          pkgs.kde4.kdeutils
-          pkgs.kde4.kdegames
-          #pkgs.kde4.kdeedu
-          pkgs.kde4.kdeaccessibility
-          pkgs.kde4.kdeadmin
-          pkgs.kde4.kdenetwork
-          pkgs.kde4.kdetoys
-          pkgs.kde4.kdewebdev
-          pkgs.xorg.xmessage
-        ];
-    };
-
-  testScript = ''
-      $machine->waitUntilSucceeds("pgrep plasma-desktop");
-      $machine->succeed("xauth merge ~alice/.Xauthority");
-      $machine->waitForWindow(qr/plasma-desktop/);
-
-      # Check that logging in has given the user ownership of devices.
-      $machine->succeed("getfacl /dev/snd/timer | grep -q alice");
-
-      $machine->execute("su - alice -c 'DISPLAY=:0.0 kwrite /var/log/messages &'");
-      $machine->waitForWindow(qr/messages.*KWrite/);
-
-      $machine->execute("su - alice -c 'DISPLAY=:0.0 konqueror http://localhost/ &'");
-      $machine->waitForWindow(qr/Valgrind.*Konqueror/);
-
-      $machine->execute("su - alice -c 'DISPLAY=:0.0 gwenview ${pkgs.kde4.kde_wallpapers}/share/wallpapers/Hanami/contents/images/1280x1024.jpg &'");
-      $machine->waitForWindow(qr/Gwenview/);
-
-      $machine->sleep(10);
-
-      $machine->screenshot("screen");
-    '';
-
-})

From b1a05a0865a6a7cfddb1dd5f6c0f32a91c20f473 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 11 Feb 2017 14:01:13 -0500
Subject: [PATCH 788/899] nixos: drop references to kde4

Excluding modules/programs/environment.nix for PATHand QT_PLUGIN_PATH to allow the programs to continue running.
---
 nixos/modules/services/hardware/bluetooth.nix           | 6 ++----
 nixos/modules/services/networking/quassel.nix           | 6 +++---
 nixos/modules/services/x11/desktop-managers/default.nix | 5 ++---
 nixos/modules/services/x11/desktop-managers/kde5.nix    | 4 ----
 nixos/release-combined.nix                              | 1 -
 nixos/release.nix                                       | 1 -
 6 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix
index ef2fce613f2..de0d4803211 100644
--- a/nixos/modules/services/hardware/bluetooth.nix
+++ b/nixos/modules/services/hardware/bluetooth.nix
@@ -2,9 +2,7 @@
 
 with lib;
 let
-  isBluez4 = config.services.xserver.desktopManager.kde4.enable;
-  bluez-bluetooth = if isBluez4 then pkgs.bluez4 else pkgs.bluez;
-
+  bluez-bluetooth = pkgs.bluez;
 in
 
 {
@@ -38,7 +36,7 @@ in
       aliases = [ "dbus-org.bluez.service" ];
     };
 
-    systemd.user.services.obex = mkIf (!isBluez4) {
+    systemd.user.services.obex = {
       aliases = [ "dbus-org.bluez.obex.service" ];
     };
 
diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix
index edcc12170b2..9b06cccca79 100644
--- a/nixos/modules/services/networking/quassel.nix
+++ b/nixos/modules/services/networking/quassel.nix
@@ -25,12 +25,12 @@ in
 
       package = mkOption {
         type = types.package;
-        default = pkgs.kde4.quasselDaemon;
-        defaultText = "pkgs.kde4.quasselDaemon";
+        default = pkgs.quasselDaemon_qt5;
+        defaultText = "pkgs.quasselDaemon_qt5";
         description = ''
           The package of the quassel daemon.
         '';
-        example = literalExample "pkgs.quasselDaemon";
+        example = literalExample "pkgs.quasselDaemon_qt5";
       };
 
       interfaces = mkOption {
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 144e4aada27..1f7a925ed05 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -18,9 +18,8 @@ in
   # determines the default: later modules (if enabled) are preferred.
   # E.g., if KDE is enabled, it supersedes xterm.
   imports = [
-    ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./kde5.nix
-    ./lumina.nix ./lxqt.nix ./enlightenment.nix ./gnome3.nix
-    ./kodi.nix
+    ./none.nix ./xterm.nix ./xfce.nix ./kde5.nix ./lumina.nix
+    ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix
   ];
 
   options = {
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 8f081a1e9d2..644fd8d7752 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -50,10 +50,6 @@ in
     })
 
     (mkIf (xcfg.enable && cfg.enable) {
-
-      warnings = optional config.services.xserver.desktopManager.kde4.enable
-        "KDE 4 should not be enabled at the same time as KDE 5";
-
       services.xserver.desktopManager.session = singleton {
         name = "kde5";
         bgSupport = true;
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 70b29aa23a5..6c048e8a0ac 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -72,7 +72,6 @@ in rec {
         (all nixos.tests.ecryptfs)
         (all nixos.tests.ipv6)
         (all nixos.tests.i3wm)
-        (all nixos.tests.kde4)
         (all nixos.tests.kde5)
         #(all nixos.tests.lightdm)
         (all nixos.tests.login)
diff --git a/nixos/release.nix b/nixos/release.nix
index 0f298188c6c..c061b9801a0 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -255,7 +255,6 @@ in rec {
   tests.influxdb = callTest tests/influxdb.nix {};
   tests.ipv6 = callTest tests/ipv6.nix {};
   tests.jenkins = callTest tests/jenkins.nix {};
-  tests.kde4 = callTest tests/kde4.nix {};
   tests.kde5 = callTest tests/kde5.nix {};
   tests.keymap = callSubTests tests/keymap.nix {};
   tests.initrdNetwork = callTest tests/initrd-network.nix {};

From 70d54cdbe393cf179a880a58c0ca6e8a108eb22a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 11 Feb 2017 20:33:21 +0100
Subject: [PATCH 789/899] skrooge: 2.6.0 -> 2.7.0

---
 pkgs/applications/office/skrooge/2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/skrooge/2.nix b/pkgs/applications/office/skrooge/2.nix
index 98c1c4c8b79..42cc9b0c6eb 100644
--- a/pkgs/applications/office/skrooge/2.nix
+++ b/pkgs/applications/office/skrooge/2.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "skrooge-${version}";
-  version = "2.6.0";
+  version = "2.7.0";
 
   src = fetchurl {
     url = "http://download.kde.org/stable/skrooge/${name}.tar.xz";
-    sha256 = "13sd669rx66fpk9pm72nr2y69k2h4mcs4b904i9xm41i0fiy6szp";
+    sha256 = "1xrh9nal122rzlv4m0x8qah6zpqb6891al3351piarpk2xgjgj4x";
   };
 
   nativeBuildInputs = [ cmake ecm makeQtWrapper ];

From 36d6a3041a3f8c23b1d439fcffb34402d5d220bf Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 7 Feb 2017 16:11:16 -0800
Subject: [PATCH 790/899] jimtcl: 0.76 -> 0.77

---
 pkgs/development/interpreters/jimtcl/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix
index 4ac9b647956..3bef4996a4c 100644
--- a/pkgs/development/interpreters/jimtcl/default.nix
+++ b/pkgs/development/interpreters/jimtcl/default.nix
@@ -1,20 +1,24 @@
 { stdenv, fetchFromGitHub, sqlite, readline, asciidoc, SDL, SDL_gfx }:
 
-stdenv.mkDerivation {
-  name = "jimtcl-0.76";
+let
+  makeSDLFlags = map (p: "-I${stdenv.lib.getDev p}/include/SDL");
+
+in stdenv.mkDerivation rec {
+  name = "jimtcl-${version}";
+  version = "0.77";
 
   src = fetchFromGitHub {
     owner = "msteveb";
     repo = "jimtcl";
-    rev = "51f65c6d38fbf86e1f0b036ad336761fd2ab7fa0";
-    sha256 = "00ldal1w9ysyfmx28xdcaz81vaazr1fqixxb2abk438yfpp1i9hq";
+    rev = version;
+    sha256 = "06d9gdgvi6cwd6pjg3xig0kkjqm6kgq3am8yq1xnksyz2n09f0kp";
   };
 
   buildInputs = [
     sqlite readline asciidoc SDL SDL_gfx
   ];
 
-  NIX_CFLAGS_COMPILE = [ "-I${SDL.dev}/include/SDL" ];
+  NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_gfx ];
 
   configureFlags = [
     "--with-ext=oo"

From 89db3a0bc6d54c8ff49d48c235d427b2bc68030a Mon Sep 17 00:00:00 2001
From: c74d <8573dd@gmail.com>
Date: Sat, 11 Feb 2017 18:41:47 +0000
Subject: [PATCH 791/899] perlPackages.Swim: 0.1.44 -> 0.1.45

This patch updates the Perl package `Swim` (attribute path
`perlPackages.Swim`) from version 0.1.44 to version 0.1.45.

I have tested this patch per nixpkgs manual section 11.1 ("Making
patches").
---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6105fcf54aa..f50d5dfe38d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11964,10 +11964,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Swim = buildPerlPackage rec {
-    name = "Swim-0.1.44";
+    name = "Swim-0.1.45";
     src = fetchurl {
       url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz";
-      sha256 = "06aac148d7b1778028ffae657fdf79b1093b52035661fd8b9bdad729dc8741aa";
+      sha256 = "3755ba1a02aee933c8e1de3995aca1523d6175291a1fa60c3f7fd477f5bb2469";
     };
     buildInputs = [ FileShareDirInstall ];
     propagatedBuildInputs = [ HTMLEscape HashMerge IPCRun Pegex TextAutoformat YAMLLibYAML ];

From c4fab214fae3c89c0c9505cedd6782892db8bcdb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Sat, 11 Feb 2017 22:16:10 +0100
Subject: [PATCH 792/899] blender: 2.78a -> 2.78b

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

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index e07fa1df546..76810a6f249 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -11,11 +11,11 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "blender-2.78a";
+  name = "blender-2.78b";
 
   src = fetchurl {
     url = "http://download.blender.org/source/${name}.tar.gz";
-    sha256 = "1byf1klrvm8fdw2libx7wldz2i6lblp9nih6y58ydh00paqi8jh1";
+    sha256 = "0wgrqwznih6c19y2fpvrk3k6qsaxsy3g7xja87rb4hq7r7j8x22d";
   };
 
   buildInputs =

From cb4e8919c31a3ed79d01a44742a2b310d7568977 Mon Sep 17 00:00:00 2001
From: David Terry <davidterry@posteo.de>
Date: Sat, 11 Feb 2017 22:20:42 +0100
Subject: [PATCH 793/899] spotify: 1.0.47.13 -> 1.0.49.125

---
 pkgs/applications/audio/spotify/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index b678380f12d..72514d7b67b 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -6,7 +6,9 @@ assert stdenv.system == "x86_64-linux";
 
 let
   # Please update the stable branch!
-  version = "1.0.48.103.g15edf1ec-94";
+  # Latest version number can be found at:
+  # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/
+  version = "1.0.49.125.g72ee7853-83";
 
   deps = [
     alsaLib
@@ -51,7 +53,7 @@ stdenv.mkDerivation {
   src =
     fetchurl {
       url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
-      sha256 = "0rpwxgxv2ihfhlri98k4n87ynlcp569gm9q6hd8jg0vd2jgji8b3";
+      sha256 = "1sqi79yj503y4b7pfvr6xi0i8g7hj01hkhn0vpkc3y3jz5c0ih9g";
     };
 
   buildInputs = [ dpkg makeWrapper ];

From 5b2a71fa250926010e6da0a6c6325dc1270770c1 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sat, 11 Feb 2017 23:06:17 +0100
Subject: [PATCH 794/899] droopy: init at 20160830 (#22499)

---
 .../networking/droopy/default.nix             | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/networking/droopy/default.nix

diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix
new file mode 100644
index 00000000000..8be5ee3c775
--- /dev/null
+++ b/pkgs/applications/networking/droopy/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, fetchFromGitHub, wrapPython }:
+
+with lib;
+
+stdenv.mkDerivation rec {
+  name = "droopy-${version}";
+  version = "20160830";
+
+  src = fetchFromGitHub {
+    owner = "stackp";
+    repo = "Droopy";
+    rev = "7a9c7bc46c4ff8b743755be86a9b29bd1a8ba1d9";
+    sha256 = "03i1arwyj9qpfyyvccl21lbpz3rnnp1hsadvc0b23nh1z2ng9sff";
+  };
+
+  nativeBuildInputs = [ wrapPython ];
+
+  installPhase = ''
+    install -vD droopy $out/bin/droopy
+    install -vD -m 644 man/droopy.1 $out/share/man/man1/droopy.1
+    wrapPythonPrograms
+  '';
+
+  meta = {
+    description = "Mini Web server that let others upload files to your computer";
+    homepage = http://stackp.online.fr/droopy;
+    license = licenses.bsd3;
+    maintainers = maintainers.profpatsch;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3de30ceee90..7beca5009f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12881,6 +12881,10 @@ with pkgs;
 
   doodle = callPackage ../applications/search/doodle { };
 
+  droopy = callPackage ../applications/networking/droopy {
+    inherit (python3Packages) wrapPython;
+  };
+
   drumgizmo = callPackage ../applications/audio/drumgizmo { };
 
   dunst = callPackage ../applications/misc/dunst { };

From 947c26972b8451e0f00839c9b0e9cfd321e152d4 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Sat, 11 Feb 2017 16:13:29 -0600
Subject: [PATCH 795/899] LLVM: Fix licensing metadata, closes #22679. (#22681)

* All projects are available under NCSA license,
  other than dragonegg.
* "Runtime" projects are dual-licensed under
  both NCSA and MIT:
  libc++, libc++abi, compiler-rt
* I don't mention MIT for compiler-rt as
  we only build it as part of LLVM.
---
 pkgs/development/compilers/llvm/3.4/clang.nix             | 2 +-
 pkgs/development/compilers/llvm/3.4/lld.nix               | 2 +-
 pkgs/development/compilers/llvm/3.4/lldb.nix              | 2 +-
 pkgs/development/compilers/llvm/3.4/llvm.nix              | 2 +-
 pkgs/development/compilers/llvm/3.4/polly.nix             | 2 +-
 pkgs/development/compilers/llvm/3.5/clang.nix             | 2 +-
 pkgs/development/compilers/llvm/3.5/libc++/default.nix    | 2 +-
 pkgs/development/compilers/llvm/3.5/libc++abi/default.nix | 2 +-
 pkgs/development/compilers/llvm/3.5/lld.nix               | 2 +-
 pkgs/development/compilers/llvm/3.5/lldb.nix              | 2 +-
 pkgs/development/compilers/llvm/3.5/llvm.nix              | 2 +-
 pkgs/development/compilers/llvm/3.5/polly.nix             | 2 +-
 pkgs/development/compilers/llvm/3.7/clang/default.nix     | 2 +-
 pkgs/development/compilers/llvm/3.7/libc++/default.nix    | 2 +-
 pkgs/development/compilers/llvm/3.7/libc++abi.nix         | 2 +-
 pkgs/development/compilers/llvm/3.7/lldb.nix              | 2 +-
 pkgs/development/compilers/llvm/3.7/llvm.nix              | 2 +-
 pkgs/development/compilers/llvm/3.8/clang/default.nix     | 2 +-
 pkgs/development/compilers/llvm/3.8/libc++/default.nix    | 2 +-
 pkgs/development/compilers/llvm/3.8/libc++abi.nix         | 2 +-
 pkgs/development/compilers/llvm/3.8/lldb.nix              | 2 +-
 pkgs/development/compilers/llvm/3.8/llvm.nix              | 2 +-
 pkgs/development/compilers/llvm/3.9/clang/default.nix     | 2 +-
 pkgs/development/compilers/llvm/3.9/libc++/default.nix    | 2 +-
 pkgs/development/compilers/llvm/3.9/libc++abi.nix         | 2 +-
 pkgs/development/compilers/llvm/3.9/lldb.nix              | 2 +-
 pkgs/development/compilers/llvm/3.9/llvm.nix              | 2 +-
 27 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix
index b05496eabf2..741ecc3856f 100644
--- a/pkgs/development/compilers/llvm/3.4/clang.nix
+++ b/pkgs/development/compilers/llvm/3.4/clang.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     platforms   = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.4/lld.nix b/pkgs/development/compilers/llvm/3.4/lld.nix
index c1841610f31..0398a5a543a 100644
--- a/pkgs/development/compilers/llvm/3.4/lld.nix
+++ b/pkgs/development/compilers/llvm/3.4/lld.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A set of modular code for creating linker tools";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     platforms   = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.4/lldb.nix b/pkgs/development/compilers/llvm/3.4/lldb.nix
index a50f9536542..c5ed82f53e5 100644
--- a/pkgs/development/compilers/llvm/3.4/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.4/lldb.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A next-generation high-performance debugger";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     platforms   = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix
index 54346baba0d..0a18f7e01cf 100644
--- a/pkgs/development/compilers/llvm/3.4/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.4/llvm.nix
@@ -67,7 +67,7 @@ in stdenv.mkDerivation rec {
   meta = {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
     platforms   = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/development/compilers/llvm/3.4/polly.nix b/pkgs/development/compilers/llvm/3.4/polly.nix
index 3d3483afafa..1ea806a1266 100644
--- a/pkgs/development/compilers/llvm/3.4/polly.nix
+++ b/pkgs/development/compilers/llvm/3.4/polly.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A polyhedral optimizer for llvm";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     platforms   = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix
index d11259c82f0..f15c989ef51 100644
--- a/pkgs/development/compilers/llvm/3.5/clang.nix
+++ b/pkgs/development/compilers/llvm/3.5/clang.nix
@@ -47,7 +47,7 @@ in stdenv.mkDerivation {
   meta = {
     description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     platforms   = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.5/libc++/default.nix b/pkgs/development/compilers/llvm/3.5/libc++/default.nix
index 476fc7bcd43..abc198b0686 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.5/libc++/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://libcxx.llvm.org/;
     description = "A new implementation of the C++ standard library, targeting C++11";
-    license = "BSD";
+    license = with stdenv.lib.licenses; [ ncsa mit ];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
index 963caf80970..268f2702a23 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
+++ b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
@@ -52,7 +52,7 @@ in stdenv.mkDerivation {
   meta = {
     homepage = http://libcxxabi.llvm.org/;
     description = "A new implementation of low level support for a standard C++ library";
-    license = "BSD";
+    license = with stdenv.lib.licenses; [ ncsa mit ];
     maintainers = with stdenv.lib.maintainers; [ vlstill ];
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/compilers/llvm/3.5/lld.nix b/pkgs/development/compilers/llvm/3.5/lld.nix
index 7ee90818ac9..4a398bd96a0 100644
--- a/pkgs/development/compilers/llvm/3.5/lld.nix
+++ b/pkgs/development/compilers/llvm/3.5/lld.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A set of modular code for creating linker tools";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     platforms   = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.5/lldb.nix b/pkgs/development/compilers/llvm/3.5/lldb.nix
index bbffa1a9a93..a5161333b28 100644
--- a/pkgs/development/compilers/llvm/3.5/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.5/lldb.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A next-generation high-performance debugger";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     platforms   = stdenv.lib.platforms.all;
     broken = true;
   };
diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix
index 4f54f1438a7..8bb5a6c684b 100644
--- a/pkgs/development/compilers/llvm/3.5/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.5/llvm.nix
@@ -72,7 +72,7 @@ in stdenv.mkDerivation rec {
   meta = {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
     platforms   = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/development/compilers/llvm/3.5/polly.nix b/pkgs/development/compilers/llvm/3.5/polly.nix
index 42b3fd74e6c..bacf4d30556 100644
--- a/pkgs/development/compilers/llvm/3.5/polly.nix
+++ b/pkgs/development/compilers/llvm/3.5/polly.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A polyhedral optimizer for llvm";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     platforms   = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.7/clang/default.nix b/pkgs/development/compilers/llvm/3.7/clang/default.nix
index 6c1a89cf60a..535dbbc93d5 100644
--- a/pkgs/development/compilers/llvm/3.7/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.7/clang/default.nix
@@ -49,7 +49,7 @@ let
     meta = {
       description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
       homepage    = http://llvm.org/;
-      license     = stdenv.lib.licenses.bsd3;
+      license     = stdenv.lib.licenses.ncsa;
       platforms   = stdenv.lib.platforms.all;
     };
   };
diff --git a/pkgs/development/compilers/llvm/3.7/libc++/default.nix b/pkgs/development/compilers/llvm/3.7/libc++/default.nix
index 1196645b923..69ce87bcbf3 100644
--- a/pkgs/development/compilers/llvm/3.7/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.7/libc++/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://libcxx.llvm.org/;
     description = "A new implementation of the C++ standard library, targeting C++11";
-    license = "BSD";
+    license = with stdenv.lib.licenses; [ ncsa mit ];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.7/libc++abi.nix b/pkgs/development/compilers/llvm/3.7/libc++abi.nix
index ec0be51a11c..6a62a6256b4 100644
--- a/pkgs/development/compilers/llvm/3.7/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/3.7/libc++abi.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://libcxxabi.llvm.org/;
     description = "A new implementation of low level support for a standard C++ library";
-    license = "BSD";
+    license = with stdenv.lib.licenses; [ ncsa mit ];
     maintainers = with stdenv.lib.maintainers; [ vlstill ];
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/compilers/llvm/3.7/lldb.nix b/pkgs/development/compilers/llvm/3.7/lldb.nix
index 36f9cb1f139..294410f9986 100644
--- a/pkgs/development/compilers/llvm/3.7/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.7/lldb.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A next-generation high-performance debugger";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     platforms   = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix
index c674b959c78..d4e7c73ad0d 100644
--- a/pkgs/development/compilers/llvm/3.7/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.7/llvm.nix
@@ -83,7 +83,7 @@ in stdenv.mkDerivation rec {
   meta = {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
     platforms   = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix
index 6052246dad0..41e515249eb 100644
--- a/pkgs/development/compilers/llvm/3.8/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix
@@ -60,7 +60,7 @@ let
     meta = {
       description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
       homepage    = http://llvm.org/;
-      license     = stdenv.lib.licenses.bsd3;
+      license     = stdenv.lib.licenses.ncsa;
       platforms   = stdenv.lib.platforms.all;
     };
   };
diff --git a/pkgs/development/compilers/llvm/3.8/libc++/default.nix b/pkgs/development/compilers/llvm/3.8/libc++/default.nix
index 15f7ee1e3e4..e4198599904 100644
--- a/pkgs/development/compilers/llvm/3.8/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/libc++/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://libcxx.llvm.org/;
     description = "A new implementation of the C++ standard library, targeting C++11";
-    license = "BSD";
+    license = with stdenv.lib.licenses; [ ncsa mit ];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.8/libc++abi.nix b/pkgs/development/compilers/llvm/3.8/libc++abi.nix
index 61ff6341c30..6b98a5726cf 100644
--- a/pkgs/development/compilers/llvm/3.8/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/3.8/libc++abi.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://libcxxabi.llvm.org/;
     description = "A new implementation of low level support for a standard C++ library";
-    license = "BSD";
+    license = with stdenv.lib.licenses; [ ncsa mit ];
     maintainers = with stdenv.lib.maintainers; [ vlstill ];
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/compilers/llvm/3.8/lldb.nix b/pkgs/development/compilers/llvm/3.8/lldb.nix
index fe0dcfc8306..d27786464c0 100644
--- a/pkgs/development/compilers/llvm/3.8/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.8/lldb.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A next-generation high-performance debugger";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     platforms   = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix
index fa647e62ff1..9394179a8f9 100644
--- a/pkgs/development/compilers/llvm/3.8/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.8/llvm.nix
@@ -85,7 +85,7 @@ in stdenv.mkDerivation rec {
   meta = {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
     platforms   = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix
index e6c804c96b1..677c4a526ea 100644
--- a/pkgs/development/compilers/llvm/3.9/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix
@@ -49,7 +49,7 @@ let
     meta = {
       description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
       homepage    = http://llvm.org/;
-      license     = stdenv.lib.licenses.bsd3;
+      license     = stdenv.lib.licenses.ncsa;
       platforms   = stdenv.lib.platforms.all;
     };
   };
diff --git a/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/pkgs/development/compilers/llvm/3.9/libc++/default.nix
index 7a53ffa0d8f..f656f553f16 100644
--- a/pkgs/development/compilers/llvm/3.9/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/libc++/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://libcxx.llvm.org/;
     description = "A new implementation of the C++ standard library, targeting C++11";
-    license = "BSD";
+    license = with stdenv.lib.licenses; [ ncsa mit ];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.9/libc++abi.nix b/pkgs/development/compilers/llvm/3.9/libc++abi.nix
index aff4205d6a9..1ad2cb10295 100644
--- a/pkgs/development/compilers/llvm/3.9/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/3.9/libc++abi.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://libcxxabi.llvm.org/;
     description = "A new implementation of low level support for a standard C++ library";
-    license = "BSD";
+    license = with stdenv.lib.licenses; [ ncsa mit ];
     maintainers = with stdenv.lib.maintainers; [ vlstill ];
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/compilers/llvm/3.9/lldb.nix b/pkgs/development/compilers/llvm/3.9/lldb.nix
index 5d8878b3b06..52f27de8cdb 100644
--- a/pkgs/development/compilers/llvm/3.9/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.9/lldb.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A next-generation high-performance debugger";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     platforms   = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix
index b64cf4fed5b..e1edbf5d0e7 100644
--- a/pkgs/development/compilers/llvm/3.9/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.9/llvm.nix
@@ -109,7 +109,7 @@ in stdenv.mkDerivation rec {
   meta = {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
     platforms   = stdenv.lib.platforms.all;
   };

From c3e3b6a19ab8a2082197d8076da75de95568e3a1 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sat, 11 Feb 2017 14:29:37 -0800
Subject: [PATCH 796/899] nvidia-x11: fix parallel building variable name

---
 pkgs/os-specific/linux/nvidia-x11/builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 523396faf3d..7dee6b4776c 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -21,7 +21,7 @@ buildPhase() {
         sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source)
         sysOut=$(echo $kernel/lib/modules/$kernelVersion/build)
         unset src # used by the nv makefile
-        make SYSSRC=$sysSrc SYSOUT=$sysOut module
+        make SYSSRC=$sysSrc SYSOUT=$sysOut module -j$NIX_BUILD_CORES
 
         cd ..
     fi

From 35d06e947f761b3e92e063e9323a4cff4892045f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 11 Feb 2017 23:35:59 +0100
Subject: [PATCH 797/899] python-packages: bump osc to fix bug with NixOS's
 default $PAGER setting

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2ddaa2a4fc1..40201bc6047 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16685,8 +16685,8 @@ in {
     src = pkgs.fetchFromGitHub {
       owner = "openSUSE";
       repo = "osc";
-      rev = "9e6d1a592e89e8ee9fd40a96cfcf97bf74f68715";
-      sha256 = "13svha5zh1xn3jv4kn9h3d620p65qh5nnhhghjbscp9lzlwwba3g";
+      rev = "64cbb10095cf9ef0270d65fff58085a13bc0abe9";
+      sha256 = "0s5kz5ln96ka0f1sa9nyp34c28mkxkrgcxbvysdawlppg7ay9s1z";
     };
     propagatedBuildInputs = with self; [ urlgrabber m2crypto pyyaml ];
     postInstall = "ln -s $out/bin/osc-wrapper.py $out/bin/osc";

From 0045f932bba018345cbb2f03bb5d4d17d01850b1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 11 Feb 2017 20:58:53 +0000
Subject: [PATCH 798/899] proj: 4.9.2 -> 4.9.3

---
 pkgs/development/libraries/proj/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix
index bc9178f6367..8fceacd870a 100644
--- a/pkgs/development/libraries/proj/default.nix
+++ b/pkgs/development/libraries/proj/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "proj-4.9.2";
+  name = "proj-4.9.3";
 
   src = fetchurl {
-    url = http://download.osgeo.org/proj/proj-4.9.2.tar.gz;
-    sha256 = "15kpcmz3qjxfrs6vq48mgyvb4vxscmwgkzrdcn71a60wxp8rmgv0";
+    url = http://download.osgeo.org/proj/proj-4.9.3.tar.gz;
+    sha256 = "1xw5f427xk9p2nbsj04j6m5zyjlyd66sbvl2bkg8hd1kx8pm9139";
   };
 
   doCheck = true;

From c19b17d14ff25a86bc4b563999bfa3569344d16a Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 17 Jan 2017 11:19:39 +0000
Subject: [PATCH 799/899] raspberryPi boot loader: fix booting Raspberry Pi 3

The Raspberry Pi 3 seems to need the .DTB file when booting the kernel,
so we must copy it to /boot when installing a new kernel.
---
 .../system/boot/loader/raspberrypi/builder.sh        | 12 +++++++++---
 .../system/boot/loader/raspberrypi/raspberrypi.nix   |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/system/boot/loader/raspberrypi/builder.sh b/nixos/modules/system/boot/loader/raspberrypi/builder.sh
index ccb88ca1c52..1a02bf23170 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/builder.sh
+++ b/nixos/modules/system/boot/loader/raspberrypi/builder.sh
@@ -61,12 +61,13 @@ addEntry() {
 
     local kernel=$(readlink -f $path/kernel)
     local initrd=$(readlink -f $path/initrd)
+    local dtb_path=$(readlink -f $path/kernel-modules/dtbs)
 
     if test -n "@copyKernels@"; then
         copyToKernelsDir $kernel; kernel=$result
         copyToKernelsDir $initrd; initrd=$result
     fi
-    
+
     echo $(readlink -f $path) > $outdir/$generation-system
     echo $(readlink -f $path/init) > $outdir/$generation-init
     cp $path/kernel-params $outdir/$generation-cmdline.txt
@@ -80,6 +81,11 @@ addEntry() {
         copyForced $kernel /boot/kernel7.img
       fi
       copyForced $initrd /boot/initrd
+      for dtb in $dtb_path/bcm*.dtb; do
+        dst="/boot/$(basename $dtb)"
+        copyForced $dtb "$dst"
+        filesCopied[$dst]=1
+      done
       cp "$(readlink -f "$path/init")" /boot/nixos-init
       echo "`cat $path/kernel-params` init=$path/init" >/boot/cmdline.txt
 
@@ -108,8 +114,8 @@ copyForced $fwdir/start_cd.elf  /boot/start_cd.elf
 copyForced $fwdir/start_db.elf  /boot/start_db.elf
 copyForced $fwdir/start_x.elf   /boot/start_x.elf
 
-# Remove obsolete files from /boot/old.
-for fn in /boot/old/*linux* /boot/old/*initrd*; do
+# Remove obsolete files from /boot and /boot/old.
+for fn in /boot/old/*linux* /boot/old/*initrd* /boot/bcm*.dtb; do
     if ! test "${filesCopied[$fn]}" = 1; then
         rm -vf -- "$fn"
     fi
diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
index eb8ea613097..f246d04284c 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
+++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
@@ -33,7 +33,7 @@ in
 
     boot.loader.raspberryPi.version = mkOption {
       default = 2;
-      type = types.enum [ 1 2 ];
+      type = types.enum [ 1 2 3 ];
       description = ''
       '';
     };

From 123cbd40c244c84a1caebce9082aa3704be7f57c Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 19 Jan 2017 14:10:03 +0100
Subject: [PATCH 800/899] raspberryPi boot loader: don't remove xx-initrd files

The Raspberry Pi boot loader was deleting all xx-initrd text files
(which simply contain the path to the actual initrd files) just after
having created them. The code was actually trying to delete real,
obsolete initrd files, which are named <hash>-initrd-initrd (after path
cleaning), but the glob was catching the other files as well.
---
 nixos/modules/system/boot/loader/raspberrypi/builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/raspberrypi/builder.sh b/nixos/modules/system/boot/loader/raspberrypi/builder.sh
index 1a02bf23170..f627d093eaf 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/builder.sh
+++ b/nixos/modules/system/boot/loader/raspberrypi/builder.sh
@@ -115,7 +115,7 @@ copyForced $fwdir/start_db.elf  /boot/start_db.elf
 copyForced $fwdir/start_x.elf   /boot/start_x.elf
 
 # Remove obsolete files from /boot and /boot/old.
-for fn in /boot/old/*linux* /boot/old/*initrd* /boot/bcm*.dtb; do
+for fn in /boot/old/*linux* /boot/old/*initrd-initrd* /boot/bcm*.dtb; do
     if ! test "${filesCopied[$fn]}" = 1; then
         rm -vf -- "$fn"
     fi

From 5e599035f457f2eb8c5fb7fb8e6ceda9b80a3a5d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 12 Feb 2017 02:31:21 +0100
Subject: [PATCH 801/899] libidn2: fix darwin build

cc #22595
---
 .../development/libraries/libidn2/default.nix |  8 +++--
 .../libraries/libidn2/fix-error-darwin.patch  | 31 +++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/libidn2/fix-error-darwin.patch

diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix
index 083b04d4b09..ea26f480cd1 100644
--- a/pkgs/development/libraries/libidn2/default.nix
+++ b/pkgs/development/libraries/libidn2/default.nix
@@ -1,4 +1,6 @@
-{ fetchurl, stdenv, libiconv, libunistring }:
+{ fetchurl, stdenv, libiconv, libunistring, help2man }:
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "libidn2-0.16";
@@ -10,8 +12,10 @@ stdenv.mkDerivation rec {
 
   outputs = [ "bin" "dev" "out" "info" "devdoc" ];
 
+  patches = optional stdenv.isDarwin ./fix-error-darwin.patch;
+
   buildInputs = [ libunistring ]
-    ++ stdenv.lib.optional stdenv.isDarwin libiconv;
+    ++ optionals stdenv.isDarwin [ libiconv help2man ];
 
   meta = {
     homepage = "https://www.gnu.org/software/libidn/#libidn2";
diff --git a/pkgs/development/libraries/libidn2/fix-error-darwin.patch b/pkgs/development/libraries/libidn2/fix-error-darwin.patch
new file mode 100644
index 00000000000..db3edd6e4a0
--- /dev/null
+++ b/pkgs/development/libraries/libidn2/fix-error-darwin.patch
@@ -0,0 +1,31 @@
+diff --git a/src/idn2.c b/src/idn2.c
+index 6abbc72..804f0f2 100644
+--- a/src/idn2.c
++++ b/src/idn2.c
+@@ -31,7 +31,6 @@
+ #include <unistr.h>
+ 
+ /* Gnulib headers. */
+-#include "error.h"
+ #include "gettext.h"
+ #define _(String) dgettext (PACKAGE, String)
+ #include "progname.h"
+@@ -161,9 +160,7 @@ process_input (char *readbuf, int flags)
+       free (output);
+     }
+   else
+-    error (EXIT_FAILURE, 0, "%s: %s",
+-	   args_info.register_given ? "register" : "lookup",
+-	   idn2_strerror (rc));
++    perror (idn2_strerror (rc));
+ }
+ 
+ int
+@@ -222,7 +219,7 @@ main (int argc, char *argv[])
+     }
+ 
+   if (ferror (stdin))
+-    error (EXIT_FAILURE, errno, "%s", _("input error"));
++    perror (_("input error"));
+ 
+   cmdline_parser_free (&args_info);

From e9a5ec099efe3769f0e4c7d8093c74255dcfbeff Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 12 Feb 2017 02:52:25 +0100
Subject: [PATCH 802/899] wget: 1.19 -> 1.19.1

Fixes build on darwin.

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

diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index 60edc1ad16f..f024c637c34 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -5,11 +5,11 @@
 , openssl ? null }:
 
 stdenv.mkDerivation rec {
-  name = "wget-1.19";
+  name = "wget-1.19.1";
 
   src = fetchurl {
     url = "mirror://gnu/wget/${name}.tar.xz";
-    sha256 = "1133c14g19ysv74j7am66jwgwrr0rdn0rdyxw7rikbnsyjxmf48g";
+    sha256 = "1ljcfhbkdsd0zjfm520rbl1ai62fc34i7c45sfj244l8f6b0p58c";
   };
 
   patches = [ ./remove-runtime-dep-on-openssl-headers.patch ];

From 6651c72df1c4c47d36e67fe59dcf3c50e75c5383 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 11 Feb 2017 21:01:56 -0500
Subject: [PATCH 803/899] proofgeneral_HEAD: Bump

---
 pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
index a6ccd4f631d..fabf8ac4ce4 100644
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
+++ b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation (rec {
 
   src = fetchgit {
     url = "https://github.com/ProofGeneral/PG.git";
-    rev = "64ca55b1593fff8cfffab89c51d7e92c1a68dc27";
-    sha256 = "1gz13fagxf0w2zgp7qd0w328qiv97295jwq7ra8vj61pdfi8xklj";
+    rev = "4bcac92df46da9e68b5e3d565bb118fb63b4feb4";
+    sha256 = "143anwll7mij6iskf3jbbbfzmkp2vnp0q329zpsl2l6v3wk2vv64";
   };
 
   buildInputs = [ emacs texinfo perl which ] ++ stdenv.lib.optional enableDoc texLive;

From 6b2ea7ec6ee968b9613ce06a3e8e182c1a281de9 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 8 Feb 2017 10:12:16 +0800
Subject: [PATCH 804/899] diskscan: init at 0.19

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

diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/tools/misc/diskscan/default.nix
new file mode 100644
index 00000000000..e1024d70bce
--- /dev/null
+++ b/pkgs/tools/misc/diskscan/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, cmake, ncurses, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "diskscan-${version}";
+  version = "0.19";
+
+  src = fetchFromGitHub {
+    owner  = "baruch";
+    repo   = "diskscan";
+    rev    = "${version}";
+    sha256 = "0yqpaxfahbjr8hr9xw7nngncwigy7yncdwnyp5wy9s9wdp8mrjra";
+  };
+
+  buildInputs = [ ncurses zlib ];
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/baruch/diskscan;
+    description = "Scan HDD/SSD for failed and near failed sectors";
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ peterhoeg ];
+    inherit version;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7beca5009f6..1d7d103c00a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -816,6 +816,8 @@ with pkgs;
 
   discount = callPackage ../tools/text/discount { };
 
+  diskscan = callPackage ../tools/misc/diskscan { };
+
   disorderfs = callPackage ../tools/filesystems/disorderfs {
     asciidoc = asciidoc-full;
   };

From f6dd263d4244b832a761c808597cf00b2688f4af Mon Sep 17 00:00:00 2001
From: Changlin Li <mail@changlinli.com>
Date: Sun, 12 Feb 2017 01:00:29 -0500
Subject: [PATCH 805/899] bfg-repo-cleaner: init at 1.12.15

---
 lib/maintainers.nix                           |  1 +
 .../bfg-repo-cleaner/default.nix              | 49 +++++++++++++++++++
 .../git-and-tools/default.nix                 |  2 +
 3 files changed, 52 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 8c778921fac..15167408786 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -87,6 +87,7 @@
   cfouche = "Chaddaï Fouché <chaddai.fouche@gmail.com>";
   chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
   chattered = "Phil Scott <me@philscotted.com>";
+  changlinli = "Changlin Li <mail@changlinli.com>";
   choochootrain = "Hurshal Patel <hurshal@imap.cc>";
   chris-martin = "Chris Martin <ch.martin@gmail.com>";
   chrisjefferson = "Christopher Jefferson <chris@bubblescope.net>";
diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix
new file mode 100644
index 00000000000..b2324581244
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, jre, makeWrapper }:
+
+let
+  version = "1.12.15";
+  jarName = "bfg-${version}.jar";
+  mavenUrl = "http://central.maven.org/maven2/com/madgag/bfg/${version}/${jarName}";
+in
+  stdenv.mkDerivation {
+    inherit version jarName;
+
+    name = "bfg-repo-cleaner";
+
+    src = fetchurl {
+      url = mavenUrl;
+      sha256 = "17dh25jambkk55khknlhy8wa9s1i1xmh9hdgj72j1lzyl0ag42ik";
+    };
+
+    buildInputs = [ jre makeWrapper ];
+
+    phases = "installPhase";
+
+    installPhase = ''
+      mkdir -p $out/share/java
+      mkdir -p $out/bin
+      cp $src $out/share/java/$jarName
+      makeWrapper "${jre}/bin/java" $out/bin/bfg --add-flags "-cp $out/share/java/$jarName com.madgag.git.bfg.cli.Main"
+    '';
+
+    meta = with stdenv.lib; {
+      homepage = "https://rtyley.github.io/bfg-repo-cleaner/";
+      # Descriptions taken with minor modification from the homepage of bfg-repo-cleaner
+      description = "Removes large or troublesome blobs in a git repository like git-filter-branch does, but faster";
+      longDescription = ''
+        The BFG is a simpler, faster alternative to git-filter-branch for
+        cleansing bad data out of your Git repository history, in particular removing
+        crazy big files and removing passwords, credentials, and other private data.
+
+        The git-filter-branch command is enormously powerful and can do things
+        that the BFG can't - but the BFG is much better for the tasks above, because
+        it's faster (10-720x), simpler (dedicated to just removing things), and
+        beautiful (can use Scala instead of bash to script customizations).
+      '';
+      license = licenses.gpl3;
+      maintainers = [ maintainers.changlinli ];
+      platforms = platforms.unix;
+      downloadPage = "https://mvnrepository.com/artifact/com.madgag/bfg/${version}";
+    };
+
+  }
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 975c83c6e97..d68b1e41c8d 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -22,6 +22,8 @@ in
 rec {
   # Try to keep this generally alphabetized
 
+  bfg-repo-cleaner = callPackage ./bfg-repo-cleaner { };
+
   bitbucket-server-cli = callPackage ./bitbucket-server-cli { };
 
   darcsToGit = callPackage ./darcs-to-git { };

From c07f1589bf91f35e9e72536e660c0d1ba39285e6 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Sun, 12 Feb 2017 09:10:35 +0000
Subject: [PATCH 806/899] Make azure-mgmt-resource work with requests 2.11.x.
 We should update the azure python packages, however, that is a much bigger
 effort. This is needed to make sure nixops keeps working with Azure.

(cherry picked from commit 81f2bde0a2af99d84666628fae89af648ce2fa3e)
---
 pkgs/top-level/python-packages.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 40201bc6047..d49fcc8613c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1762,6 +1762,11 @@ in {
       url = mirror://pypi/a/azure-mgmt-resource/azure-mgmt-resource-0.20.1.zip;
       sha256 = "0slh9qfm5nfacrdm3lid0sr8kwqzgxvrwf27laf9v38kylkfqvml";
     };
+    preConfigure = ''
+      # Patch to make this package work on requests >= 2.11.x
+      # CAN BE REMOVED ON NEXT PACKAGE UPDATE
+      sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/resource/resourcemanagement.py
+    '';
     postInstall = ''
       echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
       echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py

From 9ed445a0f780c00043adc3e6457f9db518cd1814 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Sat, 11 Feb 2017 16:48:58 +0200
Subject: [PATCH 807/899] wineUnstable: 2.0 -> 2.1

---
 pkgs/misc/emulators/wine/sources.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index e86c6bef05a..e8409a631c3 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -31,23 +31,23 @@ in rec {
   };
 
   unstable = fetchurl rec {
-    version = "2.0";
-    url = "https://dl.winehq.org/wine/source/2.0/wine-${version}.tar.bz2";
-    sha256 = "1ik6q0h3ph3jizmp7bxhf6kcm1pzrdrn2m0yf2x86slv2aigamlp";
+    version = "2.1";
+    url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
+    sha256 = "0vhykmypv8zqdma7nfwv40klwaywcslam6cmipr3vjci6vvapfdz";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "02jrdm49zlc0f357m0z65pilmg4lxh16va32ll3p4y8vr13nwawk";
+    sha256 = "1r3mpdyhq3nmbqgj99bgrhx202k5c046bl8fhi5hr1x0adybb9hs";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";
   };
 
   winetricks = fetchFromGitHub rec {
-    version = "20170101";
-    sha256 = "0c2aam68x3nlvc6f4r6rnfw6y3a86644zb0qirwkmh3p04mpdl39";
+    version = "20170207";
+    sha256 = "1zmx041rxxawkv3ifsdjbmshp654bib75n5hll0g1f205arbahzw";
     owner = "Winetricks";
     repo = "winetricks";
     rev = version;

From a74d1594f1db7ae22179dec4ab32fe2c324524e8 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Sun, 12 Feb 2017 09:23:52 +0000
Subject: [PATCH 808/899] Make azure-mgmt-... work with requests 2.11.x. We
 should update the azure python packages, however, that is a much bigger
 effort. This is needed to make sure nixops keeps working with Azure.

(cherry picked from commit 4eb92c5c64906a5142e7cb34bdcfc7e16ab77dd1)
---
 pkgs/top-level/python-packages.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d49fcc8613c..985ab3ae6be 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1706,6 +1706,11 @@ in {
       url = mirror://pypi/a/azure-mgmt-compute/azure-mgmt-compute-0.20.0.zip;
       sha256 = "12hr5vxdg2sk2fzr608a37f4i8nbchca7dgdmly2w5fc7x88jx2v";
     };
+    preConfigure = ''
+      # Patch to make this package work on requests >= 2.11.x
+      # CAN BE REMOVED ON NEXT PACKAGE UPDATE
+      sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/compute/computemanagement.py
+    '';
     postInstall = ''
       echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
       echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
@@ -1726,6 +1731,11 @@ in {
       url = mirror://pypi/a/azure-mgmt-network/azure-mgmt-network-0.20.1.zip;
       sha256 = "10vj22h6nxpw0qpvib5x2g6qs5j8z31142icvh4qk8k40fcrs9hx";
     };
+    preConfigure = ''
+      # Patch to make this package work on requests >= 2.11.x
+      # CAN BE REMOVED ON NEXT PACKAGE UPDATE
+      sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/network/networkresourceprovider.py
+    '';
     postInstall = ''
       echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
       echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
@@ -1787,6 +1797,11 @@ in {
       url = mirror://pypi/a/azure-mgmt-storage/azure-mgmt-storage-0.20.0.zip;
       sha256 = "16iw7hqhq97vlzfwixarfnirc60l5mz951p57brpcwyylphl3yim";
     };
+    preConfigure = ''
+      # Patch to make this package work on requests >= 2.11.x
+      # CAN BE REMOVED ON NEXT PACKAGE UPDATE
+      sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/storage/storagemanagement.py
+    '';
     postInstall = ''
       echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
       echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py

From bee23d7dfc944de82a1b6945294567ed98f964d2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 12 Feb 2017 10:27:36 +0100
Subject: [PATCH 809/899] pythonPackages.argparse: only for Python < 2.7

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 985ab3ae6be..0b4e5cb462c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1321,7 +1321,7 @@ in {
 
   };
 
-  argparse = buildPythonPackage (rec {
+  argparse = if (pythonAtLeast "2.7") then null else buildPythonPackage (rec {
     name = "argparse-1.4.0";
 
     src = pkgs.fetchurl {

From af9857ef47b6afa68b8631f3b5e7299e60a8764f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 12 Feb 2017 09:59:23 +0000
Subject: [PATCH 810/899] proj: disable tests on 32 bit

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

diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix
index 8fceacd870a..b92aa49a092 100644
--- a/pkgs/development/libraries/proj/default.nix
+++ b/pkgs/development/libraries/proj/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "1xw5f427xk9p2nbsj04j6m5zyjlyd66sbvl2bkg8hd1kx8pm9139";
   };
 
-  doCheck = true;
+  doCheck = stdenv.is64bit;
 
   meta = with stdenv.lib; {
     description = "Cartographic Projections Library";

From 543721d766af9980f4a47225128936a3cdf5ebe5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 12 Feb 2017 11:27:13 +0100
Subject: [PATCH 811/899] Revert "pythonPackages.argparse: only for Python <
 2.7"

Mass-rebuild, goes into staging.

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0b4e5cb462c..985ab3ae6be 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1321,7 +1321,7 @@ in {
 
   };
 
-  argparse = if (pythonAtLeast "2.7") then null else buildPythonPackage (rec {
+  argparse = buildPythonPackage (rec {
     name = "argparse-1.4.0";
 
     src = pkgs.fetchurl {

From 5b1a1b0e50995d5d8ff11b7986bbc85aa800b4ce Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 12 Feb 2017 11:32:02 +0100
Subject: [PATCH 812/899] pythonPackages.afew: 2016-02-29 -> 2017-02-08

Failed to build because sha256 of the source tarball changed.
---
 pkgs/top-level/python-packages.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 985ab3ae6be..85898169729 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -551,13 +551,13 @@ in {
   };
 
   afew = buildPythonPackage rec {
-    rev = "b19a88fa1c06cc03ed6c636475cf4361b616d128";
-    name = "afew-git-2016-02-29";
+    name = "afew-git-2017-02-08";
 
-    src = pkgs.fetchurl {
-      url = "https://github.com/teythoon/afew/tarball/${rev}";
-      name = "${name}.tar.bz";
-      sha256 = "0idlyrk29bmjw3w74vn0c1a6s59phx9zhzghf2cpyqf9qdhxib8k";
+    src = pkgs.fetchFromGitHub {
+      owner = "afewmail";
+      repo = "afew";
+      rev = "889a3b966835c4d16aa1f24bb89f12945b9b2a67";
+      sha256 = "01gwrx1m3ka13ps3vj04a3y8llli2j2vkd3gcggcvxdphhpysckm";
     };
 
     buildInputs = with self; [ pkgs.dbacl ];

From 9960f7e9f8e94756c3321951cac1034d9a14421e Mon Sep 17 00:00:00 2001
From: Tobias Pflug <tobias.pflug@gmail.com>
Date: Sun, 12 Feb 2017 11:41:47 +0100
Subject: [PATCH 813/899] flow: 0.37.4 -> 0.39.0

---
 pkgs/development/tools/analysis/flow/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 4e15ed8572e..a63e9f65e5c 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices }:
+{ stdenv, fetchFromGitHub, lib, ocaml_4_02, libelf, cf-private, CoreServices }:
 
 with lib;
 
 stdenv.mkDerivation rec {
-  version = "0.37.4";
+  version = "0.39.0";
   name = "flow-${version}";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     rev = "v${version}";
-    sha256 = "0v3hi2wn4ysybmd768wdmijlbnq41i6yzzzj5d7cmd4blzd9c0nq";
+    sha256 = "05a0kvhlakm7c7n19npg77rj52cz6282290126sfn0qq2059zhli";
   };
 
   installPhase = ''
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     cp bin/flow $out/bin/
   '';
 
-  buildInputs = [ ocaml libelf ]
+  buildInputs = [ ocaml_4_02 libelf ]
     ++ optionals stdenv.isDarwin [ cf-private CoreServices ];
 
   meta = with stdenv.lib; {

From a7ca11454533b0b2f2d9fb4c481e9db5f3313486 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Fri, 10 Feb 2017 12:03:14 +0100
Subject: [PATCH 814/899] libretro: add mGBA core

Closes #22618.
---
 pkgs/misc/emulators/retroarch/cores.nix | 10 ++++++++++
 pkgs/top-level/all-packages.nix         |  1 +
 2 files changed, 11 insertions(+)

diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 8247f95f9da..50f73d6f4e6 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -182,6 +182,16 @@ in
     buildPhase = "make";
   };
 
+  mgba = mkLibRetroCore rec {
+    core = "mgba";
+    src = fetchRetro {
+      repo = core;
+      rev = "4000128339b535896615c994cafcd777637573f4";
+      sha256 = "1yar78rvgfqx7jdna9chkmmbnpcf7k9ckbzj506f7k7m7zv819fn";
+    };
+    description = "Port of mGBA to libretro";
+  };
+
   mupen64plus = (mkLibRetroCore rec {
     core = "mupen64plus";
     src = fetchRetro {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1d7d103c00a..2a482388290 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15615,6 +15615,7 @@ with pkgs;
       ++ optional (cfg.enableMednafenPCEFast or false) mednafen-pce-fast
       ++ optional (cfg.enableMednafenPSX or false) mednafen-psx
       ++ optional (cfg.enableMednafenSaturn or false) mednafen-saturn
+      ++ optional (cfg.enableMGBA or false) mgba
       ++ optional (cfg.enableMupen64Plus or false) mupen64plus
       ++ optional (cfg.enableNestopia or false) nestopia
       ++ optional (cfg.enablePicodrive or false) picodrive

From ffefd8389775f8d256ca6dddcfd4573d12a8ee71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 12 Feb 2017 12:50:04 +0100
Subject: [PATCH 815/899] xorg xf86-video-*: bump drivers that seem unused

I verified they build, at least with xorg-server-1.19.1.
---
 pkgs/servers/x11/xorg/default.nix       | 72 ++++++++++++-------------
 pkgs/servers/x11/xorg/overrides.nix     |  8 ---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 24 ++++-----
 3 files changed, 48 insertions(+), 56 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index b825d86ac8d..285c4504280 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1714,11 +1714,11 @@ let
   }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
   xf86videochips = (mkDerivation "xf86videochips" {
-    name = "xf86-video-chips-1.2.6";
+    name = "xf86-video-chips-1.2.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2;
-      sha256 = "073bcdsvvsg19mb963sa5v7x2zs19y0q6javmgpiwfaqkz7zbblr";
+      url = mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2;
+      sha256 = "0n4zypmbkjzkw36cjy2braaivhvj60np6w80lcs9mfpabs66ia3f";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
@@ -1736,11 +1736,11 @@ let
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videodummy = (mkDerivation "xf86videodummy" {
-    name = "xf86-video-dummy-0.3.7";
+    name = "xf86-video-dummy-0.3.8";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2;
-      sha256 = "1046p64xap69vlsmsz5rjv0djc970yhvq44fmllmas0mqp5lzy2n";
+      url = mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2;
+      sha256 = "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
@@ -1780,11 +1780,11 @@ let
   }) // {inherit xextproto xorgserver xproto ;};
 
   xf86videoglint = (mkDerivation "xf86videoglint" {
-    name = "xf86-video-glint-1.2.8";
+    name = "xf86-video-glint-1.2.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2;
-      sha256 = "08a2aark2yn9irws9c78d9q44dichr03i9zbk61jgr54ncxqhzv5";
+      url = mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2;
+      sha256 = "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45";
     };
     buildInputs = [pkgconfig libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
@@ -1802,11 +1802,11 @@ let
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videoi740 = (mkDerivation "xf86videoi740" {
-    name = "xf86-video-i740-1.3.5";
+    name = "xf86-video-i740-1.3.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-i740-1.3.5.tar.bz2;
-      sha256 = "0973zzmdsvlmplcax1c91is7v78lcwy6d9mwp11npgqzl782vq0w";
+      url = mirror://xorg/individual/driver/xf86-video-i740-1.3.6.tar.bz2;
+      sha256 = "0c8nl0yyyw08n4zd6sgw9p3a858wpgf6raczjd70gf47lncms389";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
@@ -1836,11 +1836,11 @@ let
   }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
   xf86videomga = (mkDerivation "xf86videomga" {
-    name = "xf86-video-mga-1.6.4";
+    name = "xf86-video-mga-1.6.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-mga-1.6.4.tar.bz2;
-      sha256 = "0kyl8w99arviv27pc349zsy2vinnm7mdpy34vr9nzisicw5nkij8";
+      url = mirror://xorg/individual/driver/xf86-video-mga-1.6.5.tar.bz2;
+      sha256 = "08ll52hlar9z446v0wwca5qkj3hxhswwm7vvcgic9xv4cf7csqxn";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
@@ -1880,11 +1880,11 @@ let
   }) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videonv = (mkDerivation "xf86videonv" {
-    name = "xf86-video-nv-2.1.20";
+    name = "xf86-video-nv-2.1.21";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2;
-      sha256 = "1gqh1khc4zalip5hh2nksgs7i3piqq18nncgmsx9qvzi05azd5c3";
+      url = mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2;
+      sha256 = "0bdk3pc5y0n7p53q4gc2ff7bw16hy5hwdjjxkm5j3s7hdyg6960z";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
@@ -1913,11 +1913,11 @@ let
   }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;};
 
   xf86videor128 = (mkDerivation "xf86videor128" {
-    name = "xf86-video-r128-6.10.0";
+    name = "xf86-video-r128-6.10.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-r128-6.10.0.tar.bz2;
-      sha256 = "0g9m1n5184h05mq14vb6k288zm6g81a9m048id00l8v8f6h33mc0";
+      url = mirror://xorg/individual/driver/xf86-video-r128-6.10.2.tar.bz2;
+      sha256 = "1pkpka5m4cd6iy0f8iqnmg6xci14nb6887ilvxzn3xrsgx8j3nl4";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
@@ -1946,33 +1946,33 @@ let
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videosavage = (mkDerivation "xf86videosavage" {
-    name = "xf86-video-savage-2.3.8";
+    name = "xf86-video-savage-2.3.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-savage-2.3.8.tar.bz2;
-      sha256 = "0qzshncynjdmyhavhqw4x5ha3gwbygi0zbsy158fpg1jcnla9kpx";
+      url = mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2;
+      sha256 = "11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
   xf86videosiliconmotion = (mkDerivation "xf86videosiliconmotion" {
-    name = "xf86-video-siliconmotion-1.7.8";
+    name = "xf86-video-siliconmotion-1.7.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.8.tar.bz2;
-      sha256 = "1sqv0y31mi4zmh9yaxqpzg7p8y2z01j6qys433hb8n4yznllkm79";
+      url = mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2;
+      sha256 = "1g2r6gxqrmjdff95d42msxdw6vmkg2zn5sqv0rxd420iwy8wdwyh";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess videoproto xextproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;};
 
   xf86videosis = (mkDerivation "xf86videosis" {
-    name = "xf86-video-sis-0.10.8";
+    name = "xf86-video-sis-0.10.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-sis-0.10.8.tar.bz2;
-      sha256 = "1znkqwdyd6am23xbsfjzamq125j5rrylg5mzqky4scv9gxbz5wy8";
+      url = mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2;
+      sha256 = "03f1abjjf68y8y1iz768rn95va9d33wmbwfbsqrgl6k0gi0bf9jj";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
@@ -2001,11 +2001,11 @@ let
   }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;};
 
   xf86videotdfx = (mkDerivation "xf86videotdfx" {
-    name = "xf86-video-tdfx-1.4.6";
+    name = "xf86-video-tdfx-1.4.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-tdfx-1.4.6.tar.bz2;
-      sha256 = "0dvdrhyn1iv6rr85v1c52s1gl0j1qrxgv7x0r7qn3ba0gj38i2is";
+      url = mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2;
+      sha256 = "0hia45z4jc472fxp00803nznizcn4h1ybp63jcsb4lmd9vhqxx2c";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
@@ -2023,11 +2023,11 @@ let
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
 
   xf86videotrident = (mkDerivation "xf86videotrident" {
-    name = "xf86-video-trident-1.3.7";
+    name = "xf86-video-trident-1.3.8";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-trident-1.3.7.tar.bz2;
-      sha256 = "1bhkwic2acq9za4yz4bwj338cwv5mdrgr2qmgkhlj3bscbg1imgc";
+      url = mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2;
+      sha256 = "0gxcar434kx813fxdpb93126lhmkl3ikabaljhcj5qn3fkcijlcy";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 3ae7b481978..d706a096321 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -338,7 +338,6 @@ in
   xf86videoark        = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
   xf86videogeode      = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
   xf86videoglide      = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
-  xf86videoglint      = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
   xf86videoi128       = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
   xf86videonewport    = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
   xf86videoopenchrome = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
@@ -355,13 +354,6 @@ in
     NIX_CFLAGS_COMPILE = "-I${xorg.xorgserver.dev or xorg.xorgserver}/include/xorg";
   };
 
-  xf86videonv = attrs: attrs // {
-    patches = [( args.fetchpatch {
-      url = http://cgit.freedesktop.org/xorg/driver/xf86-video-nv/patch/?id=fc78fe98222b0204b8a2872a529763d6fe5048da;
-      sha256 = "0i2ddgqwj6cfnk8f4r73kkq3cna7hfnz7k3xj3ifx5v8mfiva6gw";
-    })];
-  };
-
   xf86videovmware = attrs: attrs // {
     buildInputs =  attrs.buildInputs ++ [ args.mesa_drivers ]; # for libxatracker
   };
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index c0d2065a9ff..143411304db 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -132,34 +132,34 @@ mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.tar.bz2
-mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2
+mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2
-mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2
+mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2
 mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2
 mirror://xorg/individual/driver/xf86-video-geode-2.11.17.tar.bz2
 mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2
-mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2
+mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2
 mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2
-mirror://xorg/individual/driver/xf86-video-i740-1.3.5.tar.bz2
+mirror://xorg/individual/driver/xf86-video-i740-1.3.6.tar.bz2
 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2
 mirror://xorg/individual/driver/xf86-video-mach64-6.9.5.tar.bz2
-mirror://xorg/individual/driver/xf86-video-mga-1.6.4.tar.bz2
+mirror://xorg/individual/driver/xf86-video-mga-1.6.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-qxl-0.1.3.tar.bz2
 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2
-mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2
+mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2
 mirror://xorg/individual/driver/xf86-video-openchrome-0.3.3.tar.bz2
-mirror://xorg/individual/driver/xf86-video-r128-6.10.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-r128-6.10.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-rendition-4.2.6.tar.bz2
 mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2
-mirror://xorg/individual/driver/xf86-video-savage-2.3.8.tar.bz2
-mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.8.tar.bz2
-mirror://xorg/individual/driver/xf86-video-sis-0.10.8.tar.bz2
+mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2
+mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2
+mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2
 mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2
-mirror://xorg/individual/driver/xf86-video-tdfx-1.4.6.tar.bz2
+mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2
-mirror://xorg/individual/driver/xf86-video-trident-1.3.7.tar.bz2
+mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-vesa-2.3.4.tar.bz2
 mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2

From e970b8e8df6bffcbbea2a1bd58a6efb5ac35e286 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 12 Feb 2017 13:00:37 +0100
Subject: [PATCH 816/899] xorg xf86-input-evdev: 2.10.3 -> 2.10.5

---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 285c4504280..c1b97ccc147 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1571,11 +1571,11 @@ let
   }) // {inherit ;};
 
   xf86inputevdev = (mkDerivation "xf86inputevdev" {
-    name = "xf86-input-evdev-2.10.3";
+    name = "xf86-input-evdev-2.10.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.3.tar.bz2;
-      sha256 = "18ijnclnylrr7vkvflalkw4bqfily3scg6baczjjgycdpsj1p8js";
+      url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2;
+      sha256 = "03dphgwjaxxyys8axc1kyysp6xvy9bjxicsdrhi2jvdgbchadnly";
     };
     buildInputs = [pkgconfig inputproto udev xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 143411304db..c5d4fda1aa2 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -119,7 +119,7 @@ mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2
-mirror://xorg/individual/driver/xf86-input-evdev-2.10.3.tar.bz2
+mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2
 mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2

From 53600eae3d5fb884c884ae14fc8776691fbcb7f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 12 Feb 2017 13:01:24 +0100
Subject: [PATCH 817/899] xorg xf86-input-libinput: 0.19.1 -> 0.23.0

---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index c1b97ccc147..19f31fa3d0e 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1604,11 +1604,11 @@ let
   }) // {inherit inputproto xorgserver xproto ;};
 
   xf86inputlibinput = (mkDerivation "xf86inputlibinput" {
-    name = "xf86-input-libinput-0.19.1";
+    name = "xf86-input-libinput-0.23.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2;
-      sha256 = "0381rnahg8mbzcisify092jyjycxzswpqg7dnqldrwjadx0ckwf7";
+      url = mirror://xorg/individual/driver/xf86-input-libinput-0.23.0.tar.bz2;
+      sha256 = "1p596v3kbmjpdz3kz8z19bnd79l860f1pbwjvma7bz7qx3gynlqb";
     };
     buildInputs = [pkgconfig inputproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index c5d4fda1aa2..185a4485c6a 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -122,7 +122,7 @@ mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2
 mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2
 mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2
-mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2
+mirror://xorg/individual/driver/xf86-input-libinput-0.23.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2

From d4b8737e007e1d298364397e37106f0674413d2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 12 Feb 2017 13:07:55 +0100
Subject: [PATCH 818/899] xorg: add xf86-video-{sisusb,sunleo}

They might be useless, but they build :-)
---
 pkgs/servers/x11/xorg/default.nix       | 22 ++++++++++++++++++++++
 pkgs/servers/x11/xorg/tarballs-7.7.list |  2 ++
 2 files changed, 24 insertions(+)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 19f31fa3d0e..1fb5ac85d60 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1978,6 +1978,17 @@ let
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;};
 
+  xf86videosisusb = (mkDerivation "xf86videosisusb" {
+    name = "xf86-video-sisusb-0.9.7";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2;
+      sha256 = "090lfs3hjz3cjd016v5dybmcsigj6ffvjdhdsqv13k90p4b08h7l";
+    };
+    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
+  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ;};
+
   xf86videosuncg6 = (mkDerivation "xf86videosuncg6" {
     name = "xf86-video-suncg6-1.1.2";
     builder = ./builder.sh;
@@ -2000,6 +2011,17 @@ let
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;};
 
+  xf86videosunleo = (mkDerivation "xf86videosunleo" {
+    name = "xf86-video-sunleo-1.2.2";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2;
+      sha256 = "1gacm0s6rii4x5sx9py5bhvs50jd4vs3nnbwjdjymyf31kpdirl3";
+    };
+    buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
+  }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;};
+
   xf86videotdfx = (mkDerivation "xf86videotdfx" {
     name = "xf86-video-tdfx-1.4.7";
     builder = ./builder.sh;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 185a4485c6a..d5470039315 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -155,8 +155,10 @@ mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2
 mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2
 mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2
+mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2
+mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2

From c5c0f63320039a43aa1351bb11d006e66f0f4a37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 12 Feb 2017 13:10:51 +0100
Subject: [PATCH 819/899] xorg xf86-video-qxl: 0.1.3 -> 0.1.5

---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 1fb5ac85d60..01a45208309 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1902,11 +1902,11 @@ let
   }) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;};
 
   xf86videoqxl = (mkDerivation "xf86videoqxl" {
-    name = "xf86-video-qxl-0.1.3";
+    name = "xf86-video-qxl-0.1.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-qxl-0.1.3.tar.bz2;
-      sha256 = "1368dd5mihn3s098n7wa3fpjkp8pnamabfjjipkqs9zyrcvncy3m";
+      url = mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2;
+      sha256 = "14jc24znnahhmz4kqalafmllsg8awlz0y6gpgdpk5ih38ph851mi";
     };
     buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index d5470039315..8ca45b8b161 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -144,7 +144,7 @@ mirror://xorg/individual/driver/xf86-video-i740-1.3.6.tar.bz2
 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2
 mirror://xorg/individual/driver/xf86-video-mach64-6.9.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-mga-1.6.5.tar.bz2
-mirror://xorg/individual/driver/xf86-video-qxl-0.1.3.tar.bz2
+mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2
 mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2

From 3348905cdecff53190eb011e76ab2dba5855c107 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 12 Feb 2017 13:12:10 +0100
Subject: [PATCH 820/899] xorg-server: major bump 1.18.4 -> 1.19.1

I encountered no problems with it.  Nvidia binary drivers are tested,
and AMD ones now both set `abiCompat` to use older server versions.
---
 nixos/doc/manual/release-notes/rl-1703.xml |  6 ++++++
 pkgs/servers/x11/xorg/default.nix          | 10 +++++-----
 pkgs/servers/x11/xorg/overrides.nix        |  1 +
 pkgs/servers/x11/xorg/tarballs-7.7.list    |  2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index ae8aeb6e707..37173ccd744 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -15,6 +15,12 @@ has the following highlights: </para>
     xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">Nixpkgs
     manual</link> for more information.</para>
   </listitem>
+
+  <listitem>
+    <para>X.org server uses branch 1.19.  Due to ABI incompatibilities,
+      <literal>ati_unfree</literal> keeps forcing 1.17
+      and <literal>amdgpu-pro</literal> starts forcing 1.18.</para>
+  </listitem>
 </itemizedlist>
 
 <para>The following new services were added since the last release:</para>
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 01a45208309..d81879d5169 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2364,15 +2364,15 @@ let
   }) // {inherit ;};
 
   xorgserver = (mkDerivation "xorgserver" {
-    name = "xorg-server-1.18.4";
+    name = "xorg-server-1.19.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2;
-      sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117";
+      url = mirror://xorg/individual/xserver/xorg-server-1.19.1.tar.bz2;
+      sha256 = "1yx7cnlhl14hsdq5lg0740s4nxqxkmaav38x428llv1zkprjrbkr";
     };
-    buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
+    buildInputs = [pkgconfig dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
     meta.platforms = stdenv.lib.platforms.unix;
-  }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;};
+  }) // {inherit dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;};
 
   xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" {
     name = "xorg-sgml-doctools-1.11";
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index d706a096321..0afbb21ea22 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -428,6 +428,7 @@ in
         damageproto xcmiscproto  bigreqsproto
         inputproto xextproto randrproto renderproto presentproto
         dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto
+        libXfont2
       ];
       # fix_segfault: https://bugs.freedesktop.org/show_bug.cgi?id=91316
       commonPatches = [ ];
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 8ca45b8b161..8d37d9f46b5 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -185,7 +185,7 @@ mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2
 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2
 mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2
 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.19.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2
 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2

From 9e04b57dde58c4db462bba8057e49eb071f5e5c0 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 12 Feb 2017 02:56:29 +0200
Subject: [PATCH 821/899] nixos top-level: Add 'dtbs' symlink when kernel uses
 device trees

Currently e.g. extlinux-conf-builder.sh uses
`readlink -m "$toplevel/kernel/../dtbs"` to figure out the directory.
That is obscenely ugly.
---
 nixos/modules/system/activation/top-level.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 0c08375da64..84c23bed3e3 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -45,6 +45,9 @@ let
 
         ln -s ${kernelPath} $out/kernel
         ln -s ${config.system.modulesTree} $out/kernel-modules
+        ${optionalString (pkgs.stdenv.platform.kernelDTB or false) ''
+          ln -s ${config.boot.kernelPackages.kernel}/dtbs $out/dtbs
+        ''}
 
         echo -n "$kernelParams" > $out/kernel-params
 

From 824d82fa0f6fdd1b2213020283d8bd7aa77738b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 6 Jun 2016 17:38:51 +0200
Subject: [PATCH 822/899] nixos/geoip-updater: new service
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The GeoIP databases from MaxMind have no stable URLs and change every
month (or so). Our current method of packaging these database in Nix and
playing catch-up with ever-changing file hashes is a bad idea. For
instance, it makes it impossible to realize old NixOS configurations.

This patch adds a NixOS service that periodically updates the GeoIP
databases in /var/lib/geoip-databases. Moving NixOS modules over can be
done in later patches.

I tried adding MD5 check, but not all databases have them, so i skipped
it. We are downloading over HTTPS though, it should be good. I also
tried adding zip support, but the first zip file I extracted had a
different filename inside than the archive name, which breaks an
assumption in this service, so I skipped that too.

Changes v9 -> v10:
  - Pass "--max-time" to curl to set upper bound on downloads (ensures
    no indefinite hanging if there's problem with networking).
    Timeout for network connectivity check: 60s.
    Timeout for geoip database (each): 15m.

Changes v8 -> v9:
  - Mention the random timer delay in the documentation for the
    'interval' option.

Changes v7 -> v8:
  - Add "RemainAfterExit=true" for the setup service, so it won't be
    restarted needlessly. (Thanks @danbst!)

Changes v6 -> v7:
  - Add --skip-existing flag to geoip-updater, which skips updating
    existing database files. Pass that flag when we run the service on
    boot (and on any NixOS configuration change).
    (IMHO, this is somewhat a workaround for systemd persistent timers
    not being triggered immediately when a timer has never expired
    before. But it does have the nice side effect of ensuring that the
    installed databases always correspond to the configured ones, since
    the service is now always run after configuration changes.)

Changes v5 -> v6:
  - Update database files atomically (per DB)
  - If a database is removed from the configuration, it'll be removed
    from /var/lib/geoip-databases too (on next run).
  - Add NixOS module assertion so that if user inputs non- .gz or .xz
    file there will be a build time error instead of runtime.
  - Run updater as user "nobody" instead of "root".
  - Rename NixOS service from "geoip-databases" to "geoip-updater".
  - Drop RemainAfterExit, or else the timer won't trigger the unit.
  - Bring back "curl --fail", or else we won't catch and log curl
    failures.

Changes v4 -> v5:
  - Add "GeoLite2-City.mmdb.gz" to default database list.

Changes v3 -> v4:
  - Remove unneeded geoip-updater-setup.service after adding
    'wantedBy = [ "multi-user.target" ]' directly to
    geoip-updater.service
  - Drop unneeded "Service" name from service descriptions.

Changes v2 -> v3:
  - Network may be down when starting from a cold boot, so try a few
    times. Possibly, if using systemd-networkd, it'll pass on the first
    try. But with default DHCP on NixOS, the service is started before
    hostnames can be resolved and thus we need a few extra seconds.
  - Add error handling and mark service as failed if fatal error.
  - Add proper syslog log levels.
  - Add RandomizedDelaySec=3600 to the timer to not put high load on the
    MaxMind servers. Suggested by @Mic92.
  - Set RemainAfterExit on geoip-updater.service instead of
    geoip-updater-setup.service. (The latter is only a proxy that pulls
    in the former service).

Changes v1 -> v2:
From Данило Глинський (Danylo Hlynskyi) <abcz2.uprola@gmail.com>:
  nixos/geoip-databases: add `databases` option and fix initial setup

  There were two great issues when using this service:
  - When you just enable service, databases aren't downloaded, they are
    downloaded when timer triggers. Fixed this with automatic download on
    first system activation.
  - When there is no internet, updater outputs nothing to logs, which is
    IMO misbehavior. Fixed this with removing `--fail` option, better be
    explicit here.
---
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/misc/geoip-updater.nix | 300 ++++++++++++++++++
 2 files changed, 301 insertions(+)
 create mode 100644 nixos/modules/services/misc/geoip-updater.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 7c9c9ac2a1e..9bf6a400b09 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -259,6 +259,7 @@
   ./services/misc/felix.nix
   ./services/misc/folding-at-home.nix
   ./services/misc/gammu-smsd.nix
+  ./services/misc/geoip-updater.nix
   #./services/misc/gitit.nix
   ./services/misc/gitlab.nix
   ./services/misc/gitolite.nix
diff --git a/nixos/modules/services/misc/geoip-updater.nix b/nixos/modules/services/misc/geoip-updater.nix
new file mode 100644
index 00000000000..021ee02782d
--- /dev/null
+++ b/nixos/modules/services/misc/geoip-updater.nix
@@ -0,0 +1,300 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.geoip-updater;
+
+  dbBaseUrl = "https://geolite.maxmind.com/download/geoip/database";
+
+  randomizedTimerDelaySec = "3600";
+
+  # Use writeScriptBin instead of writeScript, so that argv[0] (logged to the
+  # journal) doesn't include the long nix store path hash. (Prefixing the
+  # ExecStart= command with '@' doesn't work because we start a shell (new
+  # process) that creates a new argv[0].)
+  geoip-updater = pkgs.writeScriptBin "geoip-updater" ''
+    #!${pkgs.stdenv.shell}
+    skipExisting=0
+    debug()
+    {
+        echo "<7>$@"
+    }
+    info()
+    {
+        echo "<6>$@"
+    }
+    error()
+    {
+        echo "<3>$@"
+    }
+    die()
+    {
+        error "$@"
+        exit 1
+    }
+    waitNetworkOnline()
+    {
+        ret=1
+        for i in $(seq 6); do
+            curl_out=$("${pkgs.curl.bin}/bin/curl" \
+                --silent --fail --show-error --max-time 60 "${dbBaseUrl}" 2>&1)
+            if [ $? -eq 0 ]; then
+                debug "Server is reachable (try $i)"
+                ret=0
+                break
+            else
+                debug "Server is unreachable (try $i): $curl_out"
+                sleep 10
+            fi
+        done
+        return $ret
+    }
+    dbFnameTmp()
+    {
+        dburl=$1
+        echo "${cfg.databaseDir}/.$(basename "$dburl")"
+    }
+    dbFnameTmpDecompressed()
+    {
+        dburl=$1
+        echo "${cfg.databaseDir}/.$(basename "$dburl")" | sed 's/\.\(gz\|xz\)$//'
+    }
+    dbFname()
+    {
+        dburl=$1
+        echo "${cfg.databaseDir}/$(basename "$dburl")" | sed 's/\.\(gz\|xz\)$//'
+    }
+    downloadDb()
+    {
+        dburl=$1
+        curl_out=$("${pkgs.curl.bin}/bin/curl" \
+            --silent --fail --show-error --max-time 900 -L -o "$(dbFnameTmp "$dburl")" "$dburl" 2>&1)
+        if [ $? -ne 0 ]; then
+            error "Failed to download $dburl: $curl_out"
+            return 1
+        fi
+    }
+    decompressDb()
+    {
+        fn=$(dbFnameTmp "$1")
+        ret=0
+        case "$fn" in
+            *.gz)
+                cmd_out=$("${pkgs.gzip}/bin/gzip" --decompress --force "$fn" 2>&1)
+                ;;
+            *.xz)
+                cmd_out=$("${pkgs.xz.bin}/bin/xz" --decompress --force "$fn" 2>&1)
+                ;;
+            *)
+                cmd_out=$(echo "File \"$fn\" is neither a .gz nor .xz file")
+                false
+                ;;
+        esac
+        if [ $? -ne 0 ]; then
+            error "$cmd_out"
+            ret=1
+        fi
+    }
+    atomicRename()
+    {
+        dburl=$1
+        mv "$(dbFnameTmpDecompressed "$dburl")" "$(dbFname "$dburl")"
+    }
+    removeIfNotInConfig()
+    {
+        # Arg 1 is the full path of an installed DB.
+        # If the corresponding database is not specified in the NixOS config we
+        # remove it.
+        db=$1
+        for cdb in ${lib.concatStringsSep " " cfg.databases}; do
+            confDb=$(echo "$cdb" | sed 's/\.\(gz\|xz\)$//')
+            if [ "$(basename "$db")" = "$(basename "$confDb")" ]; then
+                return 0
+            fi
+        done
+        rm "$db"
+        if [ $? -eq 0 ]; then
+            debug "Removed $(basename "$db") (not listed in services.geoip-updater.databases)"
+        else
+            error "Failed to remove $db"
+        fi
+    }
+    removeUnspecifiedDbs()
+    {
+        for f in "${cfg.databaseDir}/"*; do
+            test -f "$f" || continue
+            case "$f" in
+                *.dat|*.mmdb|*.csv)
+                    removeIfNotInConfig "$f"
+                    ;;
+                *)
+                    debug "Not removing \"$f\" (unknown file extension)"
+                    ;;
+            esac
+        done
+    }
+    downloadAndInstall()
+    {
+        dburl=$1
+        if [ "$skipExisting" -eq 1 -a -f "$(dbFname "$dburl")" ]; then
+            debug "Skipping existing file: $(dbFname "$dburl")"
+            return 0
+        fi
+        downloadDb "$dburl" || return 1
+        decompressDb "$dburl" || return 1
+        atomicRename "$dburl" || return 1
+        info "Updated $(basename "$(dbFname "$dburl")")"
+    }
+    for arg in "$@"; do
+        case "$arg" in
+            --skip-existing)
+                skipExisting=1
+                info "Option --skip-existing is set: not updating existing databases"
+                ;;
+            *)
+                error "Unknown argument: $arg";;
+        esac
+    done
+    waitNetworkOnline || die "Network is down (${dbBaseUrl} is unreachable)"
+    test -d "${cfg.databaseDir}" || die "Database directory (${cfg.databaseDir}) doesn't exist"
+    debug "Starting update of GeoIP databases in ${cfg.databaseDir}"
+    all_ret=0
+    for db in ${lib.concatStringsSep " \\\n        " cfg.databases}; do
+        downloadAndInstall "${dbBaseUrl}/$db" || all_ret=1
+    done
+    removeUnspecifiedDbs || all_ret=1
+    if [ $all_ret -eq 0 ]; then
+        info "Completed GeoIP database update in ${cfg.databaseDir}"
+    else
+        error "Completed GeoIP database update in ${cfg.databaseDir}, with error(s)"
+    fi
+    # Hack to work around systemd journal race:
+    # https://github.com/systemd/systemd/issues/2913
+    sleep 2
+    exit $all_ret
+  '';
+
+in
+
+{
+  options = {
+    services.geoip-updater = {
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Whether to enable periodic downloading of GeoIP databases from
+          maxmind.com. You might want to enable this if you, for instance, use
+          ntopng or Wireshark.
+        '';
+      };
+
+      interval = mkOption {
+        type = types.str;
+        default = "weekly";
+        description = ''
+          Update the GeoIP databases at this time / interval.
+          The format is described in
+          <citerefentry><refentrytitle>systemd.time</refentrytitle>
+          <manvolnum>7</manvolnum></citerefentry>.
+          To prevent load spikes on maxmind.com, the timer interval is
+          randomized by an additional delay of ${randomizedTimerDelaySec}
+          seconds. Setting a shorter interval than this is not recommended.
+        '';
+      };
+
+      databaseDir = mkOption {
+        type = types.path;
+        default = "/var/lib/geoip-databases";
+        description = ''
+          Directory that will contain GeoIP databases.
+        '';
+      };
+
+      databases = mkOption {
+        type = types.listOf types.str;
+        default = [
+          "GeoLiteCountry/GeoIP.dat.gz"
+          "GeoIPv6.dat.gz"
+          "GeoLiteCity.dat.xz"
+          "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz"
+          "asnum/GeoIPASNum.dat.gz"
+          "asnum/GeoIPASNumv6.dat.gz"
+          "GeoLite2-Country.mmdb.gz"
+          "GeoLite2-City.mmdb.gz"
+        ];
+        description = ''
+          Which GeoIP databases to update. The full URL is ${dbBaseUrl}/ +
+          <literal>the_database</literal>.
+        '';
+      };
+
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    assertions = [
+      { assertion = (builtins.filter
+          (x: builtins.match ".*\.(gz|xz)$" x == null) cfg.databases) == [];
+        message = ''
+          services.geoip-updater.databases supports only .gz and .xz databases.
+
+          Current value:
+          ${toString cfg.databases}
+
+          Offending element(s):
+          ${toString (builtins.filter (x: builtins.match ".*\.(gz|xz)$" x == null) cfg.databases)};
+        '';
+      }
+    ];
+
+    systemd.timers.geoip-updater =
+      { description = "GeoIP Updater Timer";
+        partOf = [ "geoip-updater.service" ];
+        wantedBy = [ "timers.target" ];
+        timerConfig.OnCalendar = cfg.interval;
+        timerConfig.Persistent = "true";
+        timerConfig.RandomizedDelaySec = randomizedTimerDelaySec;
+      };
+
+    systemd.services.geoip-updater = {
+      description = "GeoIP Updater";
+      after = [ "network-online.target" "nss-lookup.target" ];
+      wants = [ "network-online.target" ];
+      preStart = ''
+        mkdir -p "${cfg.databaseDir}"
+        chmod 755 "${cfg.databaseDir}"
+        chown nobody:root "${cfg.databaseDir}"
+      '';
+      serviceConfig = {
+        ExecStart = "${geoip-updater}/bin/geoip-updater";
+        User = "nobody";
+        PermissionsStartOnly = true;
+      };
+    };
+
+    systemd.services.geoip-updater-setup = {
+      description = "GeoIP Updater Setup";
+      after = [ "network-online.target" "nss-lookup.target" ];
+      wants = [ "network-online.target" ];
+      wantedBy = [ "multi-user.target" ];
+      conflicts = [ "geoip-updater.service" ];
+      preStart = ''
+        mkdir -p "${cfg.databaseDir}"
+        chmod 755 "${cfg.databaseDir}"
+        chown nobody:root "${cfg.databaseDir}"
+      '';
+      serviceConfig = {
+        ExecStart = "${geoip-updater}/bin/geoip-updater --skip-existing";
+        User = "nobody";
+        PermissionsStartOnly = true;
+        # So it won't be (needlessly) restarted:
+        RemainAfterExit = true;
+      };
+    };
+
+  };
+}

From 8e19dc565ec43d9ca7722aa0527224f19086d56e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 12 Feb 2017 15:44:19 +0100
Subject: [PATCH 823/899] pythonPackages.slixmpp: 1.2.1 -> 1.2.4.post1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 85898169729..4a0fd02df5c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15572,13 +15572,13 @@ in {
 
   slixmpp = buildPythonPackage rec {
     name = "slixmpp-${version}";
-    version = "1.2.1";
+    version = "1.2.4.post1";
 
     disabled = pythonOlder "3.4";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/s/slixmpp/${name}.tar.gz";
-      sha256 = "0fwngxf2pnmpk8vhv4pfxvl1ya3nxr4kc2z6jrh2imynbry3xfj9";
+      sha256 = "0v6430dczai8a2nmznhja2dxl6pxa8c5j20nhc5737bqjg7245jk";
     };
 
     patchPhase = ''

From cf4775571fe55fdbb41fc99a423452f72e460fef Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 12 Feb 2017 15:55:35 +0100
Subject: [PATCH 824/899] poezio: 0.10 -> 0.11

---
 .../poezio/fix_plugins_imports.patch          | 80 -------------------
 .../poezio/make_default_config_writable.patch | 25 ------
 pkgs/top-level/python-packages.nix            |  7 +-
 3 files changed, 3 insertions(+), 109 deletions(-)
 delete mode 100644 pkgs/development/python-modules/poezio/fix_plugins_imports.patch
 delete mode 100644 pkgs/development/python-modules/poezio/make_default_config_writable.patch

diff --git a/pkgs/development/python-modules/poezio/fix_plugins_imports.patch b/pkgs/development/python-modules/poezio/fix_plugins_imports.patch
deleted file mode 100644
index 821b9c41588..00000000000
--- a/pkgs/development/python-modules/poezio/fix_plugins_imports.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -Nur poezio-0.10.orig/plugins/canat.py poezio-0.10/plugins/canat.py
---- poezio-0.10.orig/plugins/canat.py	2016-08-21 14:56:35.000000000 +0200
-+++ poezio-0.10/plugins/canat.py	2016-11-16 14:32:21.565445266 +0100
-@@ -34,9 +34,9 @@
- 
- 
- """
--from plugin import BasePlugin
--import tabs
--from decorators import command_args_parser
-+from poezio.plugin import BasePlugin
-+import poezio.tabs
-+from poezio.decorators import command_args_parser
- 
- def move(text, step, spacing):
-     new_text = text + (" " * spacing)
-diff -Nur poezio-0.10.orig/plugins/corrections_diff.py poezio-0.10/plugins/corrections_diff.py
---- poezio-0.10.orig/plugins/corrections_diff.py	2016-08-21 14:56:35.000000000 +0200
-+++ poezio-0.10/plugins/corrections_diff.py	2016-11-16 14:30:53.992684959 +0100
-@@ -22,11 +22,11 @@
- 
- 
- """
--from plugin import BasePlugin
-+from poezio.plugin import BasePlugin
- import difflib
-+import collections
- from functools import wraps
--import tabs
--from config import config
-+from poezio.config import config
- 
- shim_message_fields = ('txt nick_color time str_time nickname user identifier'
-                   ' highlight me old_message revisions jid ack')
-@@ -61,10 +61,6 @@
-         rev -= 1
-     return ''.join(acc)
- 
--Message.__repr__ = repr_message
--Message.__str__ = repr_message
--
--
- 
- def corrections_enabled(func):
-     @wraps(func)
-diff -Nur poezio-0.10.orig/plugins/coucou.py poezio-0.10/plugins/coucou.py
---- poezio-0.10.orig/plugins/coucou.py	2016-08-21 14:56:35.000000000 +0200
-+++ poezio-0.10/plugins/coucou.py	2016-11-16 14:25:37.101337668 +0100
-@@ -1,4 +1,4 @@
--from plugin import BasePlugin
-+from poezio.plugin import BasePlugin
- import tracemalloc
- import cProfile, pstats, io
- 
-diff -Nur poezio-0.10.orig/plugins/flood.py poezio-0.10/plugins/flood.py
---- poezio-0.10.orig/plugins/flood.py	2016-08-21 14:56:35.000000000 +0200
-+++ poezio-0.10/plugins/flood.py	2016-11-16 14:32:56.452155220 +0100
-@@ -1,6 +1,6 @@
--from plugin import BasePlugin
--import tabs
--import multiuserchat as muc
-+from poezio.plugin import BasePlugin
-+import poezio.tabs
-+import poezio.multiuserchat as muc
- 
- class Plugin(BasePlugin):
-     def init(self):
-diff -Nur poezio-0.10.orig/plugins/invisible.py poezio-0.10/plugins/invisible.py
---- poezio-0.10.orig/plugins/invisible.py	2016-08-21 14:56:35.000000000 +0200
-+++ poezio-0.10/plugins/invisible.py	2016-11-16 14:31:31.743288152 +0100
-@@ -20,8 +20,7 @@
- .. _XEP-0186: https://xmpp.org/extensions/xep-0186.html
- """
- 
--from plugin import BasePlugin
--import tabs
-+from poezio.plugin import BasePlugin
- 
- class Plugin(BasePlugin):
-     def init(self):
diff --git a/pkgs/development/python-modules/poezio/make_default_config_writable.patch b/pkgs/development/python-modules/poezio/make_default_config_writable.patch
deleted file mode 100644
index 03d732e256c..00000000000
--- a/pkgs/development/python-modules/poezio/make_default_config_writable.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ruN a/src/config.py b/src/config.py
---- a/src/config.py	2015-07-31 19:35:37.000000000 +0000
-+++ b/src/config.py	2015-08-03 09:23:34.322098081 +0000
-@@ -14,6 +14,7 @@
- 
- import logging.config
- import os
-+import stat
- import sys
- import pkg_resources
- 
-@@ -563,6 +564,13 @@
-             copy2(default, options.filename)
-         elif path.isfile(other):
-             copy2(other, options.filename)
-+
-+        # Inside the nixstore, the reference file is readonly, so is the copy.
-+        # Make it writable by the user who just created it.
-+        if os.path.exists(options.filename):
-+            os.chmod(options.filename,
-+                     os.stat(options.filename).st_mode | stat.S_IWUSR)
-+
-         global firstrun
-         firstrun = True
- 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4a0fd02df5c..36ccc57b545 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -30186,7 +30186,7 @@ EOF
 
   poezio = buildPythonApplication rec {
     name = "poezio-${version}";
-    version = "0.10";
+    version = "0.11";
 
     disabled = pythonOlder "3.4";
 
@@ -30194,13 +30194,12 @@ EOF
     propagatedBuildInputs = with self ; [ aiodns slixmpp pyinotify potr mpd2 ];
 
     src = pkgs.fetchurl {
-      url = "http://dev.louiz.org/attachments/download/102/${name}.tar.gz";
-      sha256 = "1mm0c3250p0kh7lmmjlp05hbc7byn9lknafgb906xmp4vx1p4kjn";
+      url = "http://dev.louiz.org/attachments/download/118/${name}.tar.gz";
+      sha256 = "07cn3717swarjv47yw8x95bvngz4nvlyyy9m7ck9fhycjgdy82r0";
     };
 
     patches = [
       ../development/python-modules/poezio/fix_gnupg_import.patch
-      ../development/python-modules/poezio/fix_plugins_imports.patch
     ];
 
     checkPhase = ''

From 94b28a8072a6f93dad7ba6270422af8a99cc7e76 Mon Sep 17 00:00:00 2001
From: georgewhewell <georgewhewell@users.noreply.github.com>
Date: Sun, 12 Feb 2017 15:06:59 +0000
Subject: [PATCH 825/899] fix systemd.services.kube-proxy to use correct
 extraOpts

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

diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix
index 029b11ad98b..a82802c3266 100644
--- a/nixos/modules/services/cluster/kubernetes.nix
+++ b/nixos/modules/services/cluster/kubernetes.nix
@@ -775,7 +775,7 @@ in {
             --bind-address=${cfg.proxy.address} \
             ${optionalString cfg.verbose "--v=6"} \
             ${optionalString cfg.verbose "--log-flush-frequency=1s"} \
-            ${cfg.controllerManager.extraOpts}
+            ${cfg.proxy.extraOpts}
           '';
           WorkingDirectory = cfg.dataDir;
         };

From a8d7a6a9577d70a80f55f1ddd766ee94617fad61 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Sun, 12 Feb 2017 14:18:04 -0400
Subject: [PATCH 826/899] xwayland : fix build by giving wayland-protocols to
 the build.

---
 pkgs/servers/x11/xorg/xwayland.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix
index ee4b5695c7c..513e4ceee62 100644
--- a/pkgs/servers/x11/xorg/xwayland.nix
+++ b/pkgs/servers/x11/xorg/xwayland.nix
@@ -1,5 +1,5 @@
 
-{ stdenv, wayland, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper }:
+{ stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper }:
 
 with stdenv.lib;
 
@@ -7,7 +7,7 @@ overrideDerivation xorgserver (oldAttrs: {
 
   name = "xwayland-${xorgserver.version}";
   propagatedNativeBuildInputs = oldAttrs.propagatedNativeBuildInputs
-    ++ [wayland epoxy libxslt makeWrapper libunwind];
+    ++ [wayland wayland-protocols epoxy libxslt makeWrapper libunwind];
   configureFlags = [
     "--disable-docs"
     "--disable-devel-docs"

From 84e7ad1eb7620f94760ba72f81b4ebf277608eb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@sourcediver.org>
Date: Fri, 20 Jan 2017 19:02:19 +0100
Subject: [PATCH 827/899] ipfs: 0.4.4 -> 0.4.5

0.4.5 introduces a new repo format. You might need
to run a migration:

https://github.com/ipfs/fs-repo-migrations
---
 pkgs/applications/networking/ipfs/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix
index 0d018c9588f..40ac0917797 100644
--- a/pkgs/applications/networking/ipfs/default.nix
+++ b/pkgs/applications/networking/ipfs/default.nix
@@ -2,15 +2,15 @@
 
 buildGoPackage rec {
   name = "ipfs-${version}";
-  version = "0.4.4";
-  rev = "d905d485192616abaea25f7e721062a9e1093ab9";
+  version = "0.4.5";
+  rev = "2cb68b2210ba883bcd38a429ed62b7f832f8c064";
 
   goPackagePath = "github.com/ipfs/go-ipfs";
 
   extraSrcPaths = [
     (fetchgx {
       inherit name src;
-      sha256 = "0mm1rs2mbs3rmxfcji5yal9ai3v1w75kk05bfyhgzmcjvi6lwpyb";
+      sha256 = "0lq4najagdcga0zfprccprjy94nq46ja2gajij2pycag0wcc538d";
     })
   ];
 
@@ -18,7 +18,7 @@ buildGoPackage rec {
     owner = "ipfs";
     repo = "go-ipfs";
     inherit rev;
-    sha256 = "06iq7fmq7p0854aqrnmd0f0jvnxy9958wvw7ibn754fdfii9l84l";
+    sha256 = "087478rdj9cfl8hfrhrbb8rdlh7b1ixdj127vvkgn2k3mlz6af47";
   };
 
   meta = with stdenv.lib; {

From 072adafb66d8f2a9e70d6d3965ce52b865f8ac54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@sourcediver.org>
Date: Thu, 26 Jan 2017 17:25:01 +0100
Subject: [PATCH 828/899] ipfsapi: 0.4.0 -> 0.4.5-pre

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 36ccc57b545..b4ad21ffb5f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7733,15 +7733,16 @@ in {
 
   ipfsapi = buildPythonPackage rec {
     name = "ipfsapi-${version}";
-    version = "0.4.0";
+    version = "0.4.5-pre";
     disabled = isPy26 || isPy27;
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/i/ipfsapi/${name}.tar.gz";
-      sha256 = "0mqqsihannxzaqi8zcj9nca7fxwg1c85bp7xxic3xqa5zslcdcc3";
+    src = pkgs.fetchFromGitHub {
+      owner = "ipfs";
+      repo = "py-ipfs-api";
+      rev = "bcce00e4a9b674d062729d82bd49a9ffbf76486f";
+      sha256 = "0cdmzpk5wvi6fyfmmn96vynqkb1p59wjqjdijhm1ixf7bfl9r126";
     };
 
-    buildInputs = with self; [ pkgs.pandoc ];
     propagatedBuildInputs = with self; [ six requests2 ];
 
     meta = {

From 31eba21d1dab7da2e75be229c542990e8f4b56b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 12 Feb 2017 21:06:59 +0100
Subject: [PATCH 829/899] virtualbox: force xorg-server-1.18 for now

This is getting a little hacky, but hopefully it won't break anything.
---
 nixos/modules/services/x11/xserver.nix                   | 2 ++
 .../virtualbox/guest-additions/default.nix               | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index f5ed5233818..7ac776571a0 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -459,6 +459,8 @@ in
           knownVideoDrivers;
       in optional (driver != null) ({ inherit name; modules = []; driverName = name; } // driver));
 
+    nixpkgs.config.xorg = optionalAttrs (elem "vboxvideo" cfg.videoDrivers) { abiCompat = "1.18"; };
+
     assertions =
       [ { assertion = config.security.polkit.enable;
           message = "X11 requires Polkit to be enabled (‘security.polkit.enable = true’).";
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index d73c18badb1..6e58d42a1cb 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -4,7 +4,14 @@
 let
   version = virtualbox.version;
   xserverVListFunc = builtins.elemAt (stdenv.lib.splitString "." xorg.xorgserver.version);
-  xserverABI = xserverVListFunc 0 + xserverVListFunc 1;
+
+  # Forced to 1.18 in <nixpkgs/nixos/modules/services/x11/xserver.nix>
+  # as it even fails to build otherwise.  Still, override this even here,
+  # in case someone does just a standalone build
+  # (not via videoDrivers = ["vboxvideo"]).
+  # It's likely to work again in some future update.
+  xserverABI = let abi = xserverVListFunc 0 + xserverVListFunc 1;
+    in if abi == "119" then "118" else abi;
 in
 
 stdenv.mkDerivation {

From 446aa6834aae0c585a94688247608458a0f93e4b Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 12 Feb 2017 21:14:09 +0100
Subject: [PATCH 830/899] subtitle-editor: fix build

Apply Debian patch that makes the project build with later GStreamer
versions.
---
 pkgs/applications/video/subtitleeditor/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix
index 3f8f683e0ca..88768b3cb8f 100644
--- a/pkgs/applications/video/subtitleeditor/default.nix
+++ b/pkgs/applications/video/subtitleeditor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, file, desktop_file_utils,
+{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, file, desktop_file_utils,
   enchant, gnome3, gst_all_1, hicolor_icon_theme, libsigcxx, libxmlxx,
   xdg_utils, isocodes, wrapGAppsHook
 }:
@@ -16,6 +16,13 @@ stdenv.mkDerivation rec {
     sha256 = "087rxignjawby4z3lwnh9m6pcjphl3a0jf7gfp83h92mzcq79b4g";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/s/subtitleeditor/0.53.0-2/debian/patches/03-fix-build-gstreamermm-1.8.0.patch";
+      sha256 = "0di2i34id5dqnd3glibhifair1kdfnv8ay3k64lirad726ardw2c";
+    })
+  ];
+
   nativeBuildInputs =  [
     pkgconfig
     intltool

From 06bacb10e5c0ae4af621648891da0aa979c8c8de Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Sun, 12 Feb 2017 10:38:08 +0100
Subject: [PATCH 831/899] scalafmt: 0.4.10 -> 0.5.6

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

diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix
index 534f358e531..af7854b33dc 100644
--- a/pkgs/development/tools/scalafmt/default.nix
+++ b/pkgs/development/tools/scalafmt/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, unzip, jre }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.10";
+  version = "0.5.6";
   baseName = "scalafmt";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "https://github.com/olafurpg/scalafmt/releases/download/v${version}/${baseName}.tar.gz";
-    sha256 = "0igz95zy69pasvj4vya71akhwlc0233m7kwrn66rali1wxs2kcsz";
+    sha256 = "17fwli6jlsh4q7nqgqmqmhb368hpmj1yg9fdsybk8yq57hb24bwq";
   };
 
   unpackPhase = "tar xvzf $src";

From 939c846ae7c2b330dbc317e4703926dbd554b030 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Sat, 11 Feb 2017 15:19:22 -0800
Subject: [PATCH 832/899] elvish: 0.1 -> 0.5

---
 pkgs/shells/elvish/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix
index 884f34dcf02..7dc6029acb4 100644
--- a/pkgs/shells/elvish/default.nix
+++ b/pkgs/shells/elvish/default.nix
@@ -2,15 +2,15 @@
 
 buildGoPackage rec {
   name = "elvish-${version}";
-  version = "0.1";
+  version = "0.5";
 
   goPackagePath = "github.com/elves/elvish";
 
   src = fetchFromGitHub {
     repo = "elvish";
     owner = "elves";
-    rev = "4125c2bb927330b0100b354817dd4ad252118ba6";
-    sha256 = "1xwhjbw0y6j5xy19hz39456l0v6vjg2icd7c1jx4h1cydk3yn39f";
+    rev = version;
+    sha256 = "1dk5f8a2wpgd5cw45ippvx46fxk0yap64skfpzpiqz8bkbnrwbz6";
   };
 
   goDeps = ./deps.nix;
@@ -20,6 +20,6 @@ buildGoPackage rec {
     homepage = https://github.com/elves/elvish;
     license = licenses.bsd2;
     maintainers = with maintainers; [ vrthra ];
-    platforms = with platforms; [ linux ];
+    platforms = with platforms; linux;
   };
 }

From 21cb82f34b04e76c285b3ea1aab6ac1c8170f71f Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 12 Feb 2017 22:27:11 +0100
Subject: [PATCH 833/899] mpd: fix on i686

Was submtitted to upstream, but fix here in the meantime.
---
 pkgs/servers/mpd/default.nix |  2 ++
 pkgs/servers/mpd/i386.patch  | 14 ++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/servers/mpd/i386.patch

diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 09d72a12cf0..b1aa8034143 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -39,6 +39,8 @@ in stdenv.mkDerivation rec {
     sha256 = "0a4psqsf71vc6hfgyv55jclsx8yb7lf4w840qlq6cq8j3hsjaavi";
   };
 
+  patches = [ ./i386.patch ];
+
   buildInputs = [ pkgconfig glib boost ]
     ++ opt stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudioKit
     ++ opt stdenv.isLinux systemd
diff --git a/pkgs/servers/mpd/i386.patch b/pkgs/servers/mpd/i386.patch
new file mode 100644
index 00000000000..dca8ea88a8b
--- /dev/null
+++ b/pkgs/servers/mpd/i386.patch
@@ -0,0 +1,14 @@
+diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
+index 6986453..167fc07 100644
+--- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx
++++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
+@@ -20,8 +20,8 @@
+ /* necessary because libavutil/common.h uses UINT64_C */
+ #define __STDC_CONSTANT_MACROS
+ 
+-#include "lib/ffmpeg/Time.hxx"
+ #include "config.h"
++#include "lib/ffmpeg/Time.hxx"
+ #include "FfmpegDecoderPlugin.hxx"
+ #include "lib/ffmpeg/Domain.hxx"
+ #include "lib/ffmpeg/Error.hxx"

From cbedb932f9d2320e708c804e82d20e9d63ec0b1f Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 12 Feb 2017 23:12:13 +0100
Subject: [PATCH 834/899] nodePackages.mocha: init at 3.2.0

---
 .../node-packages/node-packages-v4.nix        | 1102 ++++++++++-------
 .../node-packages/node-packages-v6.nix        | 1062 +++++++++-------
 .../node-packages/node-packages.json          |    1 +
 3 files changed, 1262 insertions(+), 903 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index 54687d92bbd..ceebd52b61c 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -400,13 +400,13 @@ let
         sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f";
       };
     };
-    "azure-arm-cdn-1.0.0" = {
+    "azure-arm-cdn-1.0.2" = {
       name = "azure-arm-cdn";
       packageName = "azure-arm-cdn";
-      version = "1.0.0";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.0.tgz";
-        sha1 = "a400b0234734eb8f7a52f5b800dd05b4f1b69f85";
+        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.2.tgz";
+        sha1 = "35eed81c93fb1b2fe1236b432c821a61bce6be96";
       };
     };
     "azure-arm-commerce-0.2.0" = {
@@ -418,13 +418,13 @@ let
         sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd";
       };
     };
-    "azure-arm-compute-0.19.1" = {
+    "azure-arm-compute-0.20.0" = {
       name = "azure-arm-compute";
       packageName = "azure-arm-compute";
-      version = "0.19.1";
+      version = "0.20.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.19.1.tgz";
-        sha1 = "04bd00758cfcc6fac616a4cf336bbdf83ab1decd";
+        url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.20.0.tgz";
+        sha1 = "f6d81c1e6093f4abae2d153a7b856963f5085e32";
       };
     };
     "azure-arm-datalake-analytics-1.0.1-preview" = {
@@ -535,13 +535,13 @@ let
         sha1 = "6972dd9844a0d12376d74014b541c49247caa37d";
       };
     };
-    "azure-arm-rediscache-0.2.1" = {
+    "azure-arm-rediscache-0.2.3" = {
       name = "azure-arm-rediscache";
       packageName = "azure-arm-rediscache";
-      version = "0.2.1";
+      version = "0.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.1.tgz";
-        sha1 = "22e516e7519dd12583e174cca4eeb3b20c993d02";
+        url = "https://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.3.tgz";
+        sha1 = "b6898abe8b4c3e1b2ec5be82689ef212bc2b1a06";
       };
     };
     "azure-arm-devtestlabs-0.1.0" = {
@@ -724,13 +724,13 @@ let
         sha1 = "21b23f9db7f42734e97f35bd703818a1cf2492eb";
       };
     };
-    "azure-servicefabric-0.1.4" = {
+    "azure-servicefabric-0.1.5" = {
       name = "azure-servicefabric";
       packageName = "azure-servicefabric";
-      version = "0.1.4";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-0.1.4.tgz";
-        sha1 = "7f8d7e7949202e599638fd8abba8f1dc1a89f79e";
+        url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-0.1.5.tgz";
+        sha1 = "bdc4b378292490ce77e788ee189f291ce5ae25a6";
       };
     };
     "applicationinsights-0.16.0" = {
@@ -1687,13 +1687,13 @@ let
         sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f";
       };
     };
-    "aws4-1.5.0" = {
+    "aws4-1.6.0" = {
       name = "aws4";
       packageName = "aws4";
-      version = "1.5.0";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz";
-        sha1 = "0a29ffb79c31c9e712eeb087e8e7a64b4a56d755";
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz";
+        sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e";
       };
     };
     "bl-1.1.2" = {
@@ -2155,13 +2155,13 @@ let
         sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6";
       };
     };
-    "jsbn-0.1.0" = {
+    "jsbn-0.1.1" = {
       name = "jsbn";
       packageName = "jsbn";
-      version = "0.1.0";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz";
-        sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd";
+        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz";
+        sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
       };
     };
     "tweetnacl-0.14.5" = {
@@ -2380,13 +2380,13 @@ let
         sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
       };
     };
-    "sax-1.2.1" = {
+    "sax-1.2.2" = {
       name = "sax";
       packageName = "sax";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz";
-        sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a";
+        url = "https://registry.npmjs.org/sax/-/sax-1.2.2.tgz";
+        sha1 = "fd8631a23bc7826bef5d871bdb87378c95647828";
       };
     };
     "mute-stream-0.0.7" = {
@@ -2830,13 +2830,13 @@ let
         sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1";
       };
     };
-    "hosted-git-info-2.1.5" = {
+    "hosted-git-info-2.2.0" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
-      version = "2.1.5";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz";
-        sha1 = "0ba81d90da2e25ab34a332e6ec77936e1598118b";
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.2.0.tgz";
+        sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5";
       };
     };
     "is-builtin-module-1.0.0" = {
@@ -3109,13 +3109,13 @@ let
         sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e";
       };
     };
-    "debug-2.6.0" = {
+    "debug-2.6.1" = {
       name = "debug";
       packageName = "debug";
-      version = "2.6.0";
+      version = "2.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz";
-        sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b";
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz";
+        sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351";
       };
     };
     "ms-0.7.2" = {
@@ -3190,13 +3190,13 @@ let
         sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d";
       };
     };
-    "buffer-5.0.2" = {
+    "buffer-5.0.5" = {
       name = "buffer";
       packageName = "buffer";
-      version = "5.0.2";
+      version = "5.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-5.0.2.tgz";
-        sha1 = "41d0407ff76782e9ec19f52f88e237ce6bb0de6d";
+        url = "https://registry.npmjs.org/buffer/-/buffer-5.0.5.tgz";
+        sha1 = "35c9393244a90aff83581063d16f0882cecc9418";
       };
     };
     "cached-path-relative-1.0.0" = {
@@ -3784,13 +3784,13 @@ let
         sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524";
       };
     };
-    "elliptic-6.3.2" = {
+    "elliptic-6.3.3" = {
       name = "elliptic";
       packageName = "elliptic";
-      version = "6.3.2";
+      version = "6.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.2.tgz";
-        sha1 = "e4c81e0829cf0a65ab70e998b8232723b5c1bc48";
+        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz";
+        sha1 = "5482d9646d54bcb89fd7d994fc9e2e9568876e3f";
       };
     };
     "parse-asn1-5.0.0" = {
@@ -3802,13 +3802,13 @@ let
         sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23";
       };
     };
-    "brorand-1.0.6" = {
+    "brorand-1.0.7" = {
       name = "brorand";
       packageName = "brorand";
-      version = "1.0.6";
+      version = "1.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/brorand/-/brorand-1.0.6.tgz";
-        sha1 = "4028706b915f91f7b349a2e0bf3c376039d216e5";
+        url = "https://registry.npmjs.org/brorand/-/brorand-1.0.7.tgz";
+        sha1 = "6677fa5e4901bdbf9c9ec2a748e28dca407a9bfc";
       };
     };
     "hash.js-1.0.3" = {
@@ -4945,13 +4945,13 @@ let
         sha1 = "dd3ae8dba3e58df5c9ed3457c055177849d82854";
       };
     };
-    "random-access-file-1.4.0" = {
+    "random-access-file-1.5.0" = {
       name = "random-access-file";
       packageName = "random-access-file";
-      version = "1.4.0";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.4.0.tgz";
-        sha1 = "40972acb4d3d6f023522d08f3b2046c6d1ae5767";
+        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.5.0.tgz";
+        sha1 = "dc1b137e5922c203cc6bc8b58564be68d5269a17";
       };
     };
     "run-parallel-1.1.6" = {
@@ -4963,13 +4963,13 @@ let
         sha1 = "29003c9a2163e01e2d2dfc90575f2c6c1d61a039";
       };
     };
-    "thunky-1.0.1" = {
+    "thunky-1.0.2" = {
       name = "thunky";
       packageName = "thunky";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/thunky/-/thunky-1.0.1.tgz";
-        sha1 = "3db1525aac0367b67bd2e532d2773e7c40be2e68";
+        url = "https://registry.npmjs.org/thunky/-/thunky-1.0.2.tgz";
+        sha1 = "a862e018e3fb1ea2ec3fce5d55605cf57f247371";
       };
     };
     "ip-1.1.4" = {
@@ -5170,13 +5170,13 @@ let
         sha1 = "58cccb244f563326ba893bf5c06a35f644846daa";
       };
     };
-    "k-rpc-socket-1.6.1" = {
+    "k-rpc-socket-1.6.2" = {
       name = "k-rpc-socket";
       packageName = "k-rpc-socket";
-      version = "1.6.1";
+      version = "1.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.6.1.tgz";
-        sha1 = "bf67128f89f0c62a19cec5afc3003c280111c78e";
+        url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.6.2.tgz";
+        sha1 = "5c9e9f34a058f43ffe6512354d98957a41694f21";
       };
     };
     "bencode-0.8.0" = {
@@ -5215,22 +5215,22 @@ let
         sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9";
       };
     };
-    "simple-peer-6.2.1" = {
+    "simple-peer-6.2.2" = {
       name = "simple-peer";
       packageName = "simple-peer";
-      version = "6.2.1";
+      version = "6.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.2.1.tgz";
-        sha1 = "0d6bf982afb32cca2fabbb969dee4fceaceb99fb";
+        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.2.2.tgz";
+        sha1 = "9ea1a6e2c2e3656d04eac2a7b612e148f0d370ba";
       };
     };
-    "simple-websocket-4.2.0" = {
+    "simple-websocket-4.3.0" = {
       name = "simple-websocket";
       packageName = "simple-websocket";
-      version = "4.2.0";
+      version = "4.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.2.0.tgz";
-        sha1 = "2517742a7dafc8d44fd4e093184b6718c817f2bf";
+        url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.3.0.tgz";
+        sha1 = "062990cc94709388c31fc978dfc2a790b1b3e6ea";
       };
     };
     "string2compact-1.2.2" = {
@@ -5269,6 +5269,24 @@ let
         sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9";
       };
     };
+    "ws-2.0.3" = {
+      name = "ws";
+      packageName = "ws";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ws/-/ws-2.0.3.tgz";
+        sha1 = "532fd499c3f7d7d720e543f1f807106cfc57d9cb";
+      };
+    };
+    "ultron-1.1.0" = {
+      name = "ultron";
+      packageName = "ultron";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ultron/-/ultron-1.1.0.tgz";
+        sha1 = "b07a2e6a541a815fc6a34ccd4533baec307ca864";
+      };
+    };
     "addr-to-ip-port-1.4.2" = {
       name = "addr-to-ip-port";
       packageName = "addr-to-ip-port";
@@ -6664,6 +6682,15 @@ let
         sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a";
       };
     };
+    "hosted-git-info-2.1.5" = {
+      name = "hosted-git-info";
+      packageName = "hosted-git-info";
+      version = "2.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz";
+        sha1 = "0ba81d90da2e25ab34a332e6ec77936e1598118b";
+      };
+    };
     "lockfile-1.0.3" = {
       name = "lockfile";
       packageName = "lockfile";
@@ -9089,13 +9116,13 @@ let
         sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62";
       };
     };
-    "js-yaml-3.7.0" = {
+    "js-yaml-3.8.1" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.7.0";
+      version = "3.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz";
-        sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.1.tgz";
+        sha1 = "782ba50200be7b9e5a8537001b7804db3ad02628";
       };
     };
     "json-stable-stringify-1.0.1" = {
@@ -9395,13 +9422,13 @@ let
         sha1 = "73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86";
       };
     };
-    "esprima-2.7.3" = {
+    "esprima-3.1.3" = {
       name = "esprima";
       packageName = "esprima";
-      version = "2.7.3";
+      version = "3.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz";
-        sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581";
+        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
+        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
       };
     };
     "prelude-ls-1.1.2" = {
@@ -9476,13 +9503,13 @@ let
         sha1 = "afab96262910a7f33c19a5775825c69f34e350ca";
       };
     };
-    "ajv-4.11.2" = {
+    "ajv-4.11.3" = {
       name = "ajv";
       packageName = "ajv";
-      version = "4.11.2";
+      version = "4.11.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.2.tgz";
-        sha1 = "f166c3c11cbc6cb9dcc102a5bcfe5b72c95287e6";
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.3.tgz";
+        sha1 = "ce30bdb90d1254f762c75af915fb3a63e7183d22";
       };
     };
     "ajv-keywords-1.5.1" = {
@@ -10070,13 +10097,13 @@ let
         sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
       };
     };
-    "gauge-2.7.2" = {
+    "gauge-2.7.3" = {
       name = "gauge";
       packageName = "gauge";
-      version = "2.7.2";
+      version = "2.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.2.tgz";
-        sha1 = "15cecc31b02d05345a5d6b0e171cdb3ad2307774";
+        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.3.tgz";
+        sha1 = "1c23855f962f17b3ad3d0dc7443f304542edfe09";
       };
     };
     "set-blocking-2.0.0" = {
@@ -10088,13 +10115,13 @@ let
         sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
       };
     };
-    "aproba-1.0.4" = {
+    "aproba-1.1.1" = {
       name = "aproba";
       packageName = "aproba";
-      version = "1.0.4";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz";
-        sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0";
+        url = "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz";
+        sha1 = "95d3600f07710aa0e9298c726ad5ecf2eacbabab";
       };
     };
     "wide-align-1.1.0" = {
@@ -11457,6 +11484,15 @@ let
         sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018";
       };
     };
+    "esprima-2.7.3" = {
+      name = "esprima";
+      packageName = "esprima";
+      version = "2.7.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz";
+        sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581";
+      };
+    };
     "handlebars-4.0.6" = {
       name = "handlebars";
       packageName = "handlebars";
@@ -11529,13 +11565,13 @@ let
         sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3";
       };
     };
-    "body-parser-1.16.0" = {
+    "body-parser-1.16.1" = {
       name = "body-parser";
       packageName = "body-parser";
-      version = "1.16.0";
+      version = "1.16.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.16.0.tgz";
-        sha1 = "924a5e472c6229fb9d69b85a20d5f2532dec788b";
+        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.16.1.tgz";
+        sha1 = "51540d045adfa7a0c6995a014bb6b1ed9b802329";
       };
     };
     "combine-lists-1.0.1" = {
@@ -11646,13 +11682,13 @@ let
         sha1 = "172735b7f614ea7af39664fa84cf0de4e515d120";
       };
     };
-    "useragent-2.1.11" = {
+    "useragent-2.1.12" = {
       name = "useragent";
       packageName = "useragent";
-      version = "2.1.11";
+      version = "2.1.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/useragent/-/useragent-2.1.11.tgz";
-        sha1 = "6a026e6a6c619b46ca7a0b2fdef6c1ac3da8ca29";
+        url = "https://registry.npmjs.org/useragent/-/useragent-2.1.12.tgz";
+        sha1 = "aa7da6cdc48bdc37ba86790871a7321d64edbaa2";
       };
     };
     "bytes-2.4.0" = {
@@ -12843,6 +12879,78 @@ let
         sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a";
       };
     };
+    "browser-stdout-1.3.0" = {
+      name = "browser-stdout";
+      packageName = "browser-stdout";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz";
+        sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f";
+      };
+    };
+    "diff-1.4.0" = {
+      name = "diff";
+      packageName = "diff";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz";
+        sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf";
+      };
+    };
+    "glob-7.0.5" = {
+      name = "glob";
+      packageName = "glob";
+      version = "7.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz";
+        sha1 = "b4202a69099bbb4d292a7c1b95b6682b67ebdc95";
+      };
+    };
+    "growl-1.9.2" = {
+      name = "growl";
+      packageName = "growl";
+      version = "1.9.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz";
+        sha1 = "0ea7743715db8d8de2c5ede1775e1b45ac85c02f";
+      };
+    };
+    "lodash.create-3.1.1" = {
+      name = "lodash.create";
+      packageName = "lodash.create";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz";
+        sha1 = "d7f2849f0dbda7e04682bb8cd72ab022461debe7";
+      };
+    };
+    "supports-color-3.1.2" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "3.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz";
+        sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5";
+      };
+    };
+    "lodash._baseassign-3.2.0" = {
+      name = "lodash._baseassign";
+      packageName = "lodash._baseassign";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz";
+        sha1 = "8c38a099500f215ad09e59f1722fd0c52bfe0a4e";
+      };
+    };
+    "lodash._basecreate-3.0.3" = {
+      name = "lodash._basecreate";
+      packageName = "lodash._basecreate";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz";
+        sha1 = "1bc661614daa7fc311b7d03bf16806a0213cf821";
+      };
+    };
     "optparse-1.0.5" = {
       name = "optparse";
       packageName = "optparse";
@@ -13248,15 +13356,6 @@ let
         sha1 = "3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa";
       };
     };
-    "lodash._baseassign-3.2.0" = {
-      name = "lodash._baseassign";
-      packageName = "lodash._baseassign";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz";
-        sha1 = "8c38a099500f215ad09e59f1722fd0c52bfe0a4e";
-      };
-    };
     "lodash._createassigner-3.1.1" = {
       name = "lodash._createassigner";
       packageName = "lodash._createassigner";
@@ -13383,6 +13482,15 @@ let
         sha1 = "fddd8b491502c48967a62963bc722ff897cddea0";
       };
     };
+    "js-yaml-3.7.0" = {
+      name = "js-yaml";
+      packageName = "js-yaml";
+      version = "3.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz";
+        sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80";
+      };
+    };
     "jsonata-1.0.10" = {
       name = "jsonata";
       packageName = "jsonata";
@@ -13464,13 +13572,13 @@ let
         sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f";
       };
     };
-    "node-red-node-email-0.1.15" = {
+    "node-red-node-email-0.1.16" = {
       name = "node-red-node-email";
       packageName = "node-red-node-email";
-      version = "0.1.15";
+      version = "0.1.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.15.tgz";
-        sha1 = "7a528596d3b693a077b1ee293300299855537142";
+        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.16.tgz";
+        sha1 = "ede78397c857d28e6785f2f1425e7d89d3b1ed38";
       };
     };
     "node-red-node-twitter-0.1.9" = {
@@ -14031,6 +14139,15 @@ let
         sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8";
       };
     };
+    "node-pre-gyp-0.6.32" = {
+      name = "node-pre-gyp";
+      packageName = "node-pre-gyp";
+      version = "0.6.32";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz";
+        sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5";
+      };
+    };
     "mongoose-3.6.7" = {
       name = "mongoose";
       packageName = "mongoose";
@@ -14616,6 +14733,15 @@ let
         sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
       };
     };
+    "aproba-1.0.4" = {
+      name = "aproba";
+      packageName = "aproba";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz";
+        sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0";
+      };
+    };
     "fstream-npm-1.2.0" = {
       name = "fstream-npm";
       packageName = "fstream-npm";
@@ -14670,13 +14796,13 @@ let
         sha1 = "3cd4574a00b67bae373a94b748772640507b7aac";
       };
     };
-    "mississippi-1.2.0" = {
+    "mississippi-1.3.0" = {
       name = "mississippi";
       packageName = "mississippi";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz";
-        sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c";
+        url = "https://registry.npmjs.org/mississippi/-/mississippi-1.3.0.tgz";
+        sha1 = "d201583eb12327e3c5c1642a404a9cacf94e34f5";
       };
     };
     "node-gyp-3.5.0" = {
@@ -14814,6 +14940,15 @@ let
         sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
       };
     };
+    "parallel-transform-1.1.0" = {
+      name = "parallel-transform";
+      packageName = "parallel-transform";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz";
+        sha1 = "d410f065b05da23081fcd10f28854c29bda33b06";
+      };
+    };
     "stream-each-1.2.0" = {
       name = "stream-each";
       packageName = "stream-each";
@@ -14823,6 +14958,15 @@ let
         sha1 = "1e95d47573f580d814dc0ff8cd0f66f1ce53c991";
       };
     };
+    "cyclist-0.2.2" = {
+      name = "cyclist";
+      packageName = "cyclist";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz";
+        sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640";
+      };
+    };
     "stream-iterate-1.2.0" = {
       name = "stream-iterate";
       packageName = "stream-iterate";
@@ -15310,15 +15454,6 @@ let
         sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04";
       };
     };
-    "diff-1.4.0" = {
-      name = "diff";
-      packageName = "diff";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz";
-        sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf";
-      };
-    };
     "domino-1.0.28" = {
       name = "domino";
       packageName = "domino";
@@ -15384,13 +15519,13 @@ let
         sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0";
       };
     };
-    "service-runner-2.1.13" = {
+    "service-runner-2.1.15" = {
       name = "service-runner";
       packageName = "service-runner";
-      version = "2.1.13";
+      version = "2.1.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.13.tgz";
-        sha1 = "e8ff78b93230d7d831ea3ed5587aa2292b829ceb";
+        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.15.tgz";
+        sha1 = "8b3d05729def7a0ce211e0483d9d907f13febbfb";
       };
     };
     "simplediff-0.1.1" = {
@@ -15519,13 +15654,13 @@ let
         sha1 = "ba055ff7dd3a267a65cc6be2deca4ea6bebbdb03";
       };
     };
-    "yargs-5.0.0" = {
+    "yargs-6.6.0" = {
       name = "yargs";
       packageName = "yargs";
-      version = "5.0.0";
+      version = "6.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz";
-        sha1 = "3355144977d05757dbb86d6e38ec056123b3a66e";
+        url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz";
+        sha1 = "782ec21ef403345f830a808ca3d513af56065208";
       };
     };
     "dtrace-provider-0.8.0" = {
@@ -15655,6 +15790,15 @@ let
         sha1 = "ed17cbf68abd10e0aef8182713e297c5e4b500b0";
       };
     };
+    "camelcase-3.0.0" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
+        sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
+      };
+    };
     "get-caller-file-1.0.2" = {
       name = "get-caller-file";
       packageName = "get-caller-file";
@@ -15664,15 +15808,6 @@ let
         sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5";
       };
     };
-    "lodash.assign-4.2.0" = {
-      name = "lodash.assign";
-      packageName = "lodash.assign";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz";
-        sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7";
-      };
-    };
     "require-directory-2.1.1" = {
       name = "require-directory";
       packageName = "require-directory";
@@ -15700,6 +15835,24 @@ let
         sha1 = "bba63ca861948994ff307736089e3b96026c2a4f";
       };
     };
+    "yargs-parser-4.2.1" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz";
+        sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c";
+      };
+    };
+    "lodash.assign-4.2.0" = {
+      name = "lodash.assign";
+      packageName = "lodash.assign";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz";
+        sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7";
+      };
+    };
     "window-size-0.2.0" = {
       name = "window-size";
       packageName = "window-size";
@@ -15709,24 +15862,6 @@ let
         sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075";
       };
     };
-    "yargs-parser-3.2.0" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz";
-        sha1 = "5081355d19d9d0c8c5d81ada908cb4e6d186664f";
-      };
-    };
-    "camelcase-3.0.0" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
-        sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
-      };
-    };
     "yargs-parser-2.4.1" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
@@ -16663,40 +16798,31 @@ let
         sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a";
       };
     };
-    "private-0.1.6" = {
+    "private-0.1.7" = {
       name = "private";
       packageName = "private";
-      version = "0.1.6";
+      version = "0.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/private/-/private-0.1.6.tgz";
-        sha1 = "55c6a976d0f9bafb9924851350fe47b9b5fbb7c1";
+        url = "https://registry.npmjs.org/private/-/private-0.1.7.tgz";
+        sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1";
       };
     };
-    "recast-0.11.20" = {
+    "recast-0.11.21" = {
       name = "recast";
       packageName = "recast";
-      version = "0.11.20";
+      version = "0.11.21";
       src = fetchurl {
-        url = "https://registry.npmjs.org/recast/-/recast-0.11.20.tgz";
-        sha1 = "2cb9bec269c03b36d0598118a936cd0a293ca3f3";
+        url = "https://registry.npmjs.org/recast/-/recast-0.11.21.tgz";
+        sha1 = "4e83081c6359ecb2e526d14f4138879333f20ac9";
       };
     };
-    "ast-types-0.9.4" = {
+    "ast-types-0.9.5" = {
       name = "ast-types";
       packageName = "ast-types";
-      version = "0.9.4";
+      version = "0.9.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.4.tgz";
-        sha1 = "410d1f81890aeb8e0a38621558ba5869ae53c91b";
-      };
-    };
-    "esprima-3.1.3" = {
-      name = "esprima";
-      packageName = "esprima";
-      version = "3.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
-        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
+        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.5.tgz";
+        sha1 = "1a660a09945dbceb1f9c9cbb715002617424e04a";
       };
     };
     "base62-0.1.1" = {
@@ -17366,13 +17492,13 @@ let
         sha1 = "047b73868ab9a85746e885f637f9ed0fb645a425";
       };
     };
-    "stream-transform-0.1.1" = {
+    "stream-transform-0.1.2" = {
       name = "stream-transform";
       packageName = "stream-transform";
-      version = "0.1.1";
+      version = "0.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-transform/-/stream-transform-0.1.1.tgz";
-        sha1 = "0a54a2b81eea88da55a50df2441cb63edc101c71";
+        url = "https://registry.npmjs.org/stream-transform/-/stream-transform-0.1.2.tgz";
+        sha1 = "7d8e6b4e03ac4781778f8c79517501bfb0762a9f";
       };
     };
     "csv-stringify-0.0.8" = {
@@ -17888,13 +18014,13 @@ let
         sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee";
       };
     };
-    "raven-1.1.1" = {
+    "raven-1.1.2" = {
       name = "raven";
       packageName = "raven";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raven/-/raven-1.1.1.tgz";
-        sha1 = "8837af64baa29ec32fc1cd8223255645ce3c9a42";
+        url = "https://registry.npmjs.org/raven/-/raven-1.1.2.tgz";
+        sha1 = "a5eb3db71f2fc3015a20145bcaf28015e7ae0718";
       };
     };
     "signals-1.0.0" = {
@@ -17924,15 +18050,6 @@ let
         sha1 = "0b48420d978c01804cf0230b648861598225a119";
       };
     };
-    "yargs-6.6.0" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "6.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz";
-        sha1 = "782ec21ef403345f830a808ca3d513af56065208";
-      };
-    };
     "color-convert-1.9.0" = {
       name = "color-convert";
       packageName = "color-convert";
@@ -18140,6 +18257,15 @@ let
         sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
       };
     };
+    "mississippi-1.2.0" = {
+      name = "mississippi";
+      packageName = "mississippi";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz";
+        sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c";
+      };
+    };
     "lsmod-1.0.0" = {
       name = "lsmod";
       packageName = "lsmod";
@@ -18167,15 +18293,6 @@ let
         sha1 = "7eea0afc0e4efb7c9365615315a3576833ead2ae";
       };
     };
-    "yargs-parser-4.2.1" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "4.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz";
-        sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c";
-      };
-    };
     "kew-0.1.7" = {
       name = "kew";
       packageName = "kew";
@@ -18221,6 +18338,15 @@ let
         sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65";
       };
     };
+    "acorn-4.0.11" = {
+      name = "acorn";
+      packageName = "acorn";
+      version = "4.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz";
+        sha1 = "edcda3bd937e7556410d42ed5860f67399c794c0";
+      };
+    };
     "acorn-dynamic-import-2.0.1" = {
       name = "acorn-dynamic-import";
       packageName = "acorn-dynamic-import";
@@ -18230,13 +18356,13 @@ let
         sha1 = "23f671eb6e650dab277fef477c321b1178a8cca2";
       };
     };
-    "enhanced-resolve-3.0.3" = {
+    "enhanced-resolve-3.1.0" = {
       name = "enhanced-resolve";
       packageName = "enhanced-resolve";
-      version = "3.0.3";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.0.3.tgz";
-        sha1 = "df14c06b5fc5eecade1094c9c5a12b4b3edc0b62";
+        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz";
+        sha1 = "9f4b626f577245edcf4b2ad83d86e17f4f421dec";
       };
     };
     "json-loader-0.5.4" = {
@@ -18619,10 +18745,10 @@ in
   azure-cli = nodeEnv.buildNodePackage {
     name = "azure-cli";
     packageName = "azure-cli";
-    version = "0.10.8";
+    version = "0.10.9";
     src = fetchurl {
-      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.8.tgz";
-      sha1 = "23622b6e536a6cdcb4be7a804884ef8b4d4985bc";
+      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.9.tgz";
+      sha1 = "f3f795f069c91fe7335d55f4199fc66c860496df";
     };
     dependencies = [
       (sources."adal-node-0.1.21" // {
@@ -18660,9 +18786,9 @@ in
         ];
       })
       sources."azure-arm-authorization-2.0.0"
-      sources."azure-arm-cdn-1.0.0"
+      sources."azure-arm-cdn-1.0.2"
       sources."azure-arm-commerce-0.2.0"
-      sources."azure-arm-compute-0.19.1"
+      sources."azure-arm-compute-0.20.0"
       sources."azure-arm-datalake-analytics-1.0.1-preview"
       sources."azure-arm-datalake-store-1.0.1-preview"
       sources."azure-arm-hdinsight-0.2.2"
@@ -18675,7 +18801,7 @@ in
       sources."azure-arm-trafficmanager-0.10.5"
       sources."azure-arm-dns-0.11.1"
       sources."azure-arm-website-0.11.4"
-      sources."azure-arm-rediscache-0.2.1"
+      sources."azure-arm-rediscache-0.2.3"
       sources."azure-arm-devtestlabs-0.1.0"
       sources."azure-graph-1.1.1"
       sources."azure-gallery-2.0.0-pre.18"
@@ -18731,7 +18857,7 @@ in
       })
       sources."azure-arm-batch-0.3.0"
       sources."azure-batch-0.5.2"
-      sources."azure-servicefabric-0.1.4"
+      sources."azure-servicefabric-0.1.5"
       sources."applicationinsights-0.16.0"
       (sources."caller-id-0.1.0" // {
         dependencies = [
@@ -18879,7 +19005,7 @@ in
       (sources."request-2.74.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
-          sources."aws4-1.5.0"
+          sources."aws4-1.6.0"
           (sources."bl-1.1.2" // {
             dependencies = [
               (sources."readable-stream-2.0.6" // {
@@ -18978,7 +19104,7 @@ in
                   sources."assert-plus-1.0.0"
                   sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
-                  sources."jsbn-0.1.0"
+                  sources."jsbn-0.1.1"
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
@@ -19081,7 +19207,7 @@ in
       sources."wordwrap-0.0.2"
       (sources."xml2js-0.1.14" // {
         dependencies = [
-          sources."sax-1.2.1"
+          sources."sax-1.2.2"
         ];
       })
       sources."xmlbuilder-0.4.3"
@@ -19219,7 +19345,7 @@ in
                   sources."minimist-1.2.0"
                   (sources."normalize-package-data-2.3.5" // {
                     dependencies = [
-                      sources."hosted-git-info-2.1.5"
+                      sources."hosted-git-info-2.2.0"
                       (sources."is-builtin-module-1.0.0" // {
                         dependencies = [
                           sources."builtin-modules-1.1.1"
@@ -19379,7 +19505,7 @@ in
       (sources."promised-temp-0.1.0" // {
         dependencies = [
           sources."q-1.4.1"
-          (sources."debug-2.6.0" // {
+          (sources."debug-2.6.1" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -19472,7 +19598,7 @@ in
           sources."pako-0.2.9"
         ];
       })
-      (sources."buffer-5.0.2" // {
+      (sources."buffer-5.0.5" // {
         dependencies = [
           sources."base64-js-1.2.0"
           sources."ieee754-1.1.8"
@@ -19525,9 +19651,9 @@ in
             dependencies = [
               sources."bn.js-4.11.6"
               sources."browserify-rsa-4.0.1"
-              (sources."elliptic-6.3.2" // {
+              (sources."elliptic-6.3.3" // {
                 dependencies = [
-                  sources."brorand-1.0.6"
+                  sources."brorand-1.0.7"
                   sources."hash.js-1.0.3"
                 ];
               })
@@ -19552,9 +19678,9 @@ in
           (sources."create-ecdh-4.0.0" // {
             dependencies = [
               sources."bn.js-4.11.6"
-              (sources."elliptic-6.3.2" // {
+              (sources."elliptic-6.3.3" // {
                 dependencies = [
-                  sources."brorand-1.0.6"
+                  sources."brorand-1.0.7"
                   sources."hash.js-1.0.3"
                 ];
               })
@@ -19573,7 +19699,7 @@ in
               sources."bn.js-4.11.6"
               (sources."miller-rabin-4.0.0" // {
                 dependencies = [
-                  sources."brorand-1.0.6"
+                  sources."brorand-1.0.7"
                 ];
               })
             ];
@@ -19847,7 +19973,7 @@ in
         ];
       })
       sources."debounced-seeker-1.0.0"
-      (sources."debug-2.6.0" // {
+      (sources."debug-2.6.1" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -19885,7 +20011,7 @@ in
               sources."map-obj-1.0.1"
               (sources."normalize-package-data-2.3.5" // {
                 dependencies = [
-                  sources."hosted-git-info-2.1.5"
+                  sources."hosted-git-info-2.2.0"
                   (sources."is-builtin-module-1.0.0" // {
                     dependencies = [
                       sources."builtin-modules-1.1.1"
@@ -20119,14 +20245,14 @@ in
                       sources."minimist-0.0.8"
                     ];
                   })
-                  (sources."random-access-file-1.4.0" // {
+                  (sources."random-access-file-1.5.0" // {
                     dependencies = [
                       sources."inherits-2.0.3"
                     ];
                   })
                   sources."randombytes-2.0.3"
                   sources."run-parallel-1.1.6"
-                  sources."thunky-1.0.1"
+                  sources."thunky-1.0.2"
                 ];
               })
               sources."hat-0.0.3"
@@ -20236,7 +20362,7 @@ in
                               sources."randombytes-2.0.3"
                             ];
                           })
-                          (sources."k-rpc-socket-1.6.1" // {
+                          (sources."k-rpc-socket-1.6.2" // {
                             dependencies = [
                               sources."bencode-0.11.0"
                             ];
@@ -20269,7 +20395,7 @@ in
                           sources."unzip-response-2.0.1"
                         ];
                       })
-                      (sources."simple-peer-6.2.1" // {
+                      (sources."simple-peer-6.2.2" // {
                         dependencies = [
                           sources."get-browser-rtc-1.0.2"
                           sources."randombytes-2.0.3"
@@ -20285,7 +20411,7 @@ in
                           })
                         ];
                       })
-                      (sources."simple-websocket-4.2.0" // {
+                      (sources."simple-websocket-4.3.0" // {
                         dependencies = [
                           (sources."readable-stream-2.2.2" // {
                             dependencies = [
@@ -20297,6 +20423,11 @@ in
                               sources."util-deprecate-1.0.2"
                             ];
                           })
+                          (sources."ws-2.0.3" // {
+                            dependencies = [
+                              sources."ultron-1.1.0"
+                            ];
+                          })
                         ];
                       })
                       (sources."string2compact-1.2.2" // {
@@ -20446,7 +20577,7 @@ in
       sources."stream-transcoder-0.0.5"
       (sources."xml2js-0.4.17" // {
         dependencies = [
-          sources."sax-1.2.1"
+          sources."sax-1.2.2"
           (sources."xmlbuilder-4.2.1" // {
             dependencies = [
               sources."lodash-4.17.4"
@@ -20715,9 +20846,9 @@ in
                         dependencies = [
                           sources."bn.js-4.11.6"
                           sources."browserify-rsa-4.0.1"
-                          (sources."elliptic-6.3.2" // {
+                          (sources."elliptic-6.3.3" // {
                             dependencies = [
-                              sources."brorand-1.0.6"
+                              sources."brorand-1.0.7"
                               sources."hash.js-1.0.3"
                             ];
                           })
@@ -20742,9 +20873,9 @@ in
                       (sources."create-ecdh-4.0.0" // {
                         dependencies = [
                           sources."bn.js-4.11.6"
-                          (sources."elliptic-6.3.2" // {
+                          (sources."elliptic-6.3.3" // {
                             dependencies = [
-                              sources."brorand-1.0.6"
+                              sources."brorand-1.0.7"
                               sources."hash.js-1.0.3"
                             ];
                           })
@@ -20763,7 +20894,7 @@ in
                           sources."bn.js-4.11.6"
                           (sources."miller-rabin-4.0.0" // {
                             dependencies = [
-                              sources."brorand-1.0.6"
+                              sources."brorand-1.0.7"
                             ];
                           })
                         ];
@@ -21147,7 +21278,7 @@ in
               })
               (sources."npm-package-arg-4.2.0" // {
                 dependencies = [
-                  sources."hosted-git-info-2.1.5"
+                  sources."hosted-git-info-2.2.0"
                   sources."semver-5.3.0"
                 ];
               })
@@ -21166,7 +21297,7 @@ in
                   })
                   (sources."normalize-package-data-2.3.5" // {
                     dependencies = [
-                      sources."hosted-git-info-2.1.5"
+                      sources."hosted-git-info-2.2.0"
                       (sources."is-builtin-module-1.0.0" // {
                         dependencies = [
                           sources."builtin-modules-1.1.1"
@@ -21289,7 +21420,7 @@ in
                     dependencies = [
                       (sources."array-index-1.0.0" // {
                         dependencies = [
-                          (sources."debug-2.6.0" // {
+                          (sources."debug-2.6.1" // {
                             dependencies = [
                               sources."ms-0.7.2"
                             ];
@@ -21408,7 +21539,7 @@ in
               (sources."request-2.74.0" // {
                 dependencies = [
                   sources."aws-sign2-0.6.0"
-                  sources."aws4-1.5.0"
+                  sources."aws4-1.6.0"
                   (sources."bl-1.1.2" // {
                     dependencies = [
                       (sources."readable-stream-2.0.6" // {
@@ -21497,7 +21628,7 @@ in
                           sources."assert-plus-1.0.0"
                           sources."dashdash-1.14.1"
                           sources."getpass-0.1.6"
-                          sources."jsbn-0.1.0"
+                          sources."jsbn-0.1.1"
                           sources."tweetnacl-0.14.5"
                           sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
@@ -21816,7 +21947,7 @@ in
           (sources."request-2.79.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
-              sources."aws4-1.5.0"
+              sources."aws4-1.6.0"
               sources."caseless-0.11.0"
               (sources."combined-stream-1.0.5" // {
                 dependencies = [
@@ -21880,7 +22011,7 @@ in
                       sources."assert-plus-1.0.0"
                       sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
-                      sources."jsbn-0.1.0"
+                      sources."jsbn-0.1.1"
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
@@ -22313,7 +22444,7 @@ in
           sources."component-emitter-1.1.2"
           sources."methods-1.0.1"
           sources."cookiejar-2.0.1"
-          (sources."debug-2.6.0" // {
+          (sources."debug-2.6.1" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -22684,7 +22815,7 @@ in
           sources."lodash-4.17.4"
         ];
       })
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."awscred-1.2.0"
       sources."ini-1.3.4"
       (sources."optimist-0.6.1" // {
@@ -22776,7 +22907,7 @@ in
                   sources."assert-plus-1.0.0"
                   sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
-                  sources."jsbn-0.1.0"
+                  sources."jsbn-0.1.1"
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
@@ -22948,7 +23079,7 @@ in
           sources."minimist-1.2.0"
           (sources."normalize-package-data-2.3.5" // {
             dependencies = [
-              sources."hosted-git-info-2.1.5"
+              sources."hosted-git-info-2.2.0"
               (sources."is-builtin-module-1.0.0" // {
                 dependencies = [
                   sources."builtin-modules-1.1.1"
@@ -23059,10 +23190,10 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "3.14.1";
+    version = "3.15.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-3.14.1.tgz";
-      sha1 = "8a62175f2255109494747a1b25128d97b8eb3d97";
+      url = "https://registry.npmjs.org/eslint/-/eslint-3.15.0.tgz";
+      sha1 = "bdcc6a6c5ffe08160e7b93c066695362a91e30f2";
     };
     dependencies = [
       (sources."babel-code-frame-6.22.0" // {
@@ -23103,7 +23234,7 @@ in
           })
         ];
       })
-      (sources."debug-2.6.0" // {
+      (sources."debug-2.6.1" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -23295,14 +23426,14 @@ in
           sources."tryit-1.0.3"
         ];
       })
-      (sources."js-yaml-3.7.0" // {
+      (sources."js-yaml-3.8.1" // {
         dependencies = [
           (sources."argparse-1.0.9" // {
             dependencies = [
               sources."sprintf-js-1.0.3"
             ];
           })
-          sources."esprima-2.7.3"
+          sources."esprima-3.1.3"
         ];
       })
       (sources."json-stable-stringify-1.0.1" // {
@@ -23359,7 +23490,7 @@ in
       sources."strip-json-comments-2.0.1"
       (sources."table-3.8.3" // {
         dependencies = [
-          (sources."ajv-4.11.2" // {
+          (sources."ajv-4.11.3" // {
             dependencies = [
               sources."co-4.6.0"
             ];
@@ -23625,7 +23756,7 @@ in
               (sources."fsevents-1.0.17" // {
                 dependencies = [
                   sources."nan-2.5.1"
-                  (sources."node-pre-gyp-0.6.32" // {
+                  (sources."node-pre-gyp-0.6.33" // {
                     dependencies = [
                       (sources."mkdirp-0.5.1" // {
                         dependencies = [
@@ -23655,10 +23786,9 @@ in
                             ];
                           })
                           sources."console-control-strings-1.1.0"
-                          (sources."gauge-2.7.2" // {
+                          (sources."gauge-2.7.3" // {
                             dependencies = [
-                              sources."aproba-1.0.4"
-                              sources."supports-color-0.2.0"
+                              sources."aproba-1.1.1"
                               sources."has-unicode-2.0.1"
                               sources."object-assign-4.1.1"
                               sources."signal-exit-3.0.2"
@@ -23694,7 +23824,7 @@ in
                       (sources."request-2.79.0" // {
                         dependencies = [
                           sources."aws-sign2-0.6.0"
-                          sources."aws4-1.5.0"
+                          sources."aws4-1.6.0"
                           sources."caseless-0.11.0"
                           (sources."combined-stream-1.0.5" // {
                             dependencies = [
@@ -23775,7 +23905,7 @@ in
                                   sources."assert-plus-1.0.0"
                                   sources."dashdash-1.14.1"
                                   sources."getpass-0.1.6"
-                                  sources."jsbn-0.1.0"
+                                  sources."jsbn-0.1.1"
                                   sources."tweetnacl-0.14.5"
                                   sources."jodid25519-1.0.2"
                                   sources."ecc-jsbn-0.1.1"
@@ -24239,7 +24369,7 @@ in
       })
       (sources."xml2js-0.4.17" // {
         dependencies = [
-          sources."sax-1.2.1"
+          sources."sax-1.2.2"
           (sources."xmlbuilder-4.2.1" // {
             dependencies = [
               sources."lodash-4.17.4"
@@ -24973,13 +25103,14 @@ in
           })
         ];
       })
-      (sources."js-yaml-3.7.0" // {
+      (sources."js-yaml-3.8.1" // {
         dependencies = [
           (sources."argparse-1.0.9" // {
             dependencies = [
               sources."sprintf-js-1.0.3"
             ];
           })
+          sources."esprima-3.1.3"
         ];
       })
       (sources."mkdirp-0.5.1" // {
@@ -25149,10 +25280,10 @@ in
   js-yaml = nodeEnv.buildNodePackage {
     name = "js-yaml";
     packageName = "js-yaml";
-    version = "3.7.0";
+    version = "3.8.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz";
-      sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80";
+      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.1.tgz";
+      sha1 = "782ba50200be7b9e5a8537001b7804db3ad02628";
     };
     dependencies = [
       (sources."argparse-1.0.9" // {
@@ -25160,7 +25291,7 @@ in
           sources."sprintf-js-1.0.3"
         ];
       })
-      sources."esprima-2.7.3"
+      sources."esprima-3.1.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -25180,11 +25311,11 @@ in
     };
     dependencies = [
       sources."bluebird-3.4.7"
-      (sources."body-parser-1.16.0" // {
+      (sources."body-parser-1.16.1" // {
         dependencies = [
           sources."bytes-2.4.0"
           sources."content-type-1.0.2"
-          (sources."debug-2.6.0" // {
+          (sources."debug-2.6.1" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -25328,7 +25459,7 @@ in
           (sources."fsevents-1.0.17" // {
             dependencies = [
               sources."nan-2.5.1"
-              (sources."node-pre-gyp-0.6.32" // {
+              (sources."node-pre-gyp-0.6.33" // {
                 dependencies = [
                   (sources."mkdirp-0.5.1" // {
                     dependencies = [
@@ -25358,10 +25489,9 @@ in
                         ];
                       })
                       sources."console-control-strings-1.1.0"
-                      (sources."gauge-2.7.2" // {
+                      (sources."gauge-2.7.3" // {
                         dependencies = [
-                          sources."aproba-1.0.4"
-                          sources."supports-color-0.2.0"
+                          sources."aproba-1.1.1"
                           sources."has-unicode-2.0.1"
                           sources."object-assign-4.1.1"
                           sources."signal-exit-3.0.2"
@@ -25397,7 +25527,7 @@ in
                   (sources."request-2.79.0" // {
                     dependencies = [
                       sources."aws-sign2-0.6.0"
-                      sources."aws4-1.5.0"
+                      sources."aws4-1.6.0"
                       sources."caseless-0.11.0"
                       (sources."combined-stream-1.0.5" // {
                         dependencies = [
@@ -25478,7 +25608,7 @@ in
                               sources."assert-plus-1.0.0"
                               sources."dashdash-1.14.1"
                               sources."getpass-0.1.6"
-                              sources."jsbn-0.1.0"
+                              sources."jsbn-0.1.1"
                               sources."tweetnacl-0.14.5"
                               sources."jodid25519-1.0.2"
                               sources."ecc-jsbn-0.1.1"
@@ -25787,7 +25917,7 @@ in
           sources."os-tmpdir-1.0.2"
         ];
       })
-      (sources."useragent-2.1.11" // {
+      (sources."useragent-2.1.12" // {
         dependencies = [
           sources."lru-cache-2.2.4"
         ];
@@ -26097,7 +26227,7 @@ in
       sources."connect-restreamer-1.0.3"
       (sources."xml2js-0.4.17" // {
         dependencies = [
-          sources."sax-1.2.1"
+          sources."sax-1.2.2"
           (sources."xmlbuilder-4.2.1" // {
             dependencies = [
               sources."lodash-4.17.4"
@@ -26413,6 +26543,94 @@ in
     };
     production = true;
   };
+  mocha = nodeEnv.buildNodePackage {
+    name = "mocha";
+    packageName = "mocha";
+    version = "3.2.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/mocha/-/mocha-3.2.0.tgz";
+      sha1 = "7dc4f45e5088075171a68896814e6ae9eb7a85e3";
+    };
+    dependencies = [
+      sources."browser-stdout-1.3.0"
+      (sources."commander-2.9.0" // {
+        dependencies = [
+          sources."graceful-readlink-1.0.1"
+        ];
+      })
+      (sources."debug-2.2.0" // {
+        dependencies = [
+          sources."ms-0.7.1"
+        ];
+      })
+      sources."diff-1.4.0"
+      sources."escape-string-regexp-1.0.5"
+      (sources."glob-7.0.5" // {
+        dependencies = [
+          sources."fs.realpath-1.0.0"
+          (sources."inflight-1.0.6" // {
+            dependencies = [
+              sources."wrappy-1.0.2"
+            ];
+          })
+          sources."inherits-2.0.3"
+          (sources."minimatch-3.0.3" // {
+            dependencies = [
+              (sources."brace-expansion-1.1.6" // {
+                dependencies = [
+                  sources."balanced-match-0.4.2"
+                  sources."concat-map-0.0.1"
+                ];
+              })
+            ];
+          })
+          (sources."once-1.4.0" // {
+            dependencies = [
+              sources."wrappy-1.0.2"
+            ];
+          })
+          sources."path-is-absolute-1.0.1"
+        ];
+      })
+      sources."growl-1.9.2"
+      sources."json3-3.3.2"
+      (sources."lodash.create-3.1.1" // {
+        dependencies = [
+          (sources."lodash._baseassign-3.2.0" // {
+            dependencies = [
+              sources."lodash._basecopy-3.0.1"
+              (sources."lodash.keys-3.1.2" // {
+                dependencies = [
+                  sources."lodash._getnative-3.9.1"
+                  sources."lodash.isarguments-3.1.0"
+                  sources."lodash.isarray-3.0.4"
+                ];
+              })
+            ];
+          })
+          sources."lodash._basecreate-3.0.3"
+          sources."lodash._isiterateecall-3.0.9"
+        ];
+      })
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
+      (sources."supports-color-3.1.2" // {
+        dependencies = [
+          sources."has-flag-1.0.0"
+        ];
+      })
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "simple, flexible, fun test framework";
+      homepage = https://mochajs.org/;
+      license = "MIT";
+    };
+    production = true;
+  };
   nijs = nodeEnv.buildNodePackage {
     name = "nijs";
     packageName = "nijs";
@@ -26471,7 +26689,7 @@ in
           })
           (sources."normalize-package-data-2.3.5" // {
             dependencies = [
-              sources."hosted-git-info-2.1.5"
+              sources."hosted-git-info-2.2.0"
               (sources."is-builtin-module-1.0.0" // {
                 dependencies = [
                   sources."builtin-modules-1.1.1"
@@ -26491,7 +26709,7 @@ in
           })
           (sources."npm-package-arg-4.2.0" // {
             dependencies = [
-              sources."hosted-git-info-2.1.5"
+              sources."hosted-git-info-2.2.0"
             ];
           })
           (sources."once-1.4.0" // {
@@ -26502,7 +26720,7 @@ in
           (sources."request-2.79.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
-              sources."aws4-1.5.0"
+              sources."aws4-1.6.0"
               sources."caseless-0.11.0"
               (sources."combined-stream-1.0.5" // {
                 dependencies = [
@@ -26583,7 +26801,7 @@ in
                       sources."assert-plus-1.0.0"
                       sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
-                      sources."jsbn-0.1.0"
+                      sources."jsbn-0.1.1"
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
@@ -26661,7 +26879,7 @@ in
               sources."console-control-strings-1.1.0"
               (sources."gauge-2.6.0" // {
                 dependencies = [
-                  sources."aproba-1.0.4"
+                  sources."aproba-1.1.1"
                   sources."has-color-0.1.7"
                   sources."has-unicode-2.0.1"
                   sources."object-assign-4.1.1"
@@ -26878,10 +27096,9 @@ in
             ];
           })
           sources."console-control-strings-1.1.0"
-          (sources."gauge-2.7.2" // {
+          (sources."gauge-2.7.3" // {
             dependencies = [
-              sources."aproba-1.0.4"
-              sources."supports-color-0.2.0"
+              sources."aproba-1.1.1"
               sources."has-unicode-2.0.1"
               sources."object-assign-4.1.1"
               sources."signal-exit-3.0.2"
@@ -26915,7 +27132,7 @@ in
       (sources."request-2.79.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
-          sources."aws4-1.5.0"
+          sources."aws4-1.6.0"
           sources."caseless-0.11.0"
           (sources."combined-stream-1.0.5" // {
             dependencies = [
@@ -26996,7 +27213,7 @@ in
                   sources."assert-plus-1.0.0"
                   sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
-                  sources."jsbn-0.1.0"
+                  sources."jsbn-0.1.1"
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
@@ -27128,7 +27345,7 @@ in
                       sources."map-obj-1.0.1"
                       (sources."normalize-package-data-2.3.5" // {
                         dependencies = [
-                          sources."hosted-git-info-2.1.5"
+                          sources."hosted-git-info-2.2.0"
                           (sources."is-builtin-module-1.0.0" // {
                             dependencies = [
                               sources."builtin-modules-1.1.1"
@@ -27237,7 +27454,7 @@ in
           })
         ];
       })
-      (sources."debug-2.6.0" // {
+      (sources."debug-2.6.1" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -27372,7 +27589,7 @@ in
       (sources."v8-debug-0.7.7" // {
         dependencies = [
           sources."nan-2.5.1"
-          (sources."node-pre-gyp-0.6.32" // {
+          (sources."node-pre-gyp-0.6.33" // {
             dependencies = [
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
@@ -27403,10 +27620,9 @@ in
                     ];
                   })
                   sources."console-control-strings-1.1.0"
-                  (sources."gauge-2.7.2" // {
+                  (sources."gauge-2.7.3" // {
                     dependencies = [
-                      sources."aproba-1.0.4"
-                      sources."supports-color-0.2.0"
+                      sources."aproba-1.1.1"
                       sources."has-unicode-2.0.1"
                       sources."object-assign-4.1.1"
                       sources."signal-exit-3.0.2"
@@ -27434,7 +27650,7 @@ in
               (sources."request-2.79.0" // {
                 dependencies = [
                   sources."aws-sign2-0.6.0"
-                  sources."aws4-1.5.0"
+                  sources."aws4-1.6.0"
                   sources."caseless-0.11.0"
                   (sources."combined-stream-1.0.5" // {
                     dependencies = [
@@ -27515,7 +27731,7 @@ in
                           sources."assert-plus-1.0.0"
                           sources."dashdash-1.14.1"
                           sources."getpass-0.1.6"
-                          sources."jsbn-0.1.0"
+                          sources."jsbn-0.1.1"
                           sources."tweetnacl-0.14.5"
                           sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
@@ -27640,7 +27856,7 @@ in
       (sources."v8-profiler-5.6.5" // {
         dependencies = [
           sources."nan-2.5.1"
-          (sources."node-pre-gyp-0.6.32" // {
+          (sources."node-pre-gyp-0.6.33" // {
             dependencies = [
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
@@ -27671,10 +27887,9 @@ in
                     ];
                   })
                   sources."console-control-strings-1.1.0"
-                  (sources."gauge-2.7.2" // {
+                  (sources."gauge-2.7.3" // {
                     dependencies = [
-                      sources."aproba-1.0.4"
-                      sources."supports-color-0.2.0"
+                      sources."aproba-1.1.1"
                       sources."has-unicode-2.0.1"
                       sources."object-assign-4.1.1"
                       sources."signal-exit-3.0.2"
@@ -27702,7 +27917,7 @@ in
               (sources."request-2.79.0" // {
                 dependencies = [
                   sources."aws-sign2-0.6.0"
-                  sources."aws4-1.5.0"
+                  sources."aws4-1.6.0"
                   sources."caseless-0.11.0"
                   (sources."combined-stream-1.0.5" // {
                     dependencies = [
@@ -27783,7 +27998,7 @@ in
                           sources."assert-plus-1.0.0"
                           sources."dashdash-1.14.1"
                           sources."getpass-0.1.6"
-                          sources."jsbn-0.1.0"
+                          sources."jsbn-0.1.1"
                           sources."tweetnacl-0.14.5"
                           sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
@@ -28004,10 +28219,9 @@ in
             ];
           })
           sources."console-control-strings-1.1.0"
-          (sources."gauge-2.7.2" // {
+          (sources."gauge-2.7.3" // {
             dependencies = [
-              sources."aproba-1.0.4"
-              sources."supports-color-0.2.0"
+              sources."aproba-1.1.1"
               sources."has-unicode-2.0.1"
               sources."object-assign-4.1.1"
               sources."signal-exit-3.0.2"
@@ -28043,7 +28257,7 @@ in
       (sources."request-2.79.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
-          sources."aws4-1.5.0"
+          sources."aws4-1.6.0"
           sources."caseless-0.11.0"
           (sources."combined-stream-1.0.5" // {
             dependencies = [
@@ -28124,7 +28338,7 @@ in
                   sources."assert-plus-1.0.0"
                   sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
-                  sources."jsbn-0.1.0"
+                  sources."jsbn-0.1.1"
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
@@ -28369,7 +28583,7 @@ in
           (sources."fsevents-1.0.17" // {
             dependencies = [
               sources."nan-2.5.1"
-              (sources."node-pre-gyp-0.6.32" // {
+              (sources."node-pre-gyp-0.6.33" // {
                 dependencies = [
                   (sources."mkdirp-0.5.1" // {
                     dependencies = [
@@ -28399,10 +28613,9 @@ in
                         ];
                       })
                       sources."console-control-strings-1.1.0"
-                      (sources."gauge-2.7.2" // {
+                      (sources."gauge-2.7.3" // {
                         dependencies = [
-                          sources."aproba-1.0.4"
-                          sources."supports-color-0.2.0"
+                          sources."aproba-1.1.1"
                           sources."has-unicode-2.0.1"
                           sources."object-assign-4.1.1"
                           sources."signal-exit-3.0.2"
@@ -28438,7 +28651,7 @@ in
                   (sources."request-2.79.0" // {
                     dependencies = [
                       sources."aws-sign2-0.6.0"
-                      sources."aws4-1.5.0"
+                      sources."aws4-1.6.0"
                       sources."caseless-0.11.0"
                       (sources."combined-stream-1.0.5" // {
                         dependencies = [
@@ -28519,7 +28732,7 @@ in
                               sources."assert-plus-1.0.0"
                               sources."dashdash-1.14.1"
                               sources."getpass-0.1.6"
-                              sources."jsbn-0.1.0"
+                              sources."jsbn-0.1.1"
                               sources."tweetnacl-0.14.5"
                               sources."jodid25519-1.0.2"
                               sources."ecc-jsbn-0.1.1"
@@ -28615,7 +28828,7 @@ in
           })
         ];
       })
-      (sources."debug-2.6.0" // {
+      (sources."debug-2.6.1" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -29069,7 +29282,7 @@ in
       })
       (sources."follow-redirects-1.2.1" // {
         dependencies = [
-          (sources."debug-2.6.0" // {
+          (sources."debug-2.6.1" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -29359,7 +29572,7 @@ in
         dependencies = [
           sources."uid2-0.0.3"
           sources."utils-merge-1.0.0"
-          (sources."debug-2.6.0" // {
+          (sources."debug-2.6.1" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -29451,7 +29664,7 @@ in
       })
       (sources."xml2js-0.4.17" // {
         dependencies = [
-          sources."sax-1.2.1"
+          sources."sax-1.2.2"
           (sources."xmlbuilder-4.2.1" // {
             dependencies = [
               sources."lodash-4.17.4"
@@ -29479,7 +29692,7 @@ in
           (sources."request-2.74.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
-              sources."aws4-1.5.0"
+              sources."aws4-1.6.0"
               (sources."bl-1.1.2" // {
                 dependencies = [
                   (sources."readable-stream-2.0.6" // {
@@ -29578,7 +29791,7 @@ in
                       sources."assert-plus-1.0.0"
                       sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
-                      sources."jsbn-0.1.0"
+                      sources."jsbn-0.1.1"
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
@@ -29608,7 +29821,7 @@ in
           })
         ];
       })
-      (sources."node-red-node-email-0.1.15" // {
+      (sources."node-red-node-email-0.1.16" // {
         dependencies = [
           (sources."nodemailer-1.11.0" // {
             dependencies = [
@@ -29628,7 +29841,7 @@ in
                       sources."libqp-1.1.0"
                       (sources."needle-0.10.0" // {
                         dependencies = [
-                          (sources."debug-2.6.0" // {
+                          (sources."debug-2.6.1" // {
                             dependencies = [
                               sources."ms-0.7.2"
                             ];
@@ -29642,7 +29855,7 @@ in
               })
               (sources."needle-0.11.0" // {
                 dependencies = [
-                  (sources."debug-2.6.0" // {
+                  (sources."debug-2.6.1" // {
                     dependencies = [
                       sources."ms-0.7.2"
                     ];
@@ -29716,7 +29929,7 @@ in
           (sources."request-2.79.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
-              sources."aws4-1.5.0"
+              sources."aws4-1.6.0"
               sources."caseless-0.11.0"
               (sources."combined-stream-1.0.5" // {
                 dependencies = [
@@ -29797,7 +30010,7 @@ in
                       sources."assert-plus-1.0.0"
                       sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
-                      sources."jsbn-0.1.0"
+                      sources."jsbn-0.1.1"
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
@@ -29858,10 +30071,9 @@ in
                     ];
                   })
                   sources."console-control-strings-1.1.0"
-                  (sources."gauge-2.7.2" // {
+                  (sources."gauge-2.7.3" // {
                     dependencies = [
-                      sources."aproba-1.0.4"
-                      sources."supports-color-0.2.0"
+                      sources."aproba-1.1.1"
                       sources."has-unicode-2.0.1"
                       sources."object-assign-4.1.1"
                       sources."signal-exit-3.0.2"
@@ -29897,7 +30109,7 @@ in
               (sources."request-2.79.0" // {
                 dependencies = [
                   sources."aws-sign2-0.6.0"
-                  sources."aws4-1.5.0"
+                  sources."aws4-1.6.0"
                   sources."caseless-0.11.0"
                   (sources."combined-stream-1.0.5" // {
                     dependencies = [
@@ -29978,7 +30190,7 @@ in
                           sources."assert-plus-1.0.0"
                           sources."dashdash-1.14.1"
                           sources."getpass-0.1.6"
-                          sources."jsbn-0.1.0"
+                          sources."jsbn-0.1.1"
                           sources."tweetnacl-0.14.5"
                           sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
@@ -30162,7 +30374,7 @@ in
             ];
           })
           sources."cookie-signature-1.0.1"
-          (sources."debug-2.6.0" // {
+          (sources."debug-2.6.1" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -30302,10 +30514,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "4.1.2";
+    version = "4.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-4.1.2.tgz";
-      sha1 = "daaa77d631947135b36528c304573243f5cd2e07";
+      url = "https://registry.npmjs.org/npm/-/npm-4.2.0.tgz";
+      sha1 = "d4eeb6791b996fe3085535d749338d1fe48df13a";
     };
     dependencies = [
       (sources."JSONStream-1.3.0" // {
@@ -30315,6 +30527,7 @@ in
         ];
       })
       sources."abbrev-1.0.9"
+      sources."ansi-regex-2.1.1"
       sources."ansicolors-0.3.2"
       sources."ansistyles-0.1.3"
       sources."aproba-1.0.4"
@@ -30417,7 +30630,7 @@ in
       sources."lodash.union-4.6.0"
       sources."lodash.uniq-4.5.0"
       sources."lodash.without-4.4.0"
-      (sources."mississippi-1.2.0" // {
+      (sources."mississippi-1.3.0" // {
         dependencies = [
           (sources."concat-stream-1.6.0" // {
             dependencies = [
@@ -30441,6 +30654,11 @@ in
           })
           sources."flush-write-stream-1.0.2"
           sources."from2-2.3.0"
+          (sources."parallel-transform-1.1.0" // {
+            dependencies = [
+              sources."cyclist-0.2.2"
+            ];
+          })
           sources."pump-1.0.2"
           sources."pumpify-1.3.5"
           (sources."stream-each-1.2.0" // {
@@ -30507,9 +30725,8 @@ in
             ];
           })
           sources."console-control-strings-1.1.0"
-          (sources."gauge-2.7.2" // {
+          (sources."gauge-2.7.3" // {
             dependencies = [
-              sources."supports-color-0.2.0"
               sources."object-assign-4.1.1"
               sources."signal-exit-3.0.2"
               (sources."string-width-1.0.2" // {
@@ -30587,7 +30804,7 @@ in
       (sources."request-2.79.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
-          sources."aws4-1.5.0"
+          sources."aws4-1.6.0"
           sources."caseless-0.11.0"
           (sources."combined-stream-1.0.5" // {
             dependencies = [
@@ -30659,7 +30876,7 @@ in
                   sources."assert-plus-1.0.0"
                   sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
-                  sources."jsbn-0.1.0"
+                  sources."jsbn-0.1.1"
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
@@ -30741,7 +30958,6 @@ in
       })
       sources."wrappy-1.0.2"
       sources."write-file-atomic-1.3.1"
-      sources."ansi-regex-2.1.1"
       sources."debuglog-1.0.1"
       sources."imurmurhash-0.1.4"
       sources."lodash._baseindexof-3.1.0"
@@ -30792,7 +31008,7 @@ in
           (sources."request-2.79.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
-              sources."aws4-1.5.0"
+              sources."aws4-1.6.0"
               sources."caseless-0.11.0"
               (sources."combined-stream-1.0.5" // {
                 dependencies = [
@@ -30873,7 +31089,7 @@ in
                       sources."assert-plus-1.0.0"
                       sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
-                      sources."jsbn-0.1.0"
+                      sources."jsbn-0.1.1"
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
@@ -30959,10 +31175,9 @@ in
                 ];
               })
               sources."console-control-strings-1.1.0"
-              (sources."gauge-2.7.2" // {
+              (sources."gauge-2.7.3" // {
                 dependencies = [
-                  sources."aproba-1.0.4"
-                  sources."supports-color-0.2.0"
+                  sources."aproba-1.1.1"
                   sources."has-unicode-2.0.1"
                   sources."object-assign-4.1.1"
                   sources."signal-exit-3.0.2"
@@ -31105,10 +31320,10 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "2.8.10";
+    version = "2.10.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.10.tgz";
-      sha1 = "20a65b4293a4594df74e98dbc5cfbddee39a756b";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.2.tgz";
+      sha1 = "9614c58ec84d31702a85881c844c3fb93611a585";
     };
     dependencies = [
       sources."bluebird-3.4.7"
@@ -31314,7 +31529,7 @@ in
                 dependencies = [
                   (sources."array-index-1.0.0" // {
                     dependencies = [
-                      (sources."debug-2.6.0" // {
+                      (sources."debug-2.6.1" // {
                         dependencies = [
                           sources."ms-0.7.2"
                         ];
@@ -31406,9 +31621,8 @@ in
                 ];
               })
               sources."console-control-strings-1.1.0"
-              (sources."gauge-2.7.2" // {
+              (sources."gauge-2.7.3" // {
                 dependencies = [
-                  sources."supports-color-0.2.0"
                   sources."object-assign-4.1.1"
                   sources."signal-exit-3.0.2"
                   (sources."string-width-1.0.2" // {
@@ -31481,7 +31695,7 @@ in
           (sources."request-2.75.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
-              sources."aws4-1.5.0"
+              sources."aws4-1.6.0"
               (sources."bl-1.1.2" // {
                 dependencies = [
                   (sources."readable-stream-2.0.6" // {
@@ -31553,7 +31767,7 @@ in
                       sources."assert-plus-1.0.0"
                       sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
-                      sources."jsbn-0.1.0"
+                      sources."jsbn-0.1.1"
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
@@ -31826,11 +32040,11 @@ in
           sources."is-arguments-1.0.2"
         ];
       })
-      (sources."body-parser-1.16.0" // {
+      (sources."body-parser-1.16.1" // {
         dependencies = [
           sources."bytes-2.4.0"
           sources."content-type-1.0.2"
-          (sources."debug-2.6.0" // {
+          (sources."debug-2.6.1" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -32126,14 +32340,14 @@ in
           sources."gelfling-0.2.0"
         ];
       })
-      (sources."js-yaml-3.7.0" // {
+      (sources."js-yaml-3.8.1" // {
         dependencies = [
           (sources."argparse-1.0.9" // {
             dependencies = [
               sources."sprintf-js-1.0.3"
             ];
           })
-          sources."esprima-2.7.3"
+          sources."esprima-3.1.3"
         ];
       })
       sources."mediawiki-title-0.5.6"
@@ -32144,7 +32358,7 @@ in
       (sources."request-2.79.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
-          sources."aws4-1.5.0"
+          sources."aws4-1.6.0"
           sources."caseless-0.11.0"
           (sources."combined-stream-1.0.5" // {
             dependencies = [
@@ -32225,7 +32439,7 @@ in
                   sources."assert-plus-1.0.0"
                   sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
-                  sources."jsbn-0.1.0"
+                  sources."jsbn-0.1.1"
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
@@ -32263,7 +32477,7 @@ in
           sources."parseurl-1.3.1"
         ];
       })
-      (sources."service-runner-2.1.13" // {
+      (sources."service-runner-2.1.15" // {
         dependencies = [
           sources."bluebird-3.4.7"
           (sources."bunyan-1.8.5" // {
@@ -32363,8 +32577,9 @@ in
               })
             ];
           })
-          (sources."yargs-5.0.0" // {
+          (sources."yargs-6.6.0" // {
             dependencies = [
+              sources."camelcase-3.0.0"
               (sources."cliui-3.2.0" // {
                 dependencies = [
                   (sources."strip-ansi-3.0.1" // {
@@ -32377,7 +32592,6 @@ in
               })
               sources."decamelize-1.2.0"
               sources."get-caller-file-1.0.2"
-              sources."lodash.assign-4.2.0"
               (sources."os-locale-1.4.0" // {
                 dependencies = [
                   (sources."lcid-1.0.0" // {
@@ -32428,7 +32642,7 @@ in
                       })
                       (sources."normalize-package-data-2.3.5" // {
                         dependencies = [
-                          sources."hosted-git-info-2.1.5"
+                          sources."hosted-git-info-2.2.0"
                           (sources."is-builtin-module-1.0.0" // {
                             dependencies = [
                               sources."builtin-modules-1.1.1"
@@ -32480,13 +32694,8 @@ in
                 ];
               })
               sources."which-module-1.0.0"
-              sources."window-size-0.2.0"
               sources."y18n-3.2.1"
-              (sources."yargs-parser-3.2.0" // {
-                dependencies = [
-                  sources."camelcase-3.0.0"
-                ];
-              })
+              sources."yargs-parser-4.2.1"
             ];
           })
         ];
@@ -32557,7 +32766,7 @@ in
                   })
                   (sources."normalize-package-data-2.3.5" // {
                     dependencies = [
-                      sources."hosted-git-info-2.1.5"
+                      sources."hosted-git-info-2.2.0"
                       (sources."is-builtin-module-1.0.0" // {
                         dependencies = [
                           sources."builtin-modules-1.1.1"
@@ -32790,7 +32999,7 @@ in
                   sources."map-obj-1.0.1"
                   (sources."normalize-package-data-2.3.5" // {
                     dependencies = [
-                      sources."hosted-git-info-2.1.5"
+                      sources."hosted-git-info-2.2.0"
                       (sources."is-builtin-module-1.0.0" // {
                         dependencies = [
                           sources."builtin-modules-1.1.1"
@@ -33082,9 +33291,9 @@ in
                   sources."minimist-0.0.8"
                 ];
               })
-              (sources."random-access-file-1.4.0" // {
+              (sources."random-access-file-1.5.0" // {
                 dependencies = [
-                  (sources."debug-2.6.0" // {
+                  (sources."debug-2.6.1" // {
                     dependencies = [
                       sources."ms-0.7.2"
                     ];
@@ -33094,7 +33303,7 @@ in
               })
               sources."randombytes-2.0.3"
               sources."run-parallel-1.1.6"
-              sources."thunky-1.0.1"
+              sources."thunky-1.0.2"
             ];
           })
           sources."hat-0.0.3"
@@ -33204,7 +33413,7 @@ in
                           sources."randombytes-2.0.3"
                         ];
                       })
-                      (sources."k-rpc-socket-1.6.1" // {
+                      (sources."k-rpc-socket-1.6.2" // {
                         dependencies = [
                           sources."bencode-0.11.0"
                         ];
@@ -33238,7 +33447,7 @@ in
                       sources."unzip-response-2.0.1"
                     ];
                   })
-                  (sources."simple-peer-6.2.1" // {
+                  (sources."simple-peer-6.2.2" // {
                     dependencies = [
                       sources."get-browser-rtc-1.0.2"
                       sources."randombytes-2.0.3"
@@ -33254,7 +33463,7 @@ in
                       })
                     ];
                   })
-                  (sources."simple-websocket-4.2.0" // {
+                  (sources."simple-websocket-4.3.0" // {
                     dependencies = [
                       (sources."readable-stream-2.2.2" // {
                         dependencies = [
@@ -33266,6 +33475,11 @@ in
                           sources."util-deprecate-1.0.2"
                         ];
                       })
+                      (sources."ws-2.0.3" // {
+                        dependencies = [
+                          sources."ultron-1.1.0"
+                        ];
+                      })
                     ];
                   })
                   (sources."string2compact-1.2.2" // {
@@ -33283,7 +33497,7 @@ in
                   })
                 ];
               })
-              (sources."debug-2.6.0" // {
+              (sources."debug-2.6.1" // {
                 dependencies = [
                   sources."ms-0.7.2"
                 ];
@@ -33657,7 +33871,7 @@ in
               sources."addr-to-ip-port-1.4.2"
               sources."bencode-0.7.0"
               sources."buffer-equal-0.0.1"
-              (sources."debug-2.6.0" // {
+              (sources."debug-2.6.1" // {
                 dependencies = [
                   sources."ms-0.7.2"
                 ];
@@ -33694,7 +33908,7 @@ in
               sources."bencode-0.6.0"
               sources."bn.js-1.3.0"
               sources."buffer-equal-0.0.1"
-              (sources."debug-2.6.0" // {
+              (sources."debug-2.6.1" // {
                 dependencies = [
                   sources."ms-0.7.2"
                 ];
@@ -34004,7 +34218,7 @@ in
                   sources."assert-plus-1.0.0"
                   sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
-                  sources."jsbn-0.1.0"
+                  sources."jsbn-0.1.1"
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
@@ -34150,11 +34364,11 @@ in
               sources."minimist-0.0.8"
             ];
           })
-          sources."private-0.1.6"
+          sources."private-0.1.7"
           sources."q-1.4.1"
-          (sources."recast-0.11.20" // {
+          (sources."recast-0.11.21" // {
             dependencies = [
-              sources."ast-types-0.9.4"
+              sources."ast-types-0.9.5"
               sources."esprima-3.1.3"
               sources."source-map-0.5.6"
             ];
@@ -34194,7 +34408,7 @@ in
         dependencies = [
           (sources."xml2js-0.2.4" // {
             dependencies = [
-              sources."sax-1.2.1"
+              sources."sax-1.2.2"
             ];
           })
           sources."xmlbuilder-0.4.2"
@@ -34250,7 +34464,7 @@ in
             ];
           })
           sources."cookie-signature-1.0.1"
-          (sources."debug-2.6.0" // {
+          (sources."debug-2.6.1" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -34282,7 +34496,7 @@ in
               (sources."request-2.79.0" // {
                 dependencies = [
                   sources."aws-sign2-0.6.0"
-                  sources."aws4-1.5.0"
+                  sources."aws4-1.6.0"
                   sources."caseless-0.11.0"
                   (sources."combined-stream-1.0.5" // {
                     dependencies = [
@@ -34363,7 +34577,7 @@ in
                           sources."assert-plus-1.0.0"
                           sources."dashdash-1.14.1"
                           sources."getpass-0.1.6"
-                          sources."jsbn-0.1.0"
+                          sources."jsbn-0.1.1"
                           sources."tweetnacl-0.14.5"
                           sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
@@ -34396,7 +34610,7 @@ in
           })
           (sources."xml2js-0.4.17" // {
             dependencies = [
-              sources."sax-1.2.1"
+              sources."sax-1.2.2"
               (sources."xmlbuilder-4.2.1" // {
                 dependencies = [
                   sources."lodash-4.17.4"
@@ -34536,11 +34750,11 @@ in
           })
         ];
       })
-      (sources."body-parser-1.16.0" // {
+      (sources."body-parser-1.16.1" // {
         dependencies = [
           sources."bytes-2.4.0"
           sources."content-type-1.0.2"
-          (sources."debug-2.6.0" // {
+          (sources."debug-2.6.1" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -34602,14 +34816,14 @@ in
           sources."graceful-readlink-1.0.1"
         ];
       })
-      (sources."js-yaml-3.7.0" // {
+      (sources."js-yaml-3.8.1" // {
         dependencies = [
           (sources."argparse-1.0.9" // {
             dependencies = [
               sources."sprintf-js-1.0.3"
             ];
           })
-          sources."esprima-2.7.3"
+          sources."esprima-3.1.3"
         ];
       })
       (sources."cookies-0.6.2" // {
@@ -34621,7 +34835,7 @@ in
       (sources."request-2.79.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
-          sources."aws4-1.5.0"
+          sources."aws4-1.6.0"
           sources."caseless-0.11.0"
           (sources."combined-stream-1.0.5" // {
             dependencies = [
@@ -34697,7 +34911,7 @@ in
                   sources."assert-plus-1.0.0"
                   sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
-                  sources."jsbn-0.1.0"
+                  sources."jsbn-0.1.1"
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
@@ -34989,7 +35203,7 @@ in
             dependencies = [
               sources."csv-generate-0.0.6"
               sources."csv-parse-1.2.0"
-              sources."stream-transform-0.1.1"
+              sources."stream-transform-0.1.2"
               sources."csv-stringify-0.0.8"
             ];
           })
@@ -35127,7 +35341,7 @@ in
             dependencies = [
               sources."asn1-0.2.3"
               sources."assert-plus-0.2.0"
-              sources."jsbn-0.1.0"
+              sources."jsbn-0.1.1"
               sources."tweetnacl-0.14.5"
               sources."jodid25519-1.0.2"
               sources."ecc-jsbn-0.1.1"
@@ -35195,7 +35409,7 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      (sources."debug-2.6.0" // {
+      (sources."debug-2.6.1" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -35251,7 +35465,7 @@ in
       sha1 = "9f5772413952135c6fefbf40afe6a4faa88b4bb5";
     };
     dependencies = [
-      sources."sax-1.2.1"
+      sources."sax-1.2.2"
       (sources."coa-1.0.1" // {
         dependencies = [
           sources."q-1.4.1"
@@ -35424,7 +35638,7 @@ in
           (sources."request-2.69.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
-              sources."aws4-1.5.0"
+              sources."aws4-1.6.0"
               (sources."bl-1.0.3" // {
                 dependencies = [
                   (sources."readable-stream-2.0.6" // {
@@ -35523,7 +35737,7 @@ in
                       sources."assert-plus-1.0.0"
                       sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
-                      sources."jsbn-0.1.0"
+                      sources."jsbn-0.1.1"
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
@@ -35605,7 +35819,7 @@ in
       (sources."request-2.78.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
-          sources."aws4-1.5.0"
+          sources."aws4-1.6.0"
           sources."caseless-0.11.0"
           (sources."combined-stream-1.0.5" // {
             dependencies = [
@@ -35686,7 +35900,7 @@ in
                   sources."assert-plus-1.0.0"
                   sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
-                  sources."jsbn-0.1.0"
+                  sources."jsbn-0.1.1"
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
@@ -35747,10 +35961,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "2.1.5";
+    version = "2.1.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-2.1.5.tgz";
-      sha1 = "6fe9479e00e01855247cea216e7561bafcdbcd4a";
+      url = "https://registry.npmjs.org/typescript/-/typescript-2.1.6.tgz";
+      sha1 = "40c7e6e9e5da7961b7718b55505f9cac9487a607";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -35827,10 +36041,10 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.1.3";
+    version = "1.1.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.3.tgz";
-      sha1 = "d07fd8486b5f82d65b3452671d30b16c59e13303";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.7.tgz";
+      sha1 = "eb4ba66b38ec553396fe21ec338181b88c72bf4b";
     };
     dependencies = [
       sources."async-2.1.4"
@@ -36345,9 +36559,8 @@ in
                 ];
               })
               sources."console-control-strings-1.1.0"
-              (sources."gauge-2.7.2" // {
+              (sources."gauge-2.7.3" // {
                 dependencies = [
-                  sources."supports-color-0.2.0"
                   sources."object-assign-4.1.1"
                   sources."signal-exit-3.0.2"
                   (sources."string-width-1.0.2" // {
@@ -36424,7 +36637,7 @@ in
           (sources."request-2.79.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
-              sources."aws4-1.5.0"
+              sources."aws4-1.6.0"
               sources."caseless-0.11.0"
               (sources."combined-stream-1.0.5" // {
                 dependencies = [
@@ -36496,7 +36709,7 @@ in
                       sources."assert-plus-1.0.0"
                       sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
-                      sources."jsbn-0.1.0"
+                      sources."jsbn-0.1.1"
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
@@ -36619,7 +36832,7 @@ in
           sources."graceful-fs-4.1.11"
           (sources."normalize-package-data-2.3.5" // {
             dependencies = [
-              sources."hosted-git-info-2.1.5"
+              sources."hosted-git-info-2.2.0"
               (sources."is-builtin-module-1.0.0" // {
                 dependencies = [
                   sources."builtin-modules-1.1.1"
@@ -36639,7 +36852,7 @@ in
           })
           (sources."npm-package-arg-4.2.0" // {
             dependencies = [
-              sources."hosted-git-info-2.1.5"
+              sources."hosted-git-info-2.2.0"
             ];
           })
           (sources."once-1.4.0" // {
@@ -36650,7 +36863,7 @@ in
           (sources."request-2.79.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
-              sources."aws4-1.5.0"
+              sources."aws4-1.6.0"
               sources."caseless-0.11.0"
               (sources."combined-stream-1.0.5" // {
                 dependencies = [
@@ -36731,7 +36944,7 @@ in
                       sources."assert-plus-1.0.0"
                       sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
-                      sources."jsbn-0.1.0"
+                      sources."jsbn-0.1.1"
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
@@ -36781,10 +36994,9 @@ in
                 ];
               })
               sources."console-control-strings-1.1.0"
-              (sources."gauge-2.7.2" // {
+              (sources."gauge-2.7.3" // {
                 dependencies = [
-                  sources."aproba-1.0.4"
-                  sources."supports-color-0.2.0"
+                  sources."aproba-1.1.1"
                   sources."has-unicode-2.0.1"
                   sources."object-assign-4.1.1"
                   sources."signal-exit-3.0.2"
@@ -36825,7 +37037,7 @@ in
           sources."passport-strategy-1.0.0"
         ];
       })
-      (sources."raven-1.1.1" // {
+      (sources."raven-1.1.2" // {
         dependencies = [
           sources."cookie-0.3.1"
           sources."json-stringify-safe-5.0.1"
@@ -37042,7 +37254,7 @@ in
           sources."component-emitter-1.1.2"
           sources."methods-1.0.1"
           sources."cookiejar-2.0.1"
-          (sources."debug-2.6.0" // {
+          (sources."debug-2.6.1" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -37150,7 +37362,7 @@ in
                   })
                   (sources."normalize-package-data-2.3.5" // {
                     dependencies = [
-                      sources."hosted-git-info-2.1.5"
+                      sources."hosted-git-info-2.2.0"
                       (sources."is-builtin-module-1.0.0" // {
                         dependencies = [
                           sources."builtin-modules-1.1.1"
@@ -37391,7 +37603,7 @@ in
                       sources."assert-plus-1.0.0"
                       sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
-                      sources."jsbn-0.1.0"
+                      sources."jsbn-0.1.1"
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
@@ -37503,9 +37715,9 @@ in
       sha1 = "7bb1d72ae2087dd1a4af526afec15eed17dda475";
     };
     dependencies = [
-      sources."acorn-4.0.4"
+      sources."acorn-4.0.11"
       sources."acorn-dynamic-import-2.0.1"
-      (sources."ajv-4.11.2" // {
+      (sources."ajv-4.11.3" // {
         dependencies = [
           sources."co-4.6.0"
           (sources."json-stable-stringify-1.0.1" // {
@@ -37521,7 +37733,7 @@ in
           sources."lodash-4.17.4"
         ];
       })
-      (sources."enhanced-resolve-3.0.3" // {
+      (sources."enhanced-resolve-3.1.0" // {
         dependencies = [
           sources."graceful-fs-4.1.11"
           sources."object-assign-4.1.1"
@@ -37611,9 +37823,9 @@ in
                 dependencies = [
                   sources."bn.js-4.11.6"
                   sources."browserify-rsa-4.0.1"
-                  (sources."elliptic-6.3.2" // {
+                  (sources."elliptic-6.3.3" // {
                     dependencies = [
-                      sources."brorand-1.0.6"
+                      sources."brorand-1.0.7"
                       sources."hash.js-1.0.3"
                     ];
                   })
@@ -37638,9 +37850,9 @@ in
               (sources."create-ecdh-4.0.0" // {
                 dependencies = [
                   sources."bn.js-4.11.6"
-                  (sources."elliptic-6.3.2" // {
+                  (sources."elliptic-6.3.3" // {
                     dependencies = [
-                      sources."brorand-1.0.6"
+                      sources."brorand-1.0.7"
                       sources."hash.js-1.0.3"
                     ];
                   })
@@ -37659,7 +37871,7 @@ in
                   sources."bn.js-4.11.6"
                   (sources."miller-rabin-4.0.0" // {
                     dependencies = [
-                      sources."brorand-1.0.6"
+                      sources."brorand-1.0.7"
                     ];
                   })
                 ];
@@ -37922,7 +38134,7 @@ in
               (sources."fsevents-1.0.17" // {
                 dependencies = [
                   sources."nan-2.5.1"
-                  (sources."node-pre-gyp-0.6.32" // {
+                  (sources."node-pre-gyp-0.6.33" // {
                     dependencies = [
                       (sources."nopt-3.0.6" // {
                         dependencies = [
@@ -37947,10 +38159,9 @@ in
                             ];
                           })
                           sources."console-control-strings-1.1.0"
-                          (sources."gauge-2.7.2" // {
+                          (sources."gauge-2.7.3" // {
                             dependencies = [
-                              sources."aproba-1.0.4"
-                              sources."supports-color-0.2.0"
+                              sources."aproba-1.1.1"
                               sources."has-unicode-2.0.1"
                               sources."object-assign-4.1.1"
                               sources."signal-exit-3.0.2"
@@ -37986,7 +38197,7 @@ in
                       (sources."request-2.79.0" // {
                         dependencies = [
                           sources."aws-sign2-0.6.0"
-                          sources."aws4-1.5.0"
+                          sources."aws4-1.6.0"
                           sources."caseless-0.11.0"
                           (sources."combined-stream-1.0.5" // {
                             dependencies = [
@@ -38067,7 +38278,7 @@ in
                                   sources."assert-plus-1.0.0"
                                   sources."dashdash-1.14.1"
                                   sources."getpass-0.1.6"
-                                  sources."jsbn-0.1.0"
+                                  sources."jsbn-0.1.1"
                                   sources."tweetnacl-0.14.5"
                                   sources."jodid25519-1.0.2"
                                   sources."ecc-jsbn-0.1.1"
@@ -38251,7 +38462,7 @@ in
                   })
                   (sources."normalize-package-data-2.3.5" // {
                     dependencies = [
-                      sources."hosted-git-info-2.1.5"
+                      sources."hosted-git-info-2.2.0"
                       (sources."is-builtin-module-1.0.0" // {
                         dependencies = [
                           sources."builtin-modules-1.1.1"
@@ -38378,7 +38589,7 @@ in
         ];
       })
       sources."death-1.1.0"
-      (sources."debug-2.6.0" // {
+      (sources."debug-2.6.1" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -38572,10 +38783,9 @@ in
                 ];
               })
               sources."console-control-strings-1.1.0"
-              (sources."gauge-2.7.2" // {
+              (sources."gauge-2.7.3" // {
                 dependencies = [
-                  sources."aproba-1.0.4"
-                  sources."supports-color-0.2.0"
+                  sources."aproba-1.1.1"
                   sources."has-unicode-2.0.1"
                   sources."object-assign-4.1.1"
                   sources."signal-exit-3.0.2"
@@ -38637,7 +38847,7 @@ in
       (sources."request-2.79.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
-          sources."aws4-1.5.0"
+          sources."aws4-1.6.0"
           sources."caseless-0.11.0"
           (sources."combined-stream-1.0.5" // {
             dependencies = [
@@ -38696,7 +38906,7 @@ in
                   sources."assert-plus-1.0.0"
                   sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
-                  sources."jsbn-0.1.0"
+                  sources."jsbn-0.1.1"
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
@@ -38815,4 +39025,4 @@ in
     };
     production = true;
   };
-}
+}
\ No newline at end of file
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index dc11038fcd0..fd7a6ed52fc 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -400,13 +400,13 @@ let
         sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f";
       };
     };
-    "azure-arm-cdn-1.0.0" = {
+    "azure-arm-cdn-1.0.2" = {
       name = "azure-arm-cdn";
       packageName = "azure-arm-cdn";
-      version = "1.0.0";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.0.tgz";
-        sha1 = "a400b0234734eb8f7a52f5b800dd05b4f1b69f85";
+        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.2.tgz";
+        sha1 = "35eed81c93fb1b2fe1236b432c821a61bce6be96";
       };
     };
     "azure-arm-commerce-0.2.0" = {
@@ -418,13 +418,13 @@ let
         sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd";
       };
     };
-    "azure-arm-compute-0.19.1" = {
+    "azure-arm-compute-0.20.0" = {
       name = "azure-arm-compute";
       packageName = "azure-arm-compute";
-      version = "0.19.1";
+      version = "0.20.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.19.1.tgz";
-        sha1 = "04bd00758cfcc6fac616a4cf336bbdf83ab1decd";
+        url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.20.0.tgz";
+        sha1 = "f6d81c1e6093f4abae2d153a7b856963f5085e32";
       };
     };
     "azure-arm-datalake-analytics-1.0.1-preview" = {
@@ -535,13 +535,13 @@ let
         sha1 = "6972dd9844a0d12376d74014b541c49247caa37d";
       };
     };
-    "azure-arm-rediscache-0.2.1" = {
+    "azure-arm-rediscache-0.2.3" = {
       name = "azure-arm-rediscache";
       packageName = "azure-arm-rediscache";
-      version = "0.2.1";
+      version = "0.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.1.tgz";
-        sha1 = "22e516e7519dd12583e174cca4eeb3b20c993d02";
+        url = "https://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.3.tgz";
+        sha1 = "b6898abe8b4c3e1b2ec5be82689ef212bc2b1a06";
       };
     };
     "azure-arm-devtestlabs-0.1.0" = {
@@ -724,13 +724,13 @@ let
         sha1 = "21b23f9db7f42734e97f35bd703818a1cf2492eb";
       };
     };
-    "azure-servicefabric-0.1.4" = {
+    "azure-servicefabric-0.1.5" = {
       name = "azure-servicefabric";
       packageName = "azure-servicefabric";
-      version = "0.1.4";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-0.1.4.tgz";
-        sha1 = "7f8d7e7949202e599638fd8abba8f1dc1a89f79e";
+        url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-0.1.5.tgz";
+        sha1 = "bdc4b378292490ce77e788ee189f291ce5ae25a6";
       };
     };
     "applicationinsights-0.16.0" = {
@@ -1687,13 +1687,13 @@ let
         sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f";
       };
     };
-    "aws4-1.5.0" = {
+    "aws4-1.6.0" = {
       name = "aws4";
       packageName = "aws4";
-      version = "1.5.0";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz";
-        sha1 = "0a29ffb79c31c9e712eeb087e8e7a64b4a56d755";
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz";
+        sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e";
       };
     };
     "bl-1.1.2" = {
@@ -2155,13 +2155,13 @@ let
         sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6";
       };
     };
-    "jsbn-0.1.0" = {
+    "jsbn-0.1.1" = {
       name = "jsbn";
       packageName = "jsbn";
-      version = "0.1.0";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz";
-        sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd";
+        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz";
+        sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
       };
     };
     "tweetnacl-0.14.5" = {
@@ -2812,13 +2812,13 @@ let
         sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1";
       };
     };
-    "hosted-git-info-2.1.5" = {
+    "hosted-git-info-2.2.0" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
-      version = "2.1.5";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz";
-        sha1 = "0ba81d90da2e25ab34a332e6ec77936e1598118b";
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.2.0.tgz";
+        sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5";
       };
     };
     "is-builtin-module-1.0.0" = {
@@ -3091,13 +3091,13 @@ let
         sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e";
       };
     };
-    "debug-2.6.0" = {
+    "debug-2.6.1" = {
       name = "debug";
       packageName = "debug";
-      version = "2.6.0";
+      version = "2.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz";
-        sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b";
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz";
+        sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351";
       };
     };
     "ms-0.7.2" = {
@@ -3172,13 +3172,13 @@ let
         sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d";
       };
     };
-    "buffer-5.0.2" = {
+    "buffer-5.0.5" = {
       name = "buffer";
       packageName = "buffer";
-      version = "5.0.2";
+      version = "5.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-5.0.2.tgz";
-        sha1 = "41d0407ff76782e9ec19f52f88e237ce6bb0de6d";
+        url = "https://registry.npmjs.org/buffer/-/buffer-5.0.5.tgz";
+        sha1 = "35c9393244a90aff83581063d16f0882cecc9418";
       };
     };
     "cached-path-relative-1.0.0" = {
@@ -3766,13 +3766,13 @@ let
         sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524";
       };
     };
-    "elliptic-6.3.2" = {
+    "elliptic-6.3.3" = {
       name = "elliptic";
       packageName = "elliptic";
-      version = "6.3.2";
+      version = "6.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.2.tgz";
-        sha1 = "e4c81e0829cf0a65ab70e998b8232723b5c1bc48";
+        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz";
+        sha1 = "5482d9646d54bcb89fd7d994fc9e2e9568876e3f";
       };
     };
     "parse-asn1-5.0.0" = {
@@ -3784,13 +3784,13 @@ let
         sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23";
       };
     };
-    "brorand-1.0.6" = {
+    "brorand-1.0.7" = {
       name = "brorand";
       packageName = "brorand";
-      version = "1.0.6";
+      version = "1.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/brorand/-/brorand-1.0.6.tgz";
-        sha1 = "4028706b915f91f7b349a2e0bf3c376039d216e5";
+        url = "https://registry.npmjs.org/brorand/-/brorand-1.0.7.tgz";
+        sha1 = "6677fa5e4901bdbf9c9ec2a748e28dca407a9bfc";
       };
     };
     "hash.js-1.0.3" = {
@@ -4927,13 +4927,13 @@ let
         sha1 = "dd3ae8dba3e58df5c9ed3457c055177849d82854";
       };
     };
-    "random-access-file-1.4.0" = {
+    "random-access-file-1.5.0" = {
       name = "random-access-file";
       packageName = "random-access-file";
-      version = "1.4.0";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.4.0.tgz";
-        sha1 = "40972acb4d3d6f023522d08f3b2046c6d1ae5767";
+        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.5.0.tgz";
+        sha1 = "dc1b137e5922c203cc6bc8b58564be68d5269a17";
       };
     };
     "run-parallel-1.1.6" = {
@@ -4945,13 +4945,13 @@ let
         sha1 = "29003c9a2163e01e2d2dfc90575f2c6c1d61a039";
       };
     };
-    "thunky-1.0.1" = {
+    "thunky-1.0.2" = {
       name = "thunky";
       packageName = "thunky";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/thunky/-/thunky-1.0.1.tgz";
-        sha1 = "3db1525aac0367b67bd2e532d2773e7c40be2e68";
+        url = "https://registry.npmjs.org/thunky/-/thunky-1.0.2.tgz";
+        sha1 = "a862e018e3fb1ea2ec3fce5d55605cf57f247371";
       };
     };
     "ip-1.1.4" = {
@@ -5152,13 +5152,13 @@ let
         sha1 = "58cccb244f563326ba893bf5c06a35f644846daa";
       };
     };
-    "k-rpc-socket-1.6.1" = {
+    "k-rpc-socket-1.6.2" = {
       name = "k-rpc-socket";
       packageName = "k-rpc-socket";
-      version = "1.6.1";
+      version = "1.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.6.1.tgz";
-        sha1 = "bf67128f89f0c62a19cec5afc3003c280111c78e";
+        url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.6.2.tgz";
+        sha1 = "5c9e9f34a058f43ffe6512354d98957a41694f21";
       };
     };
     "bencode-0.8.0" = {
@@ -5197,22 +5197,22 @@ let
         sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9";
       };
     };
-    "simple-peer-6.2.1" = {
+    "simple-peer-6.2.2" = {
       name = "simple-peer";
       packageName = "simple-peer";
-      version = "6.2.1";
+      version = "6.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.2.1.tgz";
-        sha1 = "0d6bf982afb32cca2fabbb969dee4fceaceb99fb";
+        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.2.2.tgz";
+        sha1 = "9ea1a6e2c2e3656d04eac2a7b612e148f0d370ba";
       };
     };
-    "simple-websocket-4.2.0" = {
+    "simple-websocket-4.3.0" = {
       name = "simple-websocket";
       packageName = "simple-websocket";
-      version = "4.2.0";
+      version = "4.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.2.0.tgz";
-        sha1 = "2517742a7dafc8d44fd4e093184b6718c817f2bf";
+        url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.3.0.tgz";
+        sha1 = "062990cc94709388c31fc978dfc2a790b1b3e6ea";
       };
     };
     "string2compact-1.2.2" = {
@@ -5251,6 +5251,24 @@ let
         sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9";
       };
     };
+    "ws-2.0.3" = {
+      name = "ws";
+      packageName = "ws";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ws/-/ws-2.0.3.tgz";
+        sha1 = "532fd499c3f7d7d720e543f1f807106cfc57d9cb";
+      };
+    };
+    "ultron-1.1.0" = {
+      name = "ultron";
+      packageName = "ultron";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ultron/-/ultron-1.1.0.tgz";
+        sha1 = "b07a2e6a541a815fc6a34ccd4533baec307ca864";
+      };
+    };
     "addr-to-ip-port-1.4.2" = {
       name = "addr-to-ip-port";
       packageName = "addr-to-ip-port";
@@ -5548,13 +5566,13 @@ let
         sha1 = "f6e0579c8214d33a08109fd6e2e5c1dbc70463fc";
       };
     };
-    "sax-1.2.1" = {
+    "sax-1.2.2" = {
       name = "sax";
       packageName = "sax";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz";
-        sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a";
+        url = "https://registry.npmjs.org/sax/-/sax-1.2.2.tgz";
+        sha1 = "fd8631a23bc7826bef5d871bdb87378c95647828";
       };
     };
     "xmlbuilder-4.2.1" = {
@@ -6655,6 +6673,15 @@ let
         sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a";
       };
     };
+    "hosted-git-info-2.1.5" = {
+      name = "hosted-git-info";
+      packageName = "hosted-git-info";
+      version = "2.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz";
+        sha1 = "0ba81d90da2e25ab34a332e6ec77936e1598118b";
+      };
+    };
     "lockfile-1.0.3" = {
       name = "lockfile";
       packageName = "lockfile";
@@ -9080,13 +9107,13 @@ let
         sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62";
       };
     };
-    "js-yaml-3.7.0" = {
+    "js-yaml-3.8.1" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.7.0";
+      version = "3.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz";
-        sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.1.tgz";
+        sha1 = "782ba50200be7b9e5a8537001b7804db3ad02628";
       };
     };
     "json-stable-stringify-1.0.1" = {
@@ -9386,13 +9413,13 @@ let
         sha1 = "73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86";
       };
     };
-    "esprima-2.7.3" = {
+    "esprima-3.1.3" = {
       name = "esprima";
       packageName = "esprima";
-      version = "2.7.3";
+      version = "3.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz";
-        sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581";
+        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
+        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
       };
     };
     "prelude-ls-1.1.2" = {
@@ -9467,13 +9494,13 @@ let
         sha1 = "afab96262910a7f33c19a5775825c69f34e350ca";
       };
     };
-    "ajv-4.11.2" = {
+    "ajv-4.11.3" = {
       name = "ajv";
       packageName = "ajv";
-      version = "4.11.2";
+      version = "4.11.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.2.tgz";
-        sha1 = "f166c3c11cbc6cb9dcc102a5bcfe5b72c95287e6";
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.3.tgz";
+        sha1 = "ce30bdb90d1254f762c75af915fb3a63e7183d22";
       };
     };
     "ajv-keywords-1.5.1" = {
@@ -10061,13 +10088,13 @@ let
         sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
       };
     };
-    "gauge-2.7.2" = {
+    "gauge-2.7.3" = {
       name = "gauge";
       packageName = "gauge";
-      version = "2.7.2";
+      version = "2.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.2.tgz";
-        sha1 = "15cecc31b02d05345a5d6b0e171cdb3ad2307774";
+        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.3.tgz";
+        sha1 = "1c23855f962f17b3ad3d0dc7443f304542edfe09";
       };
     };
     "set-blocking-2.0.0" = {
@@ -10079,13 +10106,13 @@ let
         sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
       };
     };
-    "aproba-1.0.4" = {
+    "aproba-1.1.1" = {
       name = "aproba";
       packageName = "aproba";
-      version = "1.0.4";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz";
-        sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0";
+        url = "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz";
+        sha1 = "95d3600f07710aa0e9298c726ad5ecf2eacbabab";
       };
     };
     "wide-align-1.1.0" = {
@@ -11448,6 +11475,15 @@ let
         sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018";
       };
     };
+    "esprima-2.7.3" = {
+      name = "esprima";
+      packageName = "esprima";
+      version = "2.7.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz";
+        sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581";
+      };
+    };
     "handlebars-4.0.6" = {
       name = "handlebars";
       packageName = "handlebars";
@@ -11520,13 +11556,13 @@ let
         sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3";
       };
     };
-    "body-parser-1.16.0" = {
+    "body-parser-1.16.1" = {
       name = "body-parser";
       packageName = "body-parser";
-      version = "1.16.0";
+      version = "1.16.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.16.0.tgz";
-        sha1 = "924a5e472c6229fb9d69b85a20d5f2532dec788b";
+        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.16.1.tgz";
+        sha1 = "51540d045adfa7a0c6995a014bb6b1ed9b802329";
       };
     };
     "combine-lists-1.0.1" = {
@@ -11637,13 +11673,13 @@ let
         sha1 = "172735b7f614ea7af39664fa84cf0de4e515d120";
       };
     };
-    "useragent-2.1.11" = {
+    "useragent-2.1.12" = {
       name = "useragent";
       packageName = "useragent";
-      version = "2.1.11";
+      version = "2.1.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/useragent/-/useragent-2.1.11.tgz";
-        sha1 = "6a026e6a6c619b46ca7a0b2fdef6c1ac3da8ca29";
+        url = "https://registry.npmjs.org/useragent/-/useragent-2.1.12.tgz";
+        sha1 = "aa7da6cdc48bdc37ba86790871a7321d64edbaa2";
       };
     };
     "bytes-2.4.0" = {
@@ -12834,6 +12870,78 @@ let
         sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a";
       };
     };
+    "browser-stdout-1.3.0" = {
+      name = "browser-stdout";
+      packageName = "browser-stdout";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz";
+        sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f";
+      };
+    };
+    "diff-1.4.0" = {
+      name = "diff";
+      packageName = "diff";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz";
+        sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf";
+      };
+    };
+    "glob-7.0.5" = {
+      name = "glob";
+      packageName = "glob";
+      version = "7.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz";
+        sha1 = "b4202a69099bbb4d292a7c1b95b6682b67ebdc95";
+      };
+    };
+    "growl-1.9.2" = {
+      name = "growl";
+      packageName = "growl";
+      version = "1.9.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz";
+        sha1 = "0ea7743715db8d8de2c5ede1775e1b45ac85c02f";
+      };
+    };
+    "lodash.create-3.1.1" = {
+      name = "lodash.create";
+      packageName = "lodash.create";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz";
+        sha1 = "d7f2849f0dbda7e04682bb8cd72ab022461debe7";
+      };
+    };
+    "supports-color-3.1.2" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "3.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz";
+        sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5";
+      };
+    };
+    "lodash._baseassign-3.2.0" = {
+      name = "lodash._baseassign";
+      packageName = "lodash._baseassign";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz";
+        sha1 = "8c38a099500f215ad09e59f1722fd0c52bfe0a4e";
+      };
+    };
+    "lodash._basecreate-3.0.3" = {
+      name = "lodash._basecreate";
+      packageName = "lodash._basecreate";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz";
+        sha1 = "1bc661614daa7fc311b7d03bf16806a0213cf821";
+      };
+    };
     "optparse-1.0.5" = {
       name = "optparse";
       packageName = "optparse";
@@ -13239,15 +13347,6 @@ let
         sha1 = "3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa";
       };
     };
-    "lodash._baseassign-3.2.0" = {
-      name = "lodash._baseassign";
-      packageName = "lodash._baseassign";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz";
-        sha1 = "8c38a099500f215ad09e59f1722fd0c52bfe0a4e";
-      };
-    };
     "lodash._createassigner-3.1.1" = {
       name = "lodash._createassigner";
       packageName = "lodash._createassigner";
@@ -13383,6 +13482,15 @@ let
         sha1 = "fddd8b491502c48967a62963bc722ff897cddea0";
       };
     };
+    "js-yaml-3.7.0" = {
+      name = "js-yaml";
+      packageName = "js-yaml";
+      version = "3.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz";
+        sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80";
+      };
+    };
     "jsonata-1.0.10" = {
       name = "jsonata";
       packageName = "jsonata";
@@ -13464,13 +13572,13 @@ let
         sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f";
       };
     };
-    "node-red-node-email-0.1.15" = {
+    "node-red-node-email-0.1.16" = {
       name = "node-red-node-email";
       packageName = "node-red-node-email";
-      version = "0.1.15";
+      version = "0.1.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.15.tgz";
-        sha1 = "7a528596d3b693a077b1ee293300299855537142";
+        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.16.tgz";
+        sha1 = "ede78397c857d28e6785f2f1425e7d89d3b1ed38";
       };
     };
     "node-red-node-twitter-0.1.9" = {
@@ -14031,6 +14139,15 @@ let
         sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8";
       };
     };
+    "node-pre-gyp-0.6.32" = {
+      name = "node-pre-gyp";
+      packageName = "node-pre-gyp";
+      version = "0.6.32";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz";
+        sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5";
+      };
+    };
     "mongoose-3.6.7" = {
       name = "mongoose";
       packageName = "mongoose";
@@ -14616,6 +14733,15 @@ let
         sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
       };
     };
+    "aproba-1.0.4" = {
+      name = "aproba";
+      packageName = "aproba";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz";
+        sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0";
+      };
+    };
     "fstream-npm-1.2.0" = {
       name = "fstream-npm";
       packageName = "fstream-npm";
@@ -14670,13 +14796,13 @@ let
         sha1 = "3cd4574a00b67bae373a94b748772640507b7aac";
       };
     };
-    "mississippi-1.2.0" = {
+    "mississippi-1.3.0" = {
       name = "mississippi";
       packageName = "mississippi";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz";
-        sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c";
+        url = "https://registry.npmjs.org/mississippi/-/mississippi-1.3.0.tgz";
+        sha1 = "d201583eb12327e3c5c1642a404a9cacf94e34f5";
       };
     };
     "node-gyp-3.5.0" = {
@@ -14814,6 +14940,15 @@ let
         sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
       };
     };
+    "parallel-transform-1.1.0" = {
+      name = "parallel-transform";
+      packageName = "parallel-transform";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz";
+        sha1 = "d410f065b05da23081fcd10f28854c29bda33b06";
+      };
+    };
     "stream-each-1.2.0" = {
       name = "stream-each";
       packageName = "stream-each";
@@ -14823,6 +14958,15 @@ let
         sha1 = "1e95d47573f580d814dc0ff8cd0f66f1ce53c991";
       };
     };
+    "cyclist-0.2.2" = {
+      name = "cyclist";
+      packageName = "cyclist";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz";
+        sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640";
+      };
+    };
     "stream-iterate-1.2.0" = {
       name = "stream-iterate";
       packageName = "stream-iterate";
@@ -15310,15 +15454,6 @@ let
         sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04";
       };
     };
-    "diff-1.4.0" = {
-      name = "diff";
-      packageName = "diff";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz";
-        sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf";
-      };
-    };
     "domino-1.0.28" = {
       name = "domino";
       packageName = "domino";
@@ -15384,13 +15519,13 @@ let
         sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0";
       };
     };
-    "service-runner-2.1.13" = {
+    "service-runner-2.1.15" = {
       name = "service-runner";
       packageName = "service-runner";
-      version = "2.1.13";
+      version = "2.1.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.13.tgz";
-        sha1 = "e8ff78b93230d7d831ea3ed5587aa2292b829ceb";
+        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.15.tgz";
+        sha1 = "8b3d05729def7a0ce211e0483d9d907f13febbfb";
       };
     };
     "simplediff-0.1.1" = {
@@ -15519,13 +15654,13 @@ let
         sha1 = "ba055ff7dd3a267a65cc6be2deca4ea6bebbdb03";
       };
     };
-    "yargs-5.0.0" = {
+    "yargs-6.6.0" = {
       name = "yargs";
       packageName = "yargs";
-      version = "5.0.0";
+      version = "6.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz";
-        sha1 = "3355144977d05757dbb86d6e38ec056123b3a66e";
+        url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz";
+        sha1 = "782ec21ef403345f830a808ca3d513af56065208";
       };
     };
     "dtrace-provider-0.8.0" = {
@@ -15655,6 +15790,15 @@ let
         sha1 = "ed17cbf68abd10e0aef8182713e297c5e4b500b0";
       };
     };
+    "camelcase-3.0.0" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
+        sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
+      };
+    };
     "get-caller-file-1.0.2" = {
       name = "get-caller-file";
       packageName = "get-caller-file";
@@ -15664,15 +15808,6 @@ let
         sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5";
       };
     };
-    "lodash.assign-4.2.0" = {
-      name = "lodash.assign";
-      packageName = "lodash.assign";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz";
-        sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7";
-      };
-    };
     "require-directory-2.1.1" = {
       name = "require-directory";
       packageName = "require-directory";
@@ -15700,6 +15835,24 @@ let
         sha1 = "bba63ca861948994ff307736089e3b96026c2a4f";
       };
     };
+    "yargs-parser-4.2.1" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz";
+        sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c";
+      };
+    };
+    "lodash.assign-4.2.0" = {
+      name = "lodash.assign";
+      packageName = "lodash.assign";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz";
+        sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7";
+      };
+    };
     "window-size-0.2.0" = {
       name = "window-size";
       packageName = "window-size";
@@ -15709,24 +15862,6 @@ let
         sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075";
       };
     };
-    "yargs-parser-3.2.0" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz";
-        sha1 = "5081355d19d9d0c8c5d81ada908cb4e6d186664f";
-      };
-    };
-    "camelcase-3.0.0" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
-        sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
-      };
-    };
     "yargs-parser-2.4.1" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
@@ -16663,40 +16798,31 @@ let
         sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a";
       };
     };
-    "private-0.1.6" = {
+    "private-0.1.7" = {
       name = "private";
       packageName = "private";
-      version = "0.1.6";
+      version = "0.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/private/-/private-0.1.6.tgz";
-        sha1 = "55c6a976d0f9bafb9924851350fe47b9b5fbb7c1";
+        url = "https://registry.npmjs.org/private/-/private-0.1.7.tgz";
+        sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1";
       };
     };
-    "recast-0.11.20" = {
+    "recast-0.11.21" = {
       name = "recast";
       packageName = "recast";
-      version = "0.11.20";
+      version = "0.11.21";
       src = fetchurl {
-        url = "https://registry.npmjs.org/recast/-/recast-0.11.20.tgz";
-        sha1 = "2cb9bec269c03b36d0598118a936cd0a293ca3f3";
+        url = "https://registry.npmjs.org/recast/-/recast-0.11.21.tgz";
+        sha1 = "4e83081c6359ecb2e526d14f4138879333f20ac9";
       };
     };
-    "ast-types-0.9.4" = {
+    "ast-types-0.9.5" = {
       name = "ast-types";
       packageName = "ast-types";
-      version = "0.9.4";
+      version = "0.9.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.4.tgz";
-        sha1 = "410d1f81890aeb8e0a38621558ba5869ae53c91b";
-      };
-    };
-    "esprima-3.1.3" = {
-      name = "esprima";
-      packageName = "esprima";
-      version = "3.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
-        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
+        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.5.tgz";
+        sha1 = "1a660a09945dbceb1f9c9cbb715002617424e04a";
       };
     };
     "base62-0.1.1" = {
@@ -17366,13 +17492,13 @@ let
         sha1 = "047b73868ab9a85746e885f637f9ed0fb645a425";
       };
     };
-    "stream-transform-0.1.1" = {
+    "stream-transform-0.1.2" = {
       name = "stream-transform";
       packageName = "stream-transform";
-      version = "0.1.1";
+      version = "0.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-transform/-/stream-transform-0.1.1.tgz";
-        sha1 = "0a54a2b81eea88da55a50df2441cb63edc101c71";
+        url = "https://registry.npmjs.org/stream-transform/-/stream-transform-0.1.2.tgz";
+        sha1 = "7d8e6b4e03ac4781778f8c79517501bfb0762a9f";
       };
     };
     "csv-stringify-0.0.8" = {
@@ -17888,13 +18014,13 @@ let
         sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee";
       };
     };
-    "raven-1.1.1" = {
+    "raven-1.1.2" = {
       name = "raven";
       packageName = "raven";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raven/-/raven-1.1.1.tgz";
-        sha1 = "8837af64baa29ec32fc1cd8223255645ce3c9a42";
+        url = "https://registry.npmjs.org/raven/-/raven-1.1.2.tgz";
+        sha1 = "a5eb3db71f2fc3015a20145bcaf28015e7ae0718";
       };
     };
     "signals-1.0.0" = {
@@ -17924,15 +18050,6 @@ let
         sha1 = "0b48420d978c01804cf0230b648861598225a119";
       };
     };
-    "yargs-6.6.0" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "6.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz";
-        sha1 = "782ec21ef403345f830a808ca3d513af56065208";
-      };
-    };
     "color-convert-1.9.0" = {
       name = "color-convert";
       packageName = "color-convert";
@@ -18140,6 +18257,15 @@ let
         sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
       };
     };
+    "mississippi-1.2.0" = {
+      name = "mississippi";
+      packageName = "mississippi";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz";
+        sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c";
+      };
+    };
     "lsmod-1.0.0" = {
       name = "lsmod";
       packageName = "lsmod";
@@ -18167,15 +18293,6 @@ let
         sha1 = "7eea0afc0e4efb7c9365615315a3576833ead2ae";
       };
     };
-    "yargs-parser-4.2.1" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "4.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz";
-        sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c";
-      };
-    };
     "kew-0.1.7" = {
       name = "kew";
       packageName = "kew";
@@ -18221,6 +18338,15 @@ let
         sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65";
       };
     };
+    "acorn-4.0.11" = {
+      name = "acorn";
+      packageName = "acorn";
+      version = "4.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz";
+        sha1 = "edcda3bd937e7556410d42ed5860f67399c794c0";
+      };
+    };
     "acorn-dynamic-import-2.0.1" = {
       name = "acorn-dynamic-import";
       packageName = "acorn-dynamic-import";
@@ -18230,13 +18356,13 @@ let
         sha1 = "23f671eb6e650dab277fef477c321b1178a8cca2";
       };
     };
-    "enhanced-resolve-3.0.3" = {
+    "enhanced-resolve-3.1.0" = {
       name = "enhanced-resolve";
       packageName = "enhanced-resolve";
-      version = "3.0.3";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.0.3.tgz";
-        sha1 = "df14c06b5fc5eecade1094c9c5a12b4b3edc0b62";
+        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz";
+        sha1 = "9f4b626f577245edcf4b2ad83d86e17f4f421dec";
       };
     };
     "json-loader-0.5.4" = {
@@ -18583,10 +18709,10 @@ in
   azure-cli = nodeEnv.buildNodePackage {
     name = "azure-cli";
     packageName = "azure-cli";
-    version = "0.10.8";
+    version = "0.10.9";
     src = fetchurl {
-      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.8.tgz";
-      sha1 = "23622b6e536a6cdcb4be7a804884ef8b4d4985bc";
+      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.9.tgz";
+      sha1 = "f3f795f069c91fe7335d55f4199fc66c860496df";
     };
     dependencies = [
       sources."adal-node-0.1.21"
@@ -18598,9 +18724,9 @@ in
         ];
       })
       sources."azure-arm-authorization-2.0.0"
-      sources."azure-arm-cdn-1.0.0"
+      sources."azure-arm-cdn-1.0.2"
       sources."azure-arm-commerce-0.2.0"
-      sources."azure-arm-compute-0.19.1"
+      sources."azure-arm-compute-0.20.0"
       sources."azure-arm-datalake-analytics-1.0.1-preview"
       sources."azure-arm-datalake-store-1.0.1-preview"
       sources."azure-arm-hdinsight-0.2.2"
@@ -18613,7 +18739,7 @@ in
       sources."azure-arm-trafficmanager-0.10.5"
       sources."azure-arm-dns-0.11.1"
       sources."azure-arm-website-0.11.4"
-      sources."azure-arm-rediscache-0.2.1"
+      sources."azure-arm-rediscache-0.2.3"
       sources."azure-arm-devtestlabs-0.1.0"
       sources."azure-graph-1.1.1"
       sources."azure-gallery-2.0.0-pre.18"
@@ -18648,7 +18774,7 @@ in
       })
       sources."azure-arm-batch-0.3.0"
       sources."azure-batch-0.5.2"
-      sources."azure-servicefabric-0.1.4"
+      sources."azure-servicefabric-0.1.5"
       sources."applicationinsights-0.16.0"
       sources."caller-id-0.1.0"
       sources."colors-1.1.2"
@@ -18794,7 +18920,7 @@ in
       sources."cycle-1.0.3"
       sources."isstream-0.1.2"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       (sources."bl-1.1.2" // {
         dependencies = [
           sources."readable-stream-2.0.6"
@@ -18866,7 +18992,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -18994,7 +19120,7 @@ in
       sources."currently-unhandled-0.4.1"
       sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.1.5"
+      sources."hosted-git-info-2.2.0"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -19054,7 +19180,7 @@ in
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."q-1.4.1"
-      sources."debug-2.6.0"
+      sources."debug-2.6.1"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -19089,7 +19215,7 @@ in
         ];
       })
       sources."browserify-zlib-0.1.4"
-      sources."buffer-5.0.2"
+      sources."buffer-5.0.5"
       sources."cached-path-relative-1.0.0"
       (sources."concat-stream-1.5.2" // {
         dependencies = [
@@ -19186,9 +19312,9 @@ in
       sources."minimalistic-assert-1.0.0"
       sources."bn.js-4.11.6"
       sources."browserify-rsa-4.0.1"
-      sources."elliptic-6.3.2"
+      sources."elliptic-6.3.3"
       sources."parse-asn1-5.0.0"
-      sources."brorand-1.0.6"
+      sources."brorand-1.0.7"
       sources."hash.js-1.0.3"
       sources."asn1.js-4.9.1"
       sources."ripemd160-1.0.1"
@@ -19251,7 +19377,7 @@ in
       sources."chalk-1.0.0"
       sources."chromecast-player-0.2.3"
       sources."debounced-seeker-1.0.0"
-      sources."debug-2.6.0"
+      sources."debug-2.6.1"
       sources."diveSync-0.3.0"
       sources."got-1.2.2"
       sources."internal-ip-1.2.0"
@@ -19340,7 +19466,7 @@ in
       sources."currently-unhandled-0.4.1"
       sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.1.5"
+      sources."hosted-git-info-2.2.0"
       sources."is-builtin-module-1.0.0"
       sources."semver-5.3.0"
       sources."validate-npm-package-license-3.0.1"
@@ -19454,7 +19580,7 @@ in
       (sources."fs-chunk-store-1.6.4" // {
         dependencies = [
           sources."mkdirp-0.5.1"
-          sources."thunky-1.0.1"
+          sources."thunky-1.0.2"
           sources."minimist-0.0.8"
         ];
       })
@@ -19466,10 +19592,10 @@ in
       sources."rimraf-2.5.4"
       sources."torrent-discovery-5.4.0"
       sources."torrent-piece-1.1.0"
-      (sources."random-access-file-1.4.0" // {
+      (sources."random-access-file-1.5.0" // {
         dependencies = [
           sources."mkdirp-0.5.1"
-          sources."thunky-1.0.1"
+          sources."thunky-1.0.2"
           sources."minimist-0.0.8"
         ];
       })
@@ -19519,33 +19645,38 @@ in
       })
       sources."lru-2.0.1"
       sources."buffer-equal-0.0.1"
-      sources."k-rpc-socket-1.6.1"
+      sources."k-rpc-socket-1.6.2"
       sources."bn.js-4.11.6"
       sources."compact2string-1.4.0"
       sources."random-iterate-1.0.1"
       sources."run-series-1.1.4"
-      (sources."simple-peer-6.2.1" // {
+      (sources."simple-peer-6.2.2" // {
         dependencies = [
           sources."readable-stream-2.2.2"
           sources."isarray-1.0.0"
         ];
       })
-      (sources."simple-websocket-4.2.0" // {
+      (sources."simple-websocket-4.3.0" // {
         dependencies = [
           sources."readable-stream-2.2.2"
+          sources."ws-2.0.3"
           sources."isarray-1.0.0"
         ];
       })
       sources."string2compact-1.2.2"
-      sources."ws-1.1.1"
+      (sources."ws-1.1.1" // {
+        dependencies = [
+          sources."ultron-1.0.2"
+        ];
+      })
       sources."ipaddr.js-1.2.0"
       sources."get-browser-rtc-1.0.2"
       sources."buffer-shims-1.0.0"
       sources."process-nextick-args-1.0.7"
       sources."util-deprecate-1.0.2"
+      sources."ultron-1.1.0"
       sources."addr-to-ip-port-1.4.2"
       sources."options-0.0.6"
-      sources."ultron-1.0.2"
       sources."pad-0.0.5"
       sources."single-line-log-0.4.1"
       (sources."request-2.16.6" // {
@@ -19587,7 +19718,7 @@ in
       sources."commander-2.9.0"
       sources."typedarray-0.0.6"
       sources."graceful-readlink-1.0.1"
-      sources."sax-1.2.1"
+      sources."sax-1.2.2"
       sources."underscore-1.6.0"
     ];
     buildInputs = globalBuildInputs;
@@ -19710,6 +19841,7 @@ in
       (sources."npm-2.15.11" // {
         dependencies = [
           sources."glob-7.0.6"
+          sources."hosted-git-info-2.1.5"
           sources."nopt-3.0.6"
           sources."npm-package-arg-4.1.1"
           sources."readable-stream-2.1.5"
@@ -19878,9 +20010,9 @@ in
       sources."minimalistic-assert-1.0.0"
       sources."bn.js-4.11.6"
       sources."browserify-rsa-4.0.1"
-      sources."elliptic-6.3.2"
+      sources."elliptic-6.3.3"
       sources."parse-asn1-5.0.0"
-      sources."brorand-1.0.6"
+      sources."brorand-1.0.7"
       sources."hash.js-1.0.3"
       sources."asn1.js-4.9.1"
       sources."ripemd160-1.0.1"
@@ -19975,7 +20107,7 @@ in
       })
       sources."validate-npm-package-license-3.0.1"
       sources."validate-npm-package-name-2.2.2"
-      sources."hosted-git-info-2.1.5"
+      sources."hosted-git-info-2.2.0"
       sources."mute-stream-0.0.7"
       sources."json-parse-helpfulerror-1.0.3"
       sources."normalize-package-data-2.3.5"
@@ -20066,7 +20198,7 @@ in
       sources."es5-ext-0.10.12"
       sources."es6-iterator-2.0.0"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
@@ -20119,7 +20251,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -20545,7 +20677,7 @@ in
     dependencies = [
       sources."JSONStream-1.3.0"
       sources."async-2.1.4"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."awscred-1.2.0"
       sources."ini-1.3.4"
       sources."optimist-0.6.1"
@@ -20618,7 +20750,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -20706,7 +20838,7 @@ in
       sources."camelcase-2.1.1"
       sources."currently-unhandled-0.4.1"
       sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.1.5"
+      sources."hosted-git-info-2.2.0"
       sources."is-builtin-module-1.0.0"
       sources."semver-5.3.0"
       sources."validate-npm-package-license-3.0.1"
@@ -20744,16 +20876,16 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "3.14.1";
+    version = "3.15.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-3.14.1.tgz";
-      sha1 = "8a62175f2255109494747a1b25128d97b8eb3d97";
+      url = "https://registry.npmjs.org/eslint/-/eslint-3.15.0.tgz";
+      sha1 = "bdcc6a6c5ffe08160e7b93c066695362a91e30f2";
     };
     dependencies = [
       sources."babel-code-frame-6.22.0"
       sources."chalk-1.1.3"
       sources."concat-stream-1.6.0"
-      sources."debug-2.6.0"
+      sources."debug-2.6.1"
       sources."doctrine-1.5.0"
       sources."escope-3.6.0"
       sources."espree-3.4.0"
@@ -20767,7 +20899,7 @@ in
       sources."inquirer-0.12.0"
       sources."is-my-json-valid-2.15.0"
       sources."is-resolvable-1.0.0"
-      sources."js-yaml-3.7.0"
+      sources."js-yaml-3.8.1"
       sources."json-stable-stringify-1.0.1"
       sources."levn-0.3.0"
       sources."lodash-4.17.4"
@@ -20874,7 +21006,7 @@ in
       sources."is-property-1.0.2"
       sources."tryit-1.0.3"
       sources."argparse-1.0.9"
-      sources."esprima-2.7.3"
+      sources."esprima-3.1.3"
       sources."sprintf-js-1.0.3"
       sources."jsonify-0.0.0"
       sources."prelude-ls-1.1.2"
@@ -20889,7 +21021,7 @@ in
       sources."interpret-1.0.1"
       sources."rechoir-0.6.2"
       sources."resolve-1.2.0"
-      sources."ajv-4.11.2"
+      sources."ajv-4.11.3"
       sources."ajv-keywords-1.5.1"
       sources."slice-ansi-0.0.4"
       sources."co-4.6.0"
@@ -21062,7 +21194,7 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."nan-2.5.1"
-      sources."node-pre-gyp-0.6.32"
+      sources."node-pre-gyp-0.6.33"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -21088,15 +21220,14 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      (sources."gauge-2.7.2" // {
+      (sources."gauge-2.7.3" // {
         dependencies = [
           sources."object-assign-4.1.1"
         ];
       })
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."aproba-1.0.4"
-      sources."supports-color-0.2.0"
+      sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
@@ -21110,7 +21241,7 @@ in
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
@@ -21131,17 +21262,14 @@ in
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."supports-color-2.0.0"
-        ];
-      })
+      sources."chalk-1.1.3"
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
+      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
@@ -21174,7 +21302,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -21356,7 +21484,7 @@ in
       sources."acorn-globals-1.0.9"
       sources."pop-iterate-1.0.1"
       sources."weak-map-1.0.5"
-      sources."sax-1.2.1"
+      sources."sax-1.2.2"
       sources."xmlbuilder-4.2.1"
       sources."lodash-4.17.4"
       sources."nan-2.5.1"
@@ -21708,7 +21836,11 @@ in
           sources."source-map-0.4.4"
         ];
       })
-      sources."js-yaml-3.7.0"
+      (sources."js-yaml-3.8.1" // {
+        dependencies = [
+          sources."esprima-3.1.3"
+        ];
+      })
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -21884,14 +22016,14 @@ in
   js-yaml = nodeEnv.buildNodePackage {
     name = "js-yaml";
     packageName = "js-yaml";
-    version = "3.7.0";
+    version = "3.8.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz";
-      sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80";
+      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.1.tgz";
+      sha1 = "782ba50200be7b9e5a8537001b7804db3ad02628";
     };
     dependencies = [
       sources."argparse-1.0.9"
-      sources."esprima-2.7.3"
+      sources."esprima-3.1.3"
       sources."sprintf-js-1.0.3"
     ];
     buildInputs = globalBuildInputs;
@@ -21912,7 +22044,7 @@ in
     };
     dependencies = [
       sources."bluebird-3.4.7"
-      sources."body-parser-1.16.0"
+      sources."body-parser-1.16.1"
       sources."chokidar-1.6.1"
       sources."colors-1.1.2"
       (sources."combine-lists-1.0.1" // {
@@ -21964,10 +22096,10 @@ in
       })
       sources."source-map-0.5.6"
       sources."tmp-0.0.28"
-      sources."useragent-2.1.11"
+      sources."useragent-2.1.12"
       sources."bytes-2.4.0"
       sources."content-type-1.0.2"
-      sources."debug-2.6.0"
+      sources."debug-2.6.1"
       sources."depd-1.1.0"
       sources."http-errors-1.5.1"
       sources."iconv-lite-0.4.15"
@@ -22034,7 +22166,7 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."nan-2.5.1"
-      sources."node-pre-gyp-0.6.32"
+      sources."node-pre-gyp-0.6.33"
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
       sources."npmlog-4.0.2"
@@ -22061,11 +22193,10 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.2"
+      sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."aproba-1.0.4"
-      sources."supports-color-0.2.0"
+      sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
@@ -22080,7 +22211,7 @@ in
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
@@ -22099,17 +22230,14 @@ in
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."supports-color-2.0.0"
-        ];
-      })
+      sources."chalk-1.1.3"
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
+      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
@@ -22142,7 +22270,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -22396,7 +22524,7 @@ in
       sources."oauth-0.9.15"
       sources."passport-oauth2-1.4.0"
       sources."uid2-0.0.3"
-      sources."sax-1.2.1"
+      sources."sax-1.2.2"
       sources."xmlbuilder-4.2.1"
       sources."lodash-4.17.4"
     ];
@@ -22572,6 +22700,57 @@ in
     };
     production = true;
   };
+  mocha = nodeEnv.buildNodePackage {
+    name = "mocha";
+    packageName = "mocha";
+    version = "3.2.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/mocha/-/mocha-3.2.0.tgz";
+      sha1 = "7dc4f45e5088075171a68896814e6ae9eb7a85e3";
+    };
+    dependencies = [
+      sources."browser-stdout-1.3.0"
+      sources."commander-2.9.0"
+      sources."debug-2.2.0"
+      sources."diff-1.4.0"
+      sources."escape-string-regexp-1.0.5"
+      sources."glob-7.0.5"
+      sources."growl-1.9.2"
+      sources."json3-3.3.2"
+      sources."lodash.create-3.1.1"
+      sources."mkdirp-0.5.1"
+      sources."supports-color-3.1.2"
+      sources."graceful-readlink-1.0.1"
+      sources."ms-0.7.1"
+      sources."fs.realpath-1.0.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."minimatch-3.0.3"
+      sources."once-1.4.0"
+      sources."path-is-absolute-1.0.1"
+      sources."wrappy-1.0.2"
+      sources."brace-expansion-1.1.6"
+      sources."balanced-match-0.4.2"
+      sources."concat-map-0.0.1"
+      sources."lodash._baseassign-3.2.0"
+      sources."lodash._basecreate-3.0.3"
+      sources."lodash._isiterateecall-3.0.9"
+      sources."lodash._basecopy-3.0.1"
+      sources."lodash.keys-3.1.2"
+      sources."lodash._getnative-3.9.1"
+      sources."lodash.isarguments-3.1.0"
+      sources."lodash.isarray-3.0.4"
+      sources."minimist-0.0.8"
+      sources."has-flag-1.0.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "simple, flexible, fun test framework";
+      homepage = https://mochajs.org/;
+      license = "MIT";
+    };
+    production = true;
+  };
   nijs = nodeEnv.buildNodePackage {
     name = "nijs";
     packageName = "nijs";
@@ -22646,7 +22825,7 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."minimist-0.0.8"
-      sources."hosted-git-info-2.1.5"
+      sources."hosted-git-info-2.2.0"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -22655,7 +22834,7 @@ in
       sources."spdx-license-ids-1.2.2"
       sources."wrappy-1.0.2"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
@@ -22718,7 +22897,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -22738,7 +22917,7 @@ in
       sources."gauge-2.6.0"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."aproba-1.0.4"
+      sources."aproba-1.1.1"
       sources."has-color-0.1.7"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.1"
@@ -22813,7 +22992,7 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.2"
+      sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."readable-stream-2.2.2"
@@ -22823,8 +23002,7 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
-      sources."aproba-1.0.4"
-      sources."supports-color-0.2.0"
+      sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
@@ -22838,7 +23016,7 @@ in
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
@@ -22859,17 +23037,14 @@ in
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."supports-color-2.0.0"
-        ];
-      })
+      sources."chalk-1.1.3"
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
+      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
@@ -22902,7 +23077,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -22931,7 +23106,7 @@ in
     dependencies = [
       sources."async-0.9.2"
       sources."biased-opener-0.2.8"
-      sources."debug-2.6.0"
+      sources."debug-2.6.1"
       (sources."express-4.14.1" // {
         dependencies = [
           sources."debug-2.2.0"
@@ -22998,7 +23173,7 @@ in
       sources."currently-unhandled-0.4.1"
       sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.1.5"
+      sources."hosted-git-info-2.2.0"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -23090,7 +23265,7 @@ in
       sources."strip-json-comments-1.0.4"
       sources."truncate-1.0.5"
       sources."nan-2.5.1"
-      (sources."node-pre-gyp-0.6.32" // {
+      (sources."node-pre-gyp-0.6.33" // {
         dependencies = [
           sources."rimraf-2.5.4"
           sources."semver-5.3.0"
@@ -23118,7 +23293,7 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.2"
+      sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."readable-stream-2.2.2"
@@ -23127,8 +23302,7 @@ in
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
-      sources."aproba-1.0.4"
-      sources."supports-color-0.2.0"
+      sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
@@ -23137,7 +23311,7 @@ in
       sources."is-fullwidth-code-point-1.0.0"
       sources."ansi-regex-2.1.1"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
@@ -23156,16 +23330,13 @@ in
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."supports-color-2.0.0"
-        ];
-      })
+      sources."chalk-1.1.3"
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
+      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
@@ -23196,7 +23367,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -23256,7 +23427,7 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.2"
+      sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."readable-stream-2.2.2"
@@ -23267,8 +23438,7 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
-      sources."aproba-1.0.4"
-      sources."supports-color-0.2.0"
+      sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
@@ -23283,7 +23453,7 @@ in
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
@@ -23304,17 +23474,14 @@ in
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."supports-color-2.0.0"
-        ];
-      })
+      sources."chalk-1.1.3"
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
+      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
@@ -23347,7 +23514,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -23390,7 +23557,7 @@ in
     };
     dependencies = [
       sources."chokidar-1.6.1"
-      (sources."debug-2.6.0" // {
+      (sources."debug-2.6.1" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -23459,7 +23626,7 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."nan-2.5.1"
-      sources."node-pre-gyp-0.6.32"
+      sources."node-pre-gyp-0.6.33"
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
       sources."npmlog-4.0.2"
@@ -23483,11 +23650,10 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.2"
+      sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."aproba-1.0.4"
-      sources."supports-color-0.2.0"
+      sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
@@ -23502,7 +23668,7 @@ in
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
@@ -23523,17 +23689,14 @@ in
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."supports-color-2.0.0"
-        ];
-      })
+      sources."chalk-1.1.3"
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
+      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
@@ -23566,7 +23729,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -23678,7 +23841,7 @@ in
       sources."express-4.14.0"
       (sources."follow-redirects-1.2.1" // {
         dependencies = [
-          sources."debug-2.6.0"
+          sources."debug-2.6.1"
           sources."ms-0.7.2"
         ];
       })
@@ -23714,7 +23877,7 @@ in
       sources."ws-1.1.1"
       sources."xml2js-0.4.17"
       sources."node-red-node-feedparser-0.1.7"
-      sources."node-red-node-email-0.1.15"
+      sources."node-red-node-email-0.1.16"
       (sources."node-red-node-twitter-0.1.9" // {
         dependencies = [
           sources."request-2.79.0"
@@ -23938,7 +24101,7 @@ in
       sources."longest-1.0.1"
       sources."options-0.0.6"
       sources."ultron-1.0.2"
-      sources."sax-1.2.1"
+      sources."sax-1.2.2"
       sources."xmlbuilder-4.2.1"
       sources."lodash-4.17.4"
       (sources."feedparser-1.1.3" // {
@@ -23957,7 +24120,7 @@ in
       sources."addressparser-0.1.3"
       sources."array-indexofobject-0.0.1"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."forever-agent-0.6.1"
@@ -24018,7 +24181,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -24098,14 +24261,10 @@ in
       })
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      (sources."gauge-2.7.2" // {
-        dependencies = [
-          sources."supports-color-0.2.0"
-        ];
-      })
+      sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."aproba-1.0.4"
+      sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
@@ -24185,7 +24344,7 @@ in
       sources."methods-0.0.1"
       sources."send-0.1.0"
       sources."cookie-signature-1.0.1"
-      (sources."debug-2.6.0" // {
+      (sources."debug-2.6.1" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -24260,14 +24419,15 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "4.1.2";
+    version = "4.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-4.1.2.tgz";
-      sha1 = "daaa77d631947135b36528c304573243f5cd2e07";
+      url = "https://registry.npmjs.org/npm/-/npm-4.2.0.tgz";
+      sha1 = "d4eeb6791b996fe3085535d749338d1fe48df13a";
     };
     dependencies = [
       sources."JSONStream-1.3.0"
       sources."abbrev-1.0.9"
+      sources."ansi-regex-2.1.1"
       sources."ansicolors-0.3.2"
       sources."ansistyles-0.1.3"
       sources."aproba-1.0.4"
@@ -24302,7 +24462,7 @@ in
       sources."lodash.union-4.6.0"
       sources."lodash.uniq-4.5.0"
       sources."lodash.without-4.4.0"
-      sources."mississippi-1.2.0"
+      sources."mississippi-1.3.0"
       sources."mkdirp-0.5.1"
       (sources."node-gyp-3.5.0" // {
         dependencies = [
@@ -24359,7 +24519,6 @@ in
       sources."which-1.2.12"
       sources."wrappy-1.0.2"
       sources."write-file-atomic-1.3.1"
-      sources."ansi-regex-2.1.1"
       sources."debuglog-1.0.1"
       sources."imurmurhash-0.1.4"
       sources."lodash._baseindexof-3.1.0"
@@ -24400,22 +24559,23 @@ in
       })
       sources."flush-write-stream-1.0.2"
       sources."from2-2.3.0"
+      sources."parallel-transform-1.1.0"
       sources."pump-1.0.2"
       sources."pumpify-1.3.5"
       sources."stream-each-1.2.0"
       sources."through2-2.0.3"
       sources."typedarray-0.0.6"
       sources."stream-shift-1.0.0"
+      sources."cyclist-0.2.2"
       sources."xtend-4.0.1"
       sources."minimist-0.0.8"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.2"
+      sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."supports-color-0.2.0"
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
@@ -24436,7 +24596,7 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
@@ -24456,17 +24616,14 @@ in
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."supports-color-2.0.0"
-        ];
-      })
+      sources."chalk-1.1.3"
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
+      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
@@ -24498,7 +24655,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -24572,7 +24729,7 @@ in
       sources."couch-login-0.1.20"
       sources."npmlog-4.0.2"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
@@ -24635,7 +24792,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -24655,11 +24812,7 @@ in
       sources."concat-map-0.0.1"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      (sources."gauge-2.7.2" // {
-        dependencies = [
-          sources."supports-color-0.2.0"
-        ];
-      })
+      sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."readable-stream-2.2.2"
@@ -24669,7 +24822,7 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
-      sources."aproba-1.0.4"
+      sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
@@ -24717,10 +24870,10 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "2.8.10";
+    version = "2.10.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.10.tgz";
-      sha1 = "20a65b4293a4594df74e98dbc5cfbddee39a756b";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.2.tgz";
+      sha1 = "9614c58ec84d31702a85881c844c3fb93611a585";
     };
     dependencies = [
       sources."bluebird-3.4.7"
@@ -24812,8 +24965,7 @@ in
       sources."npm-user-validate-0.1.5"
       (sources."npmlog-4.0.2" // {
         dependencies = [
-          sources."gauge-2.7.2"
-          sources."supports-color-0.2.0"
+          sources."gauge-2.7.3"
         ];
       })
       sources."once-1.4.0"
@@ -24887,7 +25039,7 @@ in
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."array-index-1.0.0"
-      sources."debug-2.6.0"
+      sources."debug-2.6.1"
       sources."es6-symbol-3.1.0"
       sources."ms-0.7.2"
       sources."d-0.1.1"
@@ -24912,7 +25064,7 @@ in
       sources."mute-stream-0.0.7"
       sources."util-extend-1.0.3"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       (sources."bl-1.1.2" // {
         dependencies = [
           sources."readable-stream-2.0.6"
@@ -24969,7 +25121,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -25047,7 +25199,7 @@ in
     dependencies = [
       sources."async-0.9.2"
       sources."babybird-0.0.1"
-      (sources."body-parser-1.16.0" // {
+      (sources."body-parser-1.16.1" // {
         dependencies = [
           sources."content-type-1.0.2"
         ];
@@ -25081,7 +25233,7 @@ in
         ];
       })
       sources."gelf-stream-0.2.4"
-      sources."js-yaml-3.7.0"
+      sources."js-yaml-3.8.1"
       sources."mediawiki-title-0.5.6"
       sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access"
       sources."node-uuid-1.4.7"
@@ -25094,13 +25246,13 @@ in
       })
       sources."semver-5.3.0"
       sources."serve-favicon-2.3.2"
-      (sources."service-runner-2.1.13" // {
+      (sources."service-runner-2.1.15" // {
         dependencies = [
           sources."gelf-stream-1.1.1"
-          sources."yargs-5.0.0"
+          sources."yargs-6.6.0"
           sources."gelfling-0.3.1"
+          sources."camelcase-3.0.0"
           sources."cliui-3.2.0"
-          sources."window-size-0.2.0"
         ];
       })
       sources."simplediff-0.1.1"
@@ -25115,7 +25267,7 @@ in
       sources."asap-2.0.5"
       sources."is-arguments-1.0.2"
       sources."bytes-2.4.0"
-      sources."debug-2.6.0"
+      sources."debug-2.6.1"
       sources."depd-1.1.0"
       sources."http-errors-1.5.1"
       sources."iconv-lite-0.4.15"
@@ -25224,10 +25376,10 @@ in
       sources."foreach-2.0.5"
       sources."gelfling-0.2.0"
       sources."argparse-1.0.9"
-      sources."esprima-2.7.3"
+      sources."esprima-3.1.3"
       sources."sprintf-js-1.0.3"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
@@ -25288,7 +25440,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -25352,7 +25504,6 @@ in
         ];
       })
       sources."get-caller-file-1.0.2"
-      sources."lodash.assign-4.2.0"
       sources."os-locale-1.4.0"
       sources."read-pkg-up-1.0.1"
       sources."require-directory-2.1.1"
@@ -25361,7 +25512,7 @@ in
       sources."string-width-1.0.2"
       sources."which-module-1.0.0"
       sources."y18n-3.2.1"
-      (sources."yargs-parser-3.2.0" // {
+      (sources."yargs-parser-4.2.1" // {
         dependencies = [
           sources."camelcase-3.0.0"
         ];
@@ -25381,7 +25532,7 @@ in
       sources."error-ex-1.3.0"
       sources."is-arrayish-0.2.1"
       sources."is-utf8-0.2.1"
-      sources."hosted-git-info-2.1.5"
+      sources."hosted-git-info-2.2.0"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -25391,6 +25542,7 @@ in
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
+      sources."lodash.assign-4.2.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -25516,7 +25668,7 @@ in
       sources."currently-unhandled-0.4.1"
       sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.1.5"
+      sources."hosted-git-info-2.2.0"
       sources."is-builtin-module-1.0.0"
       sources."semver-5.3.0"
       sources."validate-npm-package-license-3.0.1"
@@ -25586,7 +25738,7 @@ in
       (sources."fs-chunk-store-1.6.4" // {
         dependencies = [
           sources."mkdirp-0.5.1"
-          sources."thunky-1.0.1"
+          sources."thunky-1.0.2"
           sources."minimist-0.0.8"
         ];
       })
@@ -25598,16 +25750,16 @@ in
       sources."rimraf-2.5.4"
       sources."torrent-discovery-5.4.0"
       sources."torrent-piece-1.1.0"
-      (sources."random-access-file-1.4.0" // {
+      (sources."random-access-file-1.5.0" // {
         dependencies = [
           sources."mkdirp-0.5.1"
-          sources."thunky-1.0.1"
+          sources."thunky-1.0.2"
           sources."minimist-0.0.8"
         ];
       })
       sources."randombytes-2.0.3"
       sources."run-parallel-1.1.6"
-      sources."debug-2.6.0"
+      sources."debug-2.6.1"
       sources."ms-0.7.2"
       sources."flatten-0.0.1"
       sources."fifo-0.1.4"
@@ -25649,20 +25801,28 @@ in
       })
       sources."lru-2.0.1"
       sources."buffer-equal-0.0.1"
-      sources."k-rpc-socket-1.6.1"
+      sources."k-rpc-socket-1.6.2"
       sources."bn.js-4.11.6"
       sources."compact2string-1.4.0"
       sources."random-iterate-1.0.1"
       sources."run-series-1.1.4"
-      sources."simple-peer-6.2.1"
-      sources."simple-websocket-4.2.0"
+      sources."simple-peer-6.2.2"
+      (sources."simple-websocket-4.3.0" // {
+        dependencies = [
+          sources."ws-2.0.3"
+        ];
+      })
       sources."string2compact-1.2.2"
-      sources."ws-1.1.1"
+      (sources."ws-1.1.1" // {
+        dependencies = [
+          sources."ultron-1.0.2"
+        ];
+      })
       sources."ipaddr.js-1.2.0"
       sources."get-browser-rtc-1.0.2"
+      sources."ultron-1.1.0"
       sources."addr-to-ip-port-1.4.2"
       sources."options-0.0.6"
-      sources."ultron-1.0.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -25897,13 +26057,13 @@ in
       sources."bitfield-0.1.0"
       (sources."bittorrent-dht-3.2.6" // {
         dependencies = [
-          sources."debug-2.6.0"
+          sources."debug-2.6.1"
         ];
       })
       (sources."bittorrent-tracker-2.12.1" // {
         dependencies = [
           sources."bencode-0.6.0"
-          sources."debug-2.6.0"
+          sources."debug-2.6.1"
         ];
       })
       sources."bncode-0.5.3"
@@ -26057,7 +26217,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -26114,9 +26274,9 @@ in
       sources."graceful-fs-4.1.11"
       sources."iconv-lite-0.4.15"
       sources."mkdirp-0.5.1"
-      sources."private-0.1.6"
+      sources."private-0.1.7"
       sources."q-1.4.1"
-      sources."recast-0.11.20"
+      sources."recast-0.11.21"
       sources."graceful-readlink-1.0.1"
       sources."acorn-3.3.0"
       sources."defined-1.0.0"
@@ -26130,7 +26290,7 @@ in
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."minimist-0.0.8"
-      sources."ast-types-0.9.4"
+      sources."ast-types-0.9.5"
       sources."esprima-3.1.3"
       sources."source-map-0.5.6"
       sources."base62-0.1.1"
@@ -26179,7 +26339,7 @@ in
       sources."crypto-0.0.3"
       sources."xml2js-0.2.4"
       sources."xmlbuilder-0.4.2"
-      sources."sax-1.2.1"
+      sources."sax-1.2.2"
       sources."coffee-script-1.6.3"
       sources."node-uuid-1.4.1"
       (sources."connect-2.11.0" // {
@@ -26195,7 +26355,7 @@ in
       sources."methods-0.1.0"
       sources."send-0.1.4"
       sources."cookie-signature-1.0.1"
-      sources."debug-2.6.0"
+      sources."debug-2.6.1"
       sources."qs-0.6.5"
       sources."bytes-0.2.1"
       sources."pause-0.0.1"
@@ -26225,7 +26385,7 @@ in
       sources."formidable-1.0.11"
       sources."crc-0.2.0"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
@@ -26290,7 +26450,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -26331,10 +26491,10 @@ in
     dependencies = [
       sources."express-5.0.0-alpha.3"
       sources."express-json5-0.1.0"
-      (sources."body-parser-1.16.0" // {
+      (sources."body-parser-1.16.1" // {
         dependencies = [
           sources."bytes-2.4.0"
-          sources."debug-2.6.0"
+          sources."debug-2.6.1"
           sources."iconv-lite-0.4.15"
           sources."qs-6.2.1"
           sources."raw-body-2.2.0"
@@ -26347,7 +26507,7 @@ in
         ];
       })
       sources."commander-2.9.0"
-      sources."js-yaml-3.7.0"
+      sources."js-yaml-3.8.1"
       sources."cookies-0.6.2"
       (sources."request-2.79.0" // {
         dependencies = [
@@ -26427,11 +26587,11 @@ in
       sources."on-headers-1.0.1"
       sources."graceful-readlink-1.0.1"
       sources."argparse-1.0.9"
-      sources."esprima-2.7.3"
+      sources."esprima-3.1.3"
       sources."sprintf-js-1.0.3"
       sources."keygrip-1.0.1"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
@@ -26490,7 +26650,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -26687,7 +26847,7 @@ in
       sources."precond-0.2.3"
       sources."csv-generate-0.0.6"
       sources."csv-parse-1.2.0"
-      sources."stream-transform-0.1.1"
+      sources."stream-transform-0.1.2"
       sources."csv-stringify-0.0.8"
       sources."asn1-0.1.11"
       sources."ctype-0.5.3"
@@ -26734,7 +26894,7 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -26757,7 +26917,7 @@ in
     dependencies = [
       sources."css-parse-1.7.0"
       sources."mkdirp-0.5.1"
-      sources."debug-2.6.0"
+      sources."debug-2.6.1"
       sources."sax-0.5.8"
       sources."glob-7.0.6"
       sources."source-map-0.1.43"
@@ -26792,7 +26952,7 @@ in
       sha1 = "9f5772413952135c6fefbf40afe6a4faa88b4bb5";
     };
     dependencies = [
-      sources."sax-1.2.1"
+      sources."sax-1.2.2"
       sources."coa-1.0.1"
       sources."js-yaml-3.7.0"
       sources."colors-1.1.2"
@@ -26928,7 +27088,7 @@ in
       sources."wordwrap-0.0.3"
       sources."minimist-0.0.10"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."bl-1.0.3"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
@@ -26997,7 +27157,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -27041,10 +27201,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "2.1.5";
+    version = "2.1.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-2.1.5.tgz";
-      sha1 = "6fe9479e00e01855247cea216e7561bafcdbcd4a";
+      url = "https://registry.npmjs.org/typescript/-/typescript-2.1.6.tgz";
+      sha1 = "40c7e6e9e5da7961b7718b55505f9cac9487a607";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -27092,10 +27252,10 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.1.3";
+    version = "1.1.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.3.tgz";
-      sha1 = "d07fd8486b5f82d65b3452671d30b16c59e13303";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.7.tgz";
+      sha1 = "eb4ba66b38ec553396fe21ec338181b88c72bf4b";
     };
     dependencies = [
       sources."async-2.1.4"
@@ -27163,7 +27323,7 @@ in
       sources."os-homedir-1.0.2"
       sources."passport-0.3.2"
       sources."passport-local-1.0.0"
-      (sources."raven-1.1.1" // {
+      (sources."raven-1.1.2" // {
         dependencies = [
           sources."json-stringify-safe-5.0.1"
           sources."uuid-3.0.0"
@@ -27500,10 +27660,9 @@ in
       sources."builtin-modules-1.1.1"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.2"
+      sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."supports-color-0.2.0"
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
@@ -27523,7 +27682,7 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."extend-3.0.0"
       sources."har-validator-2.0.6"
@@ -27533,17 +27692,14 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."asynckit-0.4.0"
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."supports-color-2.0.0"
-        ];
-      })
+      sources."chalk-1.1.3"
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
+      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
@@ -27571,7 +27727,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -27809,7 +27965,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -27856,12 +28012,12 @@ in
       sha1 = "7bb1d72ae2087dd1a4af526afec15eed17dda475";
     };
     dependencies = [
-      sources."acorn-4.0.4"
+      sources."acorn-4.0.11"
       sources."acorn-dynamic-import-2.0.1"
-      sources."ajv-4.11.2"
+      sources."ajv-4.11.3"
       sources."ajv-keywords-1.5.1"
       sources."async-2.1.4"
-      sources."enhanced-resolve-3.0.3"
+      sources."enhanced-resolve-3.1.0"
       sources."interpret-1.0.1"
       sources."json-loader-0.5.4"
       sources."loader-runner-2.3.0"
@@ -27957,9 +28113,9 @@ in
       sources."minimalistic-assert-1.0.0"
       sources."bn.js-4.11.6"
       sources."browserify-rsa-4.0.1"
-      sources."elliptic-6.3.2"
+      sources."elliptic-6.3.3"
       sources."parse-asn1-5.0.0"
-      sources."brorand-1.0.6"
+      sources."brorand-1.0.7"
       sources."hash.js-1.0.3"
       sources."asn1.js-4.9.1"
       sources."ripemd160-1.0.1"
@@ -28031,7 +28187,7 @@ in
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."nan-2.5.1"
-      sources."node-pre-gyp-0.6.32"
+      sources."node-pre-gyp-0.6.33"
       sources."nopt-3.0.6"
       sources."npmlog-4.0.2"
       (sources."rc-1.1.6" // {
@@ -28052,14 +28208,10 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      (sources."gauge-2.7.2" // {
-        dependencies = [
-          sources."supports-color-0.2.0"
-        ];
-      })
+      sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."aproba-1.0.4"
+      sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
@@ -28073,7 +28225,7 @@ in
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
@@ -28136,7 +28288,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -28181,7 +28333,7 @@ in
       sources."error-ex-1.3.0"
       sources."is-arrayish-0.2.1"
       sources."is-utf8-0.2.1"
-      sources."hosted-git-info-2.1.5"
+      sources."hosted-git-info-2.2.0"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -28229,7 +28381,7 @@ in
       sources."cmd-shim-2.0.2"
       sources."commander-2.9.0"
       sources."death-1.1.0"
-      sources."debug-2.6.0"
+      sources."debug-2.6.1"
       sources."defaults-1.0.3"
       sources."detect-indent-4.0.0"
       sources."diff-2.2.3"
@@ -28332,14 +28484,10 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      (sources."gauge-2.7.2" // {
-        dependencies = [
-          sources."supports-color-0.2.0"
-        ];
-      })
+      sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."aproba-1.0.4"
+      sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
       sources."wide-align-1.1.0"
       sources."os-homedir-1.0.2"
@@ -28347,7 +28495,7 @@ in
       sources."retry-0.10.1"
       sources."is-finite-1.0.2"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."forever-agent-0.6.1"
@@ -28398,7 +28546,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -28425,4 +28573,4 @@ in
     };
     production = true;
   };
-}
+}
\ No newline at end of file
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 89f0075a3a3..5f48cb9b02e 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -33,6 +33,7 @@
 , { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy.git" }
 , "lcov-result-merger"
 , "meat"
+, "mocha"
 , "nijs"
 , "node2nix"
 , "node-gyp"

From 8a1fcaf5bdde62d316b10d923cae9fb4f1d100b2 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Sun, 12 Feb 2017 19:09:24 -0400
Subject: [PATCH 835/899] Fix sessions with sddm.

---
 nixos/modules/services/x11/display-managers/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 7418ce56357..e8b897fb605 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -32,6 +32,9 @@ let
     ''
       #! ${pkgs.bash}/bin/bash
 
+      # Handle being called by SDDM.
+      if test "''${1:0:1}" = / ; then eval exec $1 $2 ; fi
+
       ${optionalString cfg.displayManager.logToJournal ''
         if [ -z "$_DID_SYSTEMD_CAT" ]; then
           _DID_SYSTEMD_CAT=1 exec ${config.systemd.package}/bin/systemd-cat -t xsession -- "$0" "$@"

From 59e77daf5b077d6f9b1e940a6c884bf0637f1732 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sun, 12 Feb 2017 18:16:18 -0500
Subject: [PATCH 836/899] nixos tests: make getTTYText smart about tty size

---
 nixos/lib/test-driver/Machine.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index 14c39e859bc..85bc376f67f 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -508,7 +508,7 @@ sub screenshot {
 sub getTTYText {
     my ($self, $tty) = @_;
 
-    my ($status, $out) = $self->execute("fold -w 80 /dev/vcs${tty}");
+    my ($status, $out) = $self->execute("fold -w\$(stty -F /dev/tty${tty} size | awk '{print \$2}') /dev/vcs${tty}");
     return $out;
 }
 

From 96d767de621242a5df6de5db82a9b088d24ef606 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sun, 12 Feb 2017 18:17:08 -0500
Subject: [PATCH 837/899] pam_oath: require OATH and pam_unix credentials to be
 valid

---
 nixos/modules/security/pam.nix |   4 +-
 nixos/release.nix              |   1 +
 nixos/tests/pam-oath-login.nix | 126 +++++++++++++++++++++++++++++++++
 3 files changed, 129 insertions(+), 2 deletions(-)
 create mode 100644 nixos/tests/pam-oath-login.nix

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 96e7c45d496..67652fbd1e7 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -253,6 +253,8 @@ let
               "auth sufficient ${pkgs.pam_u2f}/lib/security/pam_u2f.so"}
           ${optionalString cfg.usbAuth
               "auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so"}
+          ${let oath = config.security.pam.oath; in optionalString cfg.oathAuth
+              "auth requisite ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}"}
         '' +
           # Modules in this block require having the password set in PAM_AUTHTOK.
           # pam_unix is marked as 'sufficient' on NixOS which means nothing will run
@@ -271,8 +273,6 @@ let
               "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"}
           ${optionalString cfg.otpwAuth
               "auth sufficient ${pkgs.otpw}/lib/security/pam_otpw.so"}
-          ${let oath = config.security.pam.oath; in optionalString cfg.oathAuth
-              "auth sufficient ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}"}
           ${optionalString use_ldap
               "auth sufficient ${pam_ldap}/lib/security/pam_ldap.so use_first_pass"}
           ${optionalString config.services.sssd.enable
diff --git a/nixos/release.nix b/nixos/release.nix
index c061b9801a0..0f93deddf26 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -283,6 +283,7 @@ in rec {
   tests.leaps = callTest tests/leaps.nix { };
   tests.nsd = callTest tests/nsd.nix {};
   tests.openssh = callTest tests/openssh.nix {};
+  tests.pam-oath-login = callTest tests/pam-oath-login.nix {};
   #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; });
   tests.peerflix = callTest tests/peerflix.nix {};
   tests.postgresql = callTest tests/postgresql.nix {};
diff --git a/nixos/tests/pam-oath-login.nix b/nixos/tests/pam-oath-login.nix
new file mode 100644
index 00000000000..4364d6e354a
--- /dev/null
+++ b/nixos/tests/pam-oath-login.nix
@@ -0,0 +1,126 @@
+import ./make-test.nix ({ pkgs, latestKernel ? false, ... }:
+
+let
+  oathSnakeoilSecret = "cdd4083ef8ff1fa9178c6d46bfb1a3";
+
+  # With HOTP mode the password is calculated based on a counter of
+  # how many passwords have been made. In this env, we'll always be on
+  # the 0th counter, so the password is static.
+  #
+  # Generated in nix-shell -p oathToolkit
+  # via: oathtool -v -d6 -w10 cdd4083ef8ff1fa9178c6d46bfb1a3
+  # and picking a the first 4:
+  oathSnakeOilPassword1 = "143349";
+  oathSnakeOilPassword2 = "801753";
+  oathSnakeOilPassword3 = "019933";
+  oathSnakeOilPassword4 = "403895";
+
+  alicePassword = "foobar";
+  # Generated via: mkpasswd -m sha-512 and passing in "foobar"
+  hashedAlicePassword = "$6$MsMrE1q.1HrCgTS$Vq2e/uILzYjSN836TobAyN9xh9oi7EmCmucnZID25qgPoibkw8qTCugiAPnn4eCGvn1A.7oEBFJaaGUaJsQQY.";
+
+in
+{
+  name = "pam-oath-login";
+
+  machine =
+    { config, pkgs, lib, ... }:
+    {
+      security.pam.oath = {
+        enable = true;
+      };
+
+      users.extraUsers.alice = {
+        isNormalUser = true;
+        name = "alice";
+        uid = 1000;
+        hashedPassword = hashedAlicePassword;
+        extraGroups = [ "wheel" ];
+        createHome = true;
+        home = "/home/alice";
+      };
+
+
+      systemd.services.setupOathSnakeoilFile = {
+        wantedBy = [ "default.target" ];
+        before = [ "default.target" ];
+        unitConfig = {
+          type = "oneshot";
+          RemainAfterExit = true;
+        };
+        script = ''
+          touch /etc/users.oath
+          chmod 600 /etc/users.oath
+          chown root /etc/users.oath
+          echo "HOTP/E/6 alice - ${oathSnakeoilSecret}" > /etc/users.oath
+        '';
+      };
+    };
+
+  testScript =
+    ''
+      $machine->waitForUnit('multi-user.target');
+      $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty1'");
+      $machine->screenshot("postboot");
+
+
+      subtest "Invalid password", sub {
+        $machine->fail("pgrep -f 'agetty.*tty2'");
+        $machine->sendKeys("alt-f2");
+        $machine->waitUntilSucceeds("[ \$(fgconsole) = 2 ]");
+        $machine->waitForUnit('getty@tty2.service');
+        $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty2'");
+
+        $machine->waitUntilTTYMatches(2, "login: ");
+        $machine->sendChars("alice\n");
+        $machine->waitUntilTTYMatches(2, "login: alice");
+        $machine->waitUntilSucceeds("pgrep login");
+
+        $machine->waitUntilTTYMatches(2, "One-time password");
+        $machine->sendChars("${oathSnakeOilPassword1}\n");
+        $machine->waitUntilTTYMatches(2, "Password: ");
+        $machine->sendChars("blorg\n");
+        $machine->waitUntilTTYMatches(2, "Login incorrect");
+      };
+
+      subtest "Invalid oath token", sub {
+        $machine->fail("pgrep -f 'agetty.*tty3'");
+        $machine->sendKeys("alt-f3");
+        $machine->waitUntilSucceeds("[ \$(fgconsole) = 3 ]");
+        $machine->waitForUnit('getty@tty3.service');
+        $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty3'");
+
+        $machine->waitUntilTTYMatches(3, "login: ");
+        $machine->sendChars("alice\n");
+        $machine->waitUntilTTYMatches(3, "login: alice");
+        $machine->waitUntilSucceeds("pgrep login");
+        $machine->waitUntilTTYMatches(3, "One-time password");
+        $machine->sendChars("000000\n");
+        $machine->waitUntilTTYMatches(3, "Login incorrect");
+        $machine->waitUntilTTYMatches(3, "login:");
+      };
+
+      subtest "Happy path (both passwords are mandatory to get us in)", sub {
+        $machine->fail("pgrep -f 'agetty.*tty4'");
+        $machine->sendKeys("alt-f4");
+        $machine->waitUntilSucceeds("[ \$(fgconsole) = 4 ]");
+        $machine->waitForUnit('getty@tty4.service');
+        $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty4'");
+
+        $machine->waitUntilTTYMatches(4, "login: ");
+        $machine->sendChars("alice\n");
+        $machine->waitUntilTTYMatches(4, "login: alice");
+        $machine->waitUntilSucceeds("pgrep login");
+        $machine->waitUntilTTYMatches(4, "One-time password");
+        $machine->sendChars("${oathSnakeOilPassword2}\n");
+        $machine->waitUntilTTYMatches(4, "Password: ");
+        $machine->sendChars("${alicePassword}\n");
+
+        $machine->waitUntilSucceeds("pgrep -u alice bash");
+        $machine->sendChars("touch  done4\n");
+        $machine->waitForFile("/home/alice/done4");
+      };
+
+    '';
+
+})

From a77705748bf85b70807b52b3b27ff446826dde17 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 12 Feb 2017 14:36:37 -0600
Subject: [PATCH 838/899] worker: init at 3.8.5

	modified:   pkgs/top-level/all-packages.nix

    pick 8096649e47 worker: init at 3.8.5
    squash 9267acbd46 modified:   pkgs/top-level/all-packages.nix

worker: updated default.nix license field

Added myself to lib/maintainers.nix

    squash 28173341fa worker: updated default.nix license field
    squash b22407cf5c Added myself to lib/maintainers.nix

Fixed indent and added missing > in maintainers.nix

Fixed curly bracket indent
---
 lib/maintainers.nix                       |  1 +
 pkgs/applications/misc/worker/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 3 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/misc/worker/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 15167408786..3753a6955c8 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -336,6 +336,7 @@
   Nate-Devv = "Nathan Moore <natedevv@gmail.com>";
   nathan-gs = "Nathan Bijnens <nathan@nathan.gs>";
   nckx = "Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>";
+  ndowens = "Nathan Owens <ndowens04@gmail.com>";
   nequissimus = "Tim Steinbach <tim@nequissimus.com>";
   nfjinjing = "Jinjing Wang <nfjinjing@gmail.com>";
   nhooyr = "Anmol Sethi <anmol@aubble.com>";
diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix
new file mode 100644
index 00000000000..63349670d01
--- /dev/null
+++ b/pkgs/applications/misc/worker/default.nix
@@ -0,0 +1,20 @@
+{pkgs, stdenv, xorg, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "worker";
+  version = "3.8.5";
+
+ src = fetchurl {
+   url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}-${version}.tar.gz";
+   sha256 = "1xy02jdf60wg2jycinl6682xg4zvphdj80f8xgs26ip45iqgkmvw";
+};
+
+buildInputs = with pkgs; [ xorg.libX11 ];
+
+  meta = with stdenv.lib; {
+    description = "a two-pane file manager with advanced file manipulation features";
+    homepage = "http://www.boomerangsworld.de/cms/worker/index.html";
+    license =  licenses.gpl2;
+    maintainers = [ maintainers.ndowens ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a5ddc9d3428..f9ddc52ea22 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15588,6 +15588,8 @@ with pkgs;
   wmii_hg = callPackage ../applications/window-managers/wmii-hg { };
 
   wordnet = callPackage ../applications/misc/wordnet { };
+  
+  worker = callPackage ../applications/misc/worker { };
 
   workrave = callPackage ../applications/misc/workrave {
     inherit (gnome2) GConf gconfmm;

From f5a82e4714371a65ed5ccc5ae46c5f106c953f83 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 13 Feb 2017 00:55:12 +0100
Subject: [PATCH 839/899] gitlab service: fix database creation

Providing custom a username and database name was broken. They were
hardcoded to "gitlab".
---
 nixos/modules/services/misc/gitlab.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 1fc3a5cc869..36db4fb9660 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -528,8 +528,8 @@ in {
 
         if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then
           if ! test -e "${cfg.statePath}/db-created"; then
-            psql postgres -c "CREATE ROLE gitlab WITH LOGIN NOCREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.databasePassword}'"
-            ${config.services.postgresql.package}/bin/createdb --owner gitlab gitlab || true
+            psql postgres -c "CREATE ROLE ${cfg.databaseUsername} WITH LOGIN NOCREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.databasePassword}'"
+            ${config.services.postgresql.package}/bin/createdb --owner ${cfg.databaseUsername} ${cfg.databaseName} || true
             touch "${cfg.statePath}/db-created"
           fi
         fi

From 836ab672a89c300a1a6f7a55a4f77bd67107dcbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Mon, 13 Feb 2017 01:02:09 +0100
Subject: [PATCH 840/899] worker: fix indentation

---
 pkgs/applications/misc/worker/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix
index 63349670d01..fade4905cfc 100644
--- a/pkgs/applications/misc/worker/default.nix
+++ b/pkgs/applications/misc/worker/default.nix
@@ -4,12 +4,12 @@ stdenv.mkDerivation rec {
   name = "worker";
   version = "3.8.5";
 
- src = fetchurl {
-   url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}-${version}.tar.gz";
-   sha256 = "1xy02jdf60wg2jycinl6682xg4zvphdj80f8xgs26ip45iqgkmvw";
-};
+  src = fetchurl {
+    url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}-${version}.tar.gz";
+    sha256 = "1xy02jdf60wg2jycinl6682xg4zvphdj80f8xgs26ip45iqgkmvw";
+  };
 
-buildInputs = with pkgs; [ xorg.libX11 ];
+  buildInputs = with pkgs; [ xorg.libX11 ];
 
   meta = with stdenv.lib; {
     description = "a two-pane file manager with advanced file manipulation features";

From 005a9d2d9da3a393bf1a595447487b26b4d96a18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sun, 12 Feb 2017 23:46:43 +0100
Subject: [PATCH 841/899] vimPlugins: update to latest

---
 pkgs/misc/vim-plugins/default.nix | 564 +++++++++++++++---------------
 1 file changed, 277 insertions(+), 287 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 3ee8f32da0c..f7274219bdc 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -123,11 +123,11 @@ rec {
   };
 
   CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "CheckAttach-2015-06-22";
+    name = "CheckAttach-2017-02-12";
     src = fetchgit {
       url = "git://github.com/chrisbra/CheckAttach";
-      rev = "a1d86be7e69b25b41ce1a7fe2d2844330f783b68";
-      sha256 = "0scshz5vc5j2lhjj5is4y392xarwsdh4z3y7kyibq3d7fmszksgn";
+      rev = "17e8e37e348a93f2a2104f07f1224c9c8798f85e";
+      sha256 = "0i8y0h840bpj5s0vf603ghjnpfyds5q7y8c4p8a58qzw20i2v88g";
     };
     dependencies = [];
 
@@ -178,11 +178,11 @@ rec {
   };
 
   Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2016-12-23";
+    name = "Syntastic-2017-02-07";
     src = fetchgit {
       url = "git://github.com/scrooloose/syntastic";
-      rev = "78c0d21a9b0329766732ca2743a848af1c49e791";
-      sha256 = "1n744grp4ajn4zfra5kfg97sj8rjkqcw1sgx2jbj5qq8l3p5ghad";
+      rev = "53a3db5e3bfbafb660ebbdbc8210e3b30cb60c10";
+      sha256 = "0kinqr5azlcs01q8czynxvbjswfdjh30xww26a8lf2h9750qzyhi";
     };
     dependencies = [];
 
@@ -200,22 +200,22 @@ rec {
   };
 
   Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Tagbar-2017-01-03";
+    name = "Tagbar-2017-02-12";
     src = fetchgit {
       url = "git://github.com/majutsushi/tagbar";
-      rev = "18b536ce43f1be88be380e5f3b7cd0fd930b4908";
-      sha256 = "0k4c5f3qvszn3a9ndkcl984w832vk2g4hfwl4nkvy9bwqg7q89ya";
+      rev = "9d051c1e2d9f3dc88d3ae00485e55934b06d42f7";
+      sha256 = "055n6armj80vmyv9kc8jhd84wl6nrr8qf7fj6b5vxp221y86wf3x";
     };
     dependencies = [];
 
   };
 
   The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_Commenter-2016-12-15";
+    name = "The_NERD_Commenter-2017-01-22";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdcommenter";
-      rev = "18cfe815501c8264844223a944eb388285b48caa";
-      sha256 = "05dg5v1pal5ly8shc4rlnqip5zsdx9901h4336a2k81lss269wd4";
+      rev = "607253203dc2fc1798dbe2ea9a3471db9c12e005";
+      sha256 = "1z7rg52153vm5vj5xpvqny0aikvlr7nk9nfkrwnfxcs4jq8i752d";
     };
     dependencies = [];
 
@@ -233,11 +233,11 @@ rec {
   };
 
   UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "UltiSnips-2016-12-16";
+    name = "UltiSnips-2017-01-20";
     src = fetchgit {
       url = "git://github.com/SirVer/ultisnips";
-      rev = "f974e0317f549c7cf54fa231ee0501206aed6882";
-      sha256 = "0kvpgdkfc70phj2zf6lcblxb25hliiaz2cwg61bq7ip06sbk0fq0";
+      rev = "5352d98f212e273b3e8b1d84efdbe2d6a6d557e9";
+      sha256 = "0d27823qnfd9qcj2a2x77slsw725jfa9s40ilw4qp9ab03bma1ci";
     };
     dependencies = [];
 
@@ -281,28 +281,6 @@ rec {
     sourceRoot = ".";
   };
 
-  vim-highlightedyank = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-highlightedyank-2017-01-04";
-    src = fetchgit {
-      url = "git://github.com/machakann/vim-highlightedyank";
-      rev = "17327fd1072ac15a30f596a2fc0b6cef122e0640";
-      sha256 = "08rc1br8npvkxxh3jn9hmn4yh4nlxy04c8nwyrnpndhw05kca33a";
-    };
-    dependencies = [];
-
-  };
-
-  alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "alchemist.vim-2017-01-02";
-    src = fetchgit {
-      url = "git://github.com/slashmili/alchemist.vim";
-      rev = "c22d4883b7e2bfed78b70b557d816bf0491d7dd4";
-      sha256 = "0iv91mfj3lxc41xb8sxhl9mby5dllzyvw8508igrj5lvyrd1ikkf";
-    };
-    dependencies = [];
-
-  };
-
   commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "commentary-2016-03-10";
     src = fetchgit {
@@ -330,11 +308,11 @@ rec {
   };
 
   ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-py-matcher-2016-09-02";
+    name = "ctrlp-py-matcher-2017-01-05";
     src = fetchgit {
       url = "git://github.com/FelikZ/ctrlp-py-matcher";
-      rev = "3624f3a085681f787f1f9b7a8a24d4bed395acf1";
-      sha256 = "1126gphnhfvba5xzvqj4s582k61xsvi5hn86zag42v14v5csgw9d";
+      rev = "a0710a4937ab9dc10bc0a8b56b41fcc88534147c";
+      sha256 = "198y8998sx2maarn2vawx8hqldsfbnn4i6rlg56qw6brsrssssx2";
     };
     dependencies = [];
 
@@ -351,17 +329,6 @@ rec {
 
   };
 
-  delimitMate = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "delimitMate-2016-07-19";
-    src = fetchgit {
-      url = "git://github.com/Raimondi/delimitMate";
-      rev = "b5719054beebe0135c94f4711a06dc7588041f09";
-      sha256 = "03nmkiq138w6kq4s3mh4yyr6bjvqwj8hg6qlji1ng4vnzb0638q3";
-    };
-    dependencies = [];
-
-  };
-
   extradite = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "extradite-2015-09-22";
     src = fetchgit {
@@ -374,22 +341,11 @@ rec {
   };
 
   fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fugitive-2016-11-13";
+    name = "fugitive-2017-02-10";
     src = fetchgit {
       url = "git://github.com/tpope/vim-fugitive";
-      rev = "b754bc2031f21a532c083dd0d072ba373bbe3a37";
-      sha256 = "1sig8dl3m1dw5zjxdsp00n1cacmcwdvas3iz04zk88v6xsm8rj22";
-    };
-    dependencies = [];
-
-  };
-
-  vim-lawrencium = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-lawrencium-2017-01-10";
-    src = fetchgit {
-      url = "git://github.com/ludovicchabant/vim-lawrencium";
-      rev = "88077183e1f5a9a1f741aeab7a1374cfed9e917f";
-      sha256 = "0z31v93wjycq4lqvbl1jzxi7i5i1vl919m4dyyzphybcqrjjpnab";
+      rev = "f44845e4408aae03e018e98afb7fbf0c2ee87dd5";
+      sha256 = "1rd6iqg1q8wchsypm0mg75mfc93y871xsx6cl733771w83zi91hq";
     };
     dependencies = [];
 
@@ -407,22 +363,22 @@ rec {
   };
 
   vim-auto-save = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-auto-save-2016-09-12";
+    name = "vim-auto-save-2017-01-16";
     src = fetchgit {
       url = "git://github.com/907th/vim-auto-save";
-      rev = "28300c8a7b8cea137c065a48fd9bcc2348f08707";
-      sha256 = "0n3xbp8vf3xsh6y6f855q313scldqm9593bhxydyszy1parvxwb5";
+      rev = "8301d9a7bb60151f8b07b3be1a9b66a7c8aa81c5";
+      sha256 = "1yp117kfgrg5hsgm48k9ahh6pgirl1nx2z9k36ixpg80cj2wyj2y";
     };
     dependencies = [];
 
   };
 
   vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-autoformat-2016-12-13";
+    name = "vim-autoformat-2017-02-06";
     src = fetchgit {
       url = "git://github.com/Chiel92/vim-autoformat";
-      rev = "3715e166a5aa006353ca5bfad2386767676fe848";
-      sha256 = "0ki41pdrl5y4fry3xqn4sdx48zvvd3gc59qzs1nssvn9zp0k9il5";
+      rev = "56170ff0d3c4e7b9acf0d373425ae2b2f047036e";
+      sha256 = "0q4jz79jn6w9nkfvy9dk41d2krccx6pn91lm51987j9viijb6kyq";
     };
     dependencies = [];
 
@@ -439,12 +395,34 @@ rec {
 
   };
 
+  tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "tsuquyomi-2017-01-31";
+    src = fetchgit {
+      url = "git://github.com/Quramy/tsuquyomi";
+      rev = "201d84d37ac9077855942dc9c6e6e235e285f20f";
+      sha256 = "1rcibh4clxw8sq2n8072i4x52msvfxim9r9rwqi264jm31s81yyx";
+    };
+    dependencies = [];
+
+  };
+
+  delimitMate = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "delimitMate-2016-07-19";
+    src = fetchgit {
+      url = "git://github.com/Raimondi/delimitMate";
+      rev = "b5719054beebe0135c94f4711a06dc7588041f09";
+      sha256 = "03nmkiq138w6kq4s3mh4yyr6bjvqwj8hg6qlji1ng4vnzb0638q3";
+    };
+    dependencies = [];
+
+  };
+
   deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-nvim-2017-01-04";
+    name = "deoplete-nvim-2017-02-09";
     src = fetchgit {
       url = "git://github.com/Shougo/deoplete.nvim";
-      rev = "90569837af21ad0438448582b34d8418b745ffeb";
-      sha256 = "1qkzvgvjg397zaj1i56ld9i0gf2w9y5x2if5gbmag56nhxcwfw32";
+      rev = "2e9fd874b7d974a03df8af10a090e2601b16c7f0";
+      sha256 = "1zj80jxsnff2s16wkim56sxks7p2nj5dv073v30nbscbxacq6hvp";
     };
     dependencies = [];
 
@@ -473,22 +451,22 @@ rec {
   };
 
   vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-css-color-2016-10-11";
+    name = "vim-css-color-2017-02-09";
     src = fetchgit {
       url = "git://github.com/ap/vim-css-color";
-      rev = "27903efc1b5330230d5c8c336c26ac7a8ac2e5dc";
-      sha256 = "0kr9xf2y001d42x7fam50qbd09fb3rr374qv8m2p5z2d9c21par1";
+      rev = "2411b84298eb6db034001f35ce7cc32c36f9b43b";
+      sha256 = "1igqshk7wkh1wgihnmxnlh84fb98fm9lm8lfyjpcz6x8rg5vpmwc";
     };
     dependencies = [];
 
   };
 
   clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "clighter8-2017-01-03";
+    name = "clighter8-2017-02-12";
     src = fetchgit {
       url = "git://github.com/bbchung/clighter8";
-      rev = "89d70129ab5437c749041094fa71da97c95bda3f";
-      sha256 = "147i6rhz6ri86k6p0sim72vpsc5f6y8dvwxn7am6vyi21avy4zrz";
+      rev = "357a0292438dfad356ce52c94f96840063fad80d";
+      sha256 = "0rd5ikq7ln0n2a1alhjzcjhqdfa5m5laylsg24xl1py32lcqayak";
     };
     dependencies = [];
     preFixup = ''
@@ -498,11 +476,11 @@ rec {
   };
 
   neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neomake-2017-01-04";
+    name = "neomake-2017-02-12";
     src = fetchgit {
       url = "git://github.com/benekastah/neomake";
-      rev = "9794f6caef063ba1283bb728ac3befda477935f3";
-      sha256 = "11rpc98nv9viyv82j5y4l29jc62bmd2rddp90a6740p8dx5gvx5q";
+      rev = "375684a1c81ffe24a8e2dfb1e92d164498f38653";
+      sha256 = "1yhkh94fpnwk335s6xd17jl5w6mrzj8vz9aw3g39gf5m4lwlqn8w";
     };
     dependencies = [];
 
@@ -520,33 +498,33 @@ rec {
   };
 
   vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-tmux-navigator-2016-09-03";
+    name = "vim-tmux-navigator-2017-01-28";
     src = fetchgit {
       url = "git://github.com/christoomey/vim-tmux-navigator";
-      rev = "e79d4c0c24c43d3ada283b1f5a1b8fa6cf820a70";
-      sha256 = "1p4kb8ja86pa3l9jh8yfjvdvdik4fwnpbpl34npjwbga52pawn65";
+      rev = "34f8fbf1d4ebaa1bf1db6715b17a197eaffe1ad8";
+      sha256 = "074isx0kksl7kc72n1n8ywqcx5vj7ndz01jaih14nwqpqshv2zgx";
     };
     dependencies = [];
 
   };
 
   spacevim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "spacevim-2016-12-02";
+    name = "spacevim-2017-01-22";
     src = fetchgit {
       url = "git://github.com/ctjhoa/spacevim";
-      rev = "9bb2a04b14964a7db1d4131e1af1ed8bd31e910b";
-      sha256 = "0hq6g8czi73hgpkpigi177kp49dslh8xny3j7wjl03bjxsq9fkmk";
+      rev = "bd6ebf63a9a6742823d3d090f992fabe500240c5";
+      sha256 = "10rwqsnd9k255anppj27xjqlcfj91k8jy7c377jk7hqbn5h7dmzn";
     };
     dependencies = [];
 
   };
 
   ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-vim-2016-11-29";
+    name = "ctrlp-vim-2017-01-13";
     src = fetchgit {
       url = "git://github.com/ctrlpvim/ctrlp.vim";
-      rev = "2868678a987834563bbc384763135462c2423eb8";
-      sha256 = "0s98nqj22i4x79mqspjkz6b6rpg8hf79iblv4md2ivzlj7ffccx3";
+      rev = "7fa89fec125ce60a341f7c37dd769a8a31c49359";
+      sha256 = "12x1bkipvqbz2jczl80rj6yd61hq18g3g2cx2r1yk19f6n8nfjvc";
     };
     dependencies = [];
 
@@ -575,18 +553,18 @@ rec {
   };
 
   vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-jade-2016-10-31";
+    name = "vim-jade-2017-02-01";
     src = fetchgit {
       url = "git://github.com/digitaltoad/vim-jade";
-      rev = "cc1bddc890f4856aa0511fdfd7c55d2e66f688b5";
-      sha256 = "1d5rbaslvr14lcdffrxp0ycsm2nzvq5zyjk0x0nzwhzvvs4fqi40";
+      rev = "eb8c6b23b86fdc93cd2a34217adfe5f6b2d7d05d";
+      sha256 = "1y325pq8r4njx6mz5y2hk0j6dpkbw9f6cxp0n2hdfp4xj9qgx9v1";
     };
     dependencies = [];
 
   };
 
-  dracula = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "dracula-2016-09-21";
+  vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-2016-09-21";
     src = fetchgit {
       url = "git://github.com/dracula/vim";
       rev = "926dfbab01128322f6326bdd10de2856b1fa3232";
@@ -607,17 +585,6 @@ rec {
 
   };
 
-  neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neco-vim-2017-01-16";
-    src = fetchgit {
-      url = "git://github.com/shougo/neco-vim";
-      rev = "d28e1ea78f90d72636895dbd758de6b35aae2dfa";
-      sha256 = "1qsyicxykl350zz86j7k6k9rflcf5nwrc5jbk9135zs5i8g1lqf3";
-    };
-    dependencies = [];
-
-  };
-
   editorconfig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "editorconfig-vim-2016-07-16";
     src = fetchgit {
@@ -640,23 +607,34 @@ rec {
 
   };
 
+  vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-elixir-2017-01-24";
+    src = fetchgit {
+      url = "git://github.com/elixir-lang/vim-elixir";
+      rev = "9cbb3ee3865c594ed017f8118a80b355cd7e238f";
+      sha256 = "14mlnjpmgfal4vai2k8jjmhszwgyhnf3v75rssj05n47qnzlddk4";
+    };
+    dependencies = [];
+
+  };
+
   elm-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "elm-vim-2016-11-26";
+    name = "elm-vim-2017-01-13";
     src = fetchgit {
       url = "git://github.com/elmcast/elm-vim";
-      rev = "16a9a380a514e23c02d4bd7374112aa2dac1f3a4";
-      sha256 = "1mjccw7yx8hrn4vriickzag9z5g3xzqd6qh6w3xkw0nfh8mx2sgn";
+      rev = "0c1fbfdf12f165681b8134ed2cae2c148105ac40";
+      sha256 = "0l871hzg55ysns5h6v7xq63lwf4135m3xggm2s4q2pmzizivk0x2";
     };
     dependencies = [];
 
   };
 
   vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-localvimrc-2016-11-08";
+    name = "vim-localvimrc-2017-02-07";
     src = fetchgit {
       url = "git://github.com/embear/vim-localvimrc";
-      rev = "9f6de2ddfea2a397bc3e5335779bc93a8260ff99";
-      sha256 = "0ks8x7zjqnbm06y3niidj9h0ccqky29b2vpdkvs1vwnli10bg6sh";
+      rev = "775ea57b9f433bdaf83c42c26d51137e1e7b3b98";
+      sha256 = "094jmnfzl1girjwhpg4kq48lrdcfrx4x1baq1n8rjlm2zln2sbdx";
     };
     dependencies = [];
 
@@ -685,11 +663,11 @@ rec {
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2017-01-01";
+    name = "vim-go-2017-02-02";
     src = fetchgit {
       url = "git://github.com/fatih/vim-go";
-      rev = "d7c628ff228c2e6a4d4d5808f198471a775cf8b5";
-      sha256 = "1375qz8id08d10p6i7ppvk3khq778996bx1n7qarz6vx6kb19zcn";
+      rev = "1425decf6d4e1b313955cefe08c859d07c2c2822";
+      sha256 = "1pql4m5iiajqk6qfb3nahlf2q2ixp425lg5bni16rk78r173wqvl";
     };
     dependencies = [];
 
@@ -707,11 +685,11 @@ rec {
   };
 
   floobits-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "floobits-neovim-2016-10-07";
+    name = "floobits-neovim-2017-02-08";
     src = fetchgit {
       url = "git://github.com/floobits/floobits-neovim";
-      rev = "85d3493d05ac1d7f5606d40fbe619df16af917bc";
-      sha256 = "16c12dgk60mmhyijfk4f33k8i48r1hpjlnxlvdk5kymv7b2xq0fa";
+      rev = "9755412fcd68cfc76a36aa000682a84d96013650";
+      sha256 = "1mn6kikygk86xblxg8kklkrrxagil4az76z0mzid847g4jw4hfd1";
     };
     dependencies = [];
 
@@ -740,55 +718,55 @@ rec {
   };
 
   vim-jsdoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-jsdoc-2016-10-30";
+    name = "vim-jsdoc-2017-02-11";
     src = fetchgit {
       url = "git://github.com/heavenshell/vim-jsdoc";
-      rev = "45c7c7cef440a29f7bf24436640413e3d5d578ff";
-      sha256 = "0kr4p01pyrz9w7yfh50gsz6n60qvnqxsr1055hvsyx36nzw6l3za";
+      rev = "cd8f084c3b4bd198620d45a007cee6b009b57b35";
+      sha256 = "0a2d9jwxjws8l7y89yn7xl07r5yh7r7987a8hfalvz12qmdmff1j";
     };
     dependencies = [];
 
   };
 
   vim-leader-guide = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-leader-guide-2016-11-06";
+    name = "vim-leader-guide-2017-02-12";
     src = fetchgit {
       url = "git://github.com/hecal3/vim-leader-guide";
-      rev = "b1dd2667cb74147c06853c39530984fbc629eb48";
-      sha256 = "0xacamv3dcnkdh9xclvw76fp20rxgqb1m3068l582c6g5p7lj0yi";
+      rev = "b545f700ae13e5b6c3e8c1d6e9796305690ba2da";
+      sha256 = "0d1d8w1kp0h4j5hgh2ighvn6l00rq714fwxbswx07l5r931prwy1";
     };
     dependencies = [];
 
   };
 
   idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "idris-vim-2016-07-29";
+    name = "idris-vim-2017-01-27";
     src = fetchgit {
       url = "git://github.com/idris-hackers/idris-vim";
-      rev = "7ef7a2ed9135d69a0dea6b571a20ddf2b0bf7a90";
-      sha256 = "0py7vyg38yn6bl7pwyyhylpqp14smqjzbfj7rjzjfnlq33v7ysij";
+      rev = "c9b8066730fd8e62cf20eecf0e2c60f225ff12c8";
+      sha256 = "0nkr2qwykl57xky3dpz40m5gy7s1kjfsgb1kzj7z9jqm6a41m2bb";
     };
     dependencies = [];
 
   };
 
   calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "calendar-vim-2016-12-06";
+    name = "calendar-vim-2017-02-09";
     src = fetchgit {
       url = "git://github.com/itchyny/calendar.vim";
-      rev = "6cf60f08a42c8b22ea3ae191a89e1faa4fdd3dae";
-      sha256 = "172xgsmzwpy890bg813d89wz210lfdhckvispdl45l15armdy99y";
+      rev = "e6fef6c6f7bdab98026cd2fa1a3900ce2bd0b852";
+      sha256 = "0330vjkd54mx22qyxbgrxnz2k2ybm6izvi5wl6qm5p39dkqwg8ip";
     };
     dependencies = [];
 
   };
 
   lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "lightline-vim-2016-12-03";
+    name = "lightline-vim-2017-02-12";
     src = fetchgit {
       url = "git://github.com/itchyny/lightline.vim";
-      rev = "059888ab650fa192dd441e52bd9f41f08b247529";
-      sha256 = "1pa627jjmrhlfbd8yms8lvfgnm0gj9xkr29jkq122icfl6hv3fwx";
+      rev = "a63a00d548fd20457a4f31d31fb9c8fe8a7ebc2a";
+      sha256 = "13fpf1rdaswz5c3wgpc1jjrzw47jhm896q5z0dc82lrfwsggp5a5";
     };
     dependencies = [];
 
@@ -805,17 +783,6 @@ rec {
 
   };
 
-  typescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "typescript-vim-2016-08-10";
-    src = fetchgit {
-      url = "git://github.com/leafgarland/typescript-vim";
-      rev = "7e25a901af7cd993498cc9ecfc833ca2ac21db7a";
-      sha256 = "0n5lrn741ar6wkvsi86kf7hgdjdwq34sn3ppzcddhvic5hayrkyk";
-    };
-    dependencies = [];
-
-  };
-
   vim-ipython = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-ipython-2015-06-23";
     src = fetchgit {
@@ -839,22 +806,22 @@ rec {
   };
 
   vim-orgmode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-orgmode-2016-11-12";
+    name = "vim-orgmode-2017-01-31";
     src = fetchgit {
       url = "git://github.com/jceb/vim-orgmode";
-      rev = "67a693c37bac75ba163d35b9972efd0c7e0deb71";
-      sha256 = "1rdcyfdyq4lbfh9ya63kf05aqcr9g6q7r4ngzn1fgy7pmqdpk7vf";
+      rev = "37fc5db4d167ca0def23febcb06d984ab72015be";
+      sha256 = "19cyd7l7xf9yhrx2k735hksd40hxy8izj30l1bl3a8v01lwv088x";
     };
     dependencies = [];
 
   };
 
   vim-buffergator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-buffergator-2016-10-19";
+    name = "vim-buffergator-2017-02-05";
     src = fetchgit {
       url = "git://github.com/jeetsukumaran/vim-buffergator";
-      rev = "c07d16dd3df10bbb5adc3e9b009e341bfa1f673e";
-      sha256 = "0bj70lkqizfzmaxwrxcqv1151kx37v2v57aaqy4vcnfn04wq3h95";
+      rev = "04dfbc0c78b0a29b340a99d0ff36ecf8f16e017d";
+      sha256 = "1z13qqmvzismz7f6ss2pk956adnqh14df8qrlzk9rgplknm4w6k7";
     };
     dependencies = [];
 
@@ -872,22 +839,22 @@ rec {
   };
 
   auto-pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "auto-pairs-2016-11-21";
+    name = "auto-pairs-2017-01-26";
     src = fetchgit {
       url = "git://github.com/jiangmiao/auto-pairs";
-      rev = "84518168107c34fb540ee4f8cde743ceaf682bae";
-      sha256 = "104mahfn956vb98psfml0b4x1yhwn8w6af3hkym3fdxy4ksh4fj4";
+      rev = "e915d857fe927309ef0090e830f892204b750c43";
+      sha256 = "11scssclvrri1lix3bbx2xrrznjihvd2g4c5d5xqv1ab14yrs6q4";
     };
     dependencies = [];
 
   };
 
   vim-nerdtree-tabs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-nerdtree-tabs-2016-09-19";
+    name = "vim-nerdtree-tabs-2017-02-12";
     src = fetchgit {
       url = "git://github.com/jistr/vim-nerdtree-tabs";
-      rev = "5a91230193fea7f9c8d792cb5c635998d868337d";
-      sha256 = "08g587bnd8n61nj44ghjadwqpbbqya4hig56afna6rhs341zwlpm";
+      rev = "de6a60909e71790baf5d46f863643379ec19bc4c";
+      sha256 = "1h9r9c9b788b6fz56s12ih85zyf1vv0bzrl7k54vl4cncryyw37y";
     };
     dependencies = [];
 
@@ -927,11 +894,11 @@ rec {
   };
 
   fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fzf-vim-2016-12-25";
+    name = "fzf-vim-2017-02-08";
     src = fetchgit {
       url = "git://github.com/junegunn/fzf.vim";
-      rev = "2066643243eddf2ed1f5d3a1a5485d6ff71851a4";
-      sha256 = "0svw41n4x1j7s9l7qh5s0mk2s5ibdfq4pzdiknvfb342na6xi2b5";
+      rev = "dade777e6dad6a318630d7ce26b9761761522c40";
+      sha256 = "0yixz5nr6c6719yfcpci21fhx6kk6wa0213zlkipj8aij2y6ygfy";
     };
     dependencies = [];
 
@@ -949,11 +916,11 @@ rec {
   };
 
   vim-peekaboo = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-peekaboo-2016-08-05";
+    name = "vim-peekaboo-2017-01-13";
     src = fetchgit {
       url = "git://github.com/junegunn/vim-peekaboo";
-      rev = "9c8415c022ab24ce51af13aa43255d5a7c7ef670";
-      sha256 = "10c8j4wcg7g3i3vyvlcc21j0a3xmbl5ii5fl5k27iy2icf5rm018";
+      rev = "9de6fd70ad20cbf568664c06d673c69e2f622287";
+      sha256 = "0b5bfvwzy5l8g8s5z1h60c0y3phw2x0gyh1516sdlaq0nmvg2dky";
     };
     dependencies = [];
 
@@ -981,6 +948,17 @@ rec {
 
   };
 
+  typescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "typescript-vim-2016-08-10";
+    src = fetchgit {
+      url = "git://github.com/leafgarland/typescript-vim";
+      rev = "7e25a901af7cd993498cc9ecfc833ca2ac21db7a";
+      sha256 = "0n5lrn741ar6wkvsi86kf7hgdjdwq34sn3ppzcddhvic5hayrkyk";
+    };
+    dependencies = [];
+
+  };
+
   vim-jinja = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-jinja-2016-11-16";
     src = fetchgit {
@@ -993,11 +971,11 @@ rec {
   };
 
   vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2017-01-03";
+    name = "vimtex-2017-02-09";
     src = fetchgit {
       url = "git://github.com/lervag/vimtex";
-      rev = "4c76e8f74025c6c753167f23a6be0bcfc1e39af7";
-      sha256 = "1syl4wyffn59i43q6kcy3hz5kzwmp0wj4xmwsahg81fxq4wzdz3n";
+      rev = "de61b31cf89b6fd4653dc812d779abcf21ed33d0";
+      sha256 = "0cg0l4jm9zfmg7nx0zha5cpv9c9szyj7fmfs19v1r7bzc3dvi492";
     };
     dependencies = [];
 
@@ -1014,6 +992,17 @@ rec {
 
   };
 
+  vim-lawrencium = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-lawrencium-2017-01-10";
+    src = fetchgit {
+      url = "git://github.com/ludovicchabant/vim-lawrencium";
+      rev = "88077183e1f5a9a1f741aeab7a1374cfed9e917f";
+      sha256 = "0z31v93wjycq4lqvbl1jzxi7i5i1vl919m4dyyzphybcqrjjpnab";
+    };
+    dependencies = [];
+
+  };
+
   rainbow = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "rainbow-2016-10-28";
     src = fetchgit {
@@ -1040,12 +1029,23 @@ rec {
     buildInputs = [ xkb_switch ];
   };
 
+  vim-highlightedyank = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-highlightedyank-2017-01-04";
+    src = fetchgit {
+      url = "git://github.com/machakann/vim-highlightedyank";
+      rev = "17327fd1072ac15a30f596a2fc0b6cef122e0640";
+      sha256 = "08rc1br8npvkxxh3jn9hmn4yh4nlxy04c8nwyrnpndhw05kca33a";
+    };
+    dependencies = [];
+
+  };
+
   vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-startify-2017-01-02";
+    name = "vim-startify-2017-02-04";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-startify";
-      rev = "c26fcfcd17cfa64e051c8aa97f78894d91a21604";
-      sha256 = "0rcvh612qvcsbf0bagq44dk2hbarhcc2v9a8n7lc5f7rsgdhxp7w";
+      rev = "5e9e6a48c992d9255a3be2f96765c9bb80faae97";
+      sha256 = "1gnpg59i81hwhqva5grjd4f5lnjaclwwra58sgv30mrxkjg4d741";
     };
     dependencies = [];
 
@@ -1096,22 +1096,22 @@ rec {
   };
 
   haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "haskell-vim-2016-12-29";
+    name = "haskell-vim-2017-02-08";
     src = fetchgit {
       url = "git://github.com/neovimhaskell/haskell-vim";
-      rev = "434f5903556e2bea99d433d48adb681cb4967d27";
-      sha256 = "0lwclld3yqh4mf0bqqaxvqsfqsjq8q5pl27q1byqrr9x3ngjx5zz";
+      rev = "c07c2b63f393252412b9c65726f2693bcacef71b";
+      sha256 = "09xcsh3411l1wj7w0cwalcpd26rdw4k9idd2mclywrzlrlfddl9b";
     };
     dependencies = [];
 
   };
 
   cpsm = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "cpsm-2016-09-21";
+    name = "cpsm-2017-02-12";
     src = fetchgit {
       url = "git://github.com/nixprime/cpsm";
-      rev = "565ab53a66fa52c46d80adf6981b07f4bdffcb1d";
-      sha256 = "125gcnqrg2276sp715q924cxwjxwsv3j4m0n1zj17w9srnpn4r1k";
+      rev = "8e61bf3e30868c57ad7cf1fe4315b2352d61467c";
+      sha256 = "0qcc10dx48wyvcgz9q3nid9l1wxvl9m97608s289lj4zps8iqpcs";
     };
     dependencies = [];
     buildInputs = [
@@ -1151,22 +1151,22 @@ rec {
   };
 
   vim-markdown = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-markdown-2016-05-19";
+    name = "vim-markdown-2017-02-02";
     src = fetchgit {
       url = "git://github.com/plasticboy/vim-markdown";
-      rev = "a3169545f330ec8080244c3ad755bb2211eca8a0";
-      sha256 = "1ycqx280xpc5gvfx8rrnmkqlv8q8g51hgiryx6yvd9a8ci805cx1";
+      rev = "d6d59eef6f604b6430fd6adade9e18364666232b";
+      sha256 = "1p2ygvlg9abi4v52v9jh0aj76ll490w5d0gfsds33gy88hzl4js6";
     };
     dependencies = [];
 
   };
 
   vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-racer-2017-01-04";
+    name = "vim-racer-2017-02-08";
     src = fetchgit {
       url = "git://github.com/racer-rust/vim-racer";
-      rev = "3bd56cc87518c1bf02b681d586447366ae8e815a";
-      sha256 = "0wq2iwgb7wpg62r68f9j5g3kycyap8sks735p9mcsq63rrqmw6l4";
+      rev = "34f806e26fcd9271b0de5d34aab7f4e8ac13050e";
+      sha256 = "07wmf40f7wvcb4wqdx6qqwhvbgaaawa2vxb6y1b28njzc05b01cd";
     };
     dependencies = [];
 
@@ -1184,11 +1184,11 @@ rec {
   };
 
   vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-grammarous-2017-01-03";
+    name = "vim-grammarous-2017-02-12";
     src = fetchgit {
       url = "git://github.com/rhysd/vim-grammarous";
-      rev = "33f9b3a0f8d6fb01e3c565948bd6185f5079d732";
-      sha256 = "0l4qbd5phqqxdz1g7xz20p2fql1x2ccsv6v7sgal8bvk6b5f8dk0";
+      rev = "3e096ed4d5b702167470f771ba2a40b31949dddf";
+      sha256 = "0lxfy6gilcpjjypgpmw37hy3gk27bf51vggjkkrh3270xwxkmqj0";
     };
     dependencies = [];
 
@@ -1206,66 +1206,77 @@ rec {
   };
 
   neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neoformat-2016-12-24";
+    name = "neoformat-2017-02-11";
     src = fetchgit {
       url = "git://github.com/sbdchd/neoformat";
-      rev = "a0460e8ef4e48d8d1ee9c377546820a6164fee16";
-      sha256 = "0jlvvc1ijpkadjqix6gr17y8gnfc0rhjqzbg08biw8jpks4fh44p";
+      rev = "21117552efdc3fa8bac0d6977a30ba247c20e67b";
+      sha256 = "09mrfbzpqi0kk39f9k76nmwq2b5pr0pvrdak9p13774kxm76gwvm";
     };
     dependencies = [];
 
   };
 
   vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-polyglot-2016-12-20";
+    name = "vim-polyglot-2017-02-02";
     src = fetchgit {
       url = "git://github.com/sheerun/vim-polyglot";
-      rev = "e404a658b1647fad396a954776eda0bdabf8353c";
-      sha256 = "11q4k3yj1spxzhxjcwnild4njqmafznm179scvcw8lci8sm8w3hm";
+      rev = "fbeb019a8516939bd904983ddc341e65c2ea19cb";
+      sha256 = "1b645k07spg95lm6x7dq222v86lxsgnsvdcgy1srh9vx11lhvyny";
+    };
+    dependencies = [];
+
+  };
+
+  neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "neco-vim-2017-01-16";
+    src = fetchgit {
+      url = "git://github.com/shougo/neco-vim";
+      rev = "d28e1ea78f90d72636895dbd758de6b35aae2dfa";
+      sha256 = "1qsyicxykl350zz86j7k6k9rflcf5nwrc5jbk9135zs5i8g1lqf3";
     };
     dependencies = [];
 
   };
 
   neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neocomplete-vim-2017-01-01";
+    name = "neocomplete-vim-2017-01-08";
     src = fetchgit {
       url = "git://github.com/shougo/neocomplete.vim";
-      rev = "7904f0ff33ce667dfb203e812b783bf443c983cf";
-      sha256 = "1gxvmzmlk8ga45vs8c24in92k6i9z3vxpmcpqpjjc40f4l8hqyds";
+      rev = "9617d825c0d4acdb18aec903e9c1c0443058d18b";
+      sha256 = "0a6mhh0ylzgjddlnwqaa5zq4abpv2dhhw7wv7w9lmwa82w31j5ya";
     };
     dependencies = [];
 
   };
 
   neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-snippets-2016-11-05";
+    name = "neosnippet-snippets-2017-01-24";
     src = fetchgit {
       url = "git://github.com/shougo/neosnippet-snippets";
-      rev = "4431bf176650696d5a8dd93814812afd0d06212c";
-      sha256 = "0fbwzlvdbrmia97pyzgyffbqrimp2dxjn6cc45ia1kqgnhwdk4pd";
+      rev = "8e2b1c0cab9ed9a832b3743dbb65e9966a64331a";
+      sha256 = "151wpvbj6jb9jdkbhj3b77f5sq7y328spvwfbqyj1y32rg4ifmc6";
     };
     dependencies = [];
 
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2017-01-02";
+    name = "neosnippet-vim-2017-02-09";
     src = fetchgit {
       url = "git://github.com/shougo/neosnippet.vim";
-      rev = "65af2b9bcad50ba1543b38a8dd30df1aee2142ce";
-      sha256 = "107xb0pvqc4ivqpz5i7z8xfk26577y3jsxzvm86bizbxc2wi92m9";
+      rev = "db828325268ca28c17674bd876b40be895daa27e";
+      sha256 = "1l3zxxj90341slf0k6hprjgjy4slsajbc95v4l46bchcsyxsrh3i";
     };
     dependencies = [];
 
   };
 
   unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "unite-vim-2016-12-14";
+    name = "unite-vim-2017-02-10";
     src = fetchgit {
       url = "git://github.com/shougo/unite.vim";
-      rev = "be09b0e5784c4c4c13aefae4f16313696c6f51de";
-      sha256 = "1nd09llf9v09acyizdmwgjkkdg1b14f8d02b5h3bgidv753dbx64";
+      rev = "97e634117ff05d3c867d625940da5c7947cebf63";
+      sha256 = "1qc7k5n7whw5z78czhi363fbllj9znz1gqlps096aiwhapfv3m1z";
     };
     dependencies = [];
 
@@ -1311,6 +1322,17 @@ rec {
 
   };
 
+  alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "alchemist-vim-2017-01-24";
+    src = fetchgit {
+      url = "git://github.com/slashmili/alchemist.vim";
+      rev = "c22d4883b7e2bfed78b70b557d816bf0491d7dd4";
+      sha256 = "0iv91mfj3lxc41xb8sxhl9mby5dllzyvw8508igrj5lvyrd1ikkf";
+    };
+    dependencies = [];
+
+  };
+
   vim-hardtime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-hardtime-2016-12-19";
     src = fetchgit {
@@ -1345,11 +1367,11 @@ rec {
   };
 
   vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-quickrun-2016-12-14";
+    name = "vim-quickrun-2017-01-22";
     src = fetchgit {
       url = "git://github.com/thinca/vim-quickrun";
-      rev = "f968a467781f0f3c788768b95487d80efa6ceb28";
-      sha256 = "0kd6qi7zqahrgr3y773x3q885ww41ladgl10lx0r1x2yjr5y8nv4";
+      rev = "95da1f83c4a1988a3808492e2b2e169ed408d3e2";
+      sha256 = "0j3jg06flspb36v5hj7pljaljncv5160zw01s3v1605d1q8b43mv";
     };
     dependencies = [];
 
@@ -1422,11 +1444,11 @@ rec {
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2017-01-04";
+    name = "youcompleteme-2017-02-11";
     src = fetchgit {
       url = "git://github.com/valloric/youcompleteme";
-      rev = "3fde57b029f760baedeaf7c0c880326e32f5c4d9";
-      sha256 = "1bilzzv02ksqv6m44alp32s61scxqqj5cxx1klr70mhm81k2ksb9";
+      rev = "1d1a4f4cff04ed32ab924dda20666e67eabdefb4";
+      sha256 = "12xz019jrvr6wgjbp0w052awpmhwbpkwy6j7v0f0ldx242rv9sr8";
     };
     dependencies = [];
     buildInputs = [
@@ -1467,22 +1489,22 @@ rec {
   };
 
   vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-themes-2016-12-09";
+    name = "vim-airline-themes-2016-12-31";
     src = fetchgit {
       url = "git://github.com/vim-airline/vim-airline-themes";
-      rev = "2a97d9ee410d7b9980a7741fc6e705d53eea23c2";
-      sha256 = "1crqpryfvamjqw8wqn6nlfqbflgwcfxqf4jk3j58rjxssl0vrfbc";
+      rev = "6026eb78bf362cb3aa875aff8487f65728d0f7d8";
+      sha256 = "13ijkavh1r0935cn2rjsfbdd1q3ka8bi26kw0bdkrqlrqxwvpss8";
     };
     dependencies = [];
 
   };
 
   vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-pandoc-2016-12-16";
+    name = "vim-pandoc-2017-02-07";
     src = fetchgit {
       url = "git://github.com/vim-pandoc/vim-pandoc";
-      rev = "56b0940954c98c9a089948e1cbbafd2e6e7369e7";
-      sha256 = "0yn4cc3i71vxickvwz4g94fc39pgg9phqdz7sc6kf6xran6p0jdy";
+      rev = "32ebfb105cf86b191b72e6c9aaf8d6230d05684c";
+      sha256 = "0k79bj9lb65w5nxsb226bf3r0ppqh9p9g8yigbs0qgfx8aidwnsw";
     };
     dependencies = [];
 
@@ -1500,11 +1522,11 @@ rec {
   };
 
   vim-pandoc-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-pandoc-syntax-2016-11-05";
+    name = "vim-pandoc-syntax-2017-01-19";
     src = fetchgit {
       url = "git://github.com/vim-pandoc/vim-pandoc-syntax";
-      rev = "c76442ccbdd7889184683dc1d39c16c612c2c19f";
-      sha256 = "1ad60ls4xrbf01sjprksrx2j9x2y4m6gd7hq3p9ygrcmcxw64khm";
+      rev = "89341527b2bde3fbd473f5677e1df09072c319b5";
+      sha256 = "106h40vbcgap4jqqwcc6k01q65ss8r99594g6144kacnk0jixg52";
     };
     dependencies = [];
 
@@ -1599,22 +1621,22 @@ rec {
   };
 
   vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wakatime-2016-11-01";
+    name = "vim-wakatime-2017-02-08";
     src = fetchgit {
       url = "git://github.com/wakatime/vim-wakatime";
-      rev = "5fb34105de863ca90f3f8568b85fa017a42568af";
-      sha256 = "1flsdmf60fp8z0k080qfzdcpcb761zrj5qa3np2y9w24wbff9m5p";
+      rev = "3d343f656521ef0521a3277b81e4cd9af8be671a";
+      sha256 = "0xr6q39a20121kkscjpz1bly9j0z3lbzwj34gl3msba91mv1glb1";
     };
     dependencies = [];
     buildInputs = [ python ];
   };
 
   command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "command-t-2016-10-27";
+    name = "command-t-2017-01-08";
     src = fetchgit {
       url = "git://github.com/wincent/command-t";
-      rev = "d2467c84af8a1f1a2d0366127550d0a241dd2548";
-      sha256 = "1r81a0wlj9aqx0s11h6ddkdwbahxbg1l425jdyrwvxwd973nwkj6";
+      rev = "ce9daf8d792c945d32d0bf8878149eaa8aee2b81";
+      sha256 = "13ylc9bwf5qxsc8i62ppbcr446m35iyp243293ahn7xdrlnv2f9g";
     };
     dependencies = [];
     buildInputs = [ perl ruby ];
@@ -1638,14 +1660,14 @@ rec {
   };
 
   deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-go-2016-12-22";
+    name = "deoplete-go-2017-02-10";
     src = fetchgit {
       url = "git://github.com/zchee/deoplete-go";
-      rev = "3762a44995559277ea6b0bbcd3242dc5250d438e";
-      sha256 = "16hdp7gq3mxddwbi4qbpqknc67yfr8xr52v198189jgnwajs3c6x";
+      rev = "85a9c1847aa76e13e0e6e59e9694927281f3f15a";
+      sha256 = "0i0hfkr7xnm8v8rz2788xvz65yrwhw6i2sin17hymkfwscjdds86";
     };
     dependencies = [];
-    buildInputs = [ python3 ]; 
+    buildInputs = [ python3 ];
     buildPhase = ''
       pushd ./rplugin/python3/deoplete/ujson
       python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build
@@ -1655,11 +1677,11 @@ rec {
   };
 
   deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-jedi-2016-12-01";
+    name = "deoplete-jedi-2017-01-16";
     src = fetchgit {
       url = "git://github.com/zchee/deoplete-jedi";
-      rev = "13c69a4baefdcf3be4288d82b9a75405fff06838";
-      sha256 = "15w53k5mxrpj6qaybxgyvmbxizkk6r06hsmw9hff8aig4xd3dw74";
+      rev = "6240de812f06263524f46379ad08a0d3d539730f";
+      sha256 = "00hn00dv7klywqv14zhicsa0gd9iiv5va155ayr6mpj74p9lp2a1";
     };
     dependencies = [];
 
@@ -1798,11 +1820,11 @@ rec {
   };
 
   table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "table-mode-2016-09-28";
+    name = "table-mode-2017-01-05";
     src = fetchgit {
       url = "git://github.com/dhruvasagar/vim-table-mode";
-      rev = "441c30c35aec9d5c2de1d58a77a7d22aa8d93b06";
-      sha256 = "04fdd2hgrcrgqqflzlvv7j9c53m8f2divi075p75g6grkxxyninv";
+      rev = "30a3eba81628fdd099adc6dfdec8aa627c4783f7";
+      sha256 = "0pw3mvrx3iyyj5xz05gixhvnrqxpl274cv04449mxm50q32zvmhr";
     };
     dependencies = [];
 
@@ -1840,17 +1862,6 @@ rec {
 
   };
 
-  tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tsuquyomi-2017-01-02";
-    src = fetchgit {
-      url = "git://github.com/Quramy/tsuquyomi";
-      rev = "473aa2703950816748329acca56c069df7339c96";
-      sha256 = "0h5gbhs4gsvyjsin2wvdlbrr6ykpcmipmpwpf39595j1dlqnab59";
-    };
-    dependencies = [];
-
-  };
-
   undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "undotree-2016-07-19";
     src = fetchgit {
@@ -2028,11 +2039,11 @@ rec {
   };
 
   vim-addon-sql = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-sql-2014-01-18";
+    name = "vim-addon-sql-2017-02-11";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-sql";
-      rev = "05b8a0c211f1ae4c515c64e91dec555cdf20d90b";
-      sha256 = "15l2201jkfml08znvkkpy7fm3wn87n91zgd9ysrf5h73amjx9y2w";
+      rev = "048a139af36829fce670c8ff80d3aad927557ee6";
+      sha256 = "0ihm157sby6csdwsnw2gwh3jmm3prm1mxwgkx2hsfwlmpb1vwwm3";
     };
     dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"];
 
@@ -2072,11 +2083,11 @@ rec {
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2016-12-29";
+    name = "vim-airline-2017-02-11";
     src = fetchgit {
       url = "git://github.com/vim-airline/vim-airline";
-      rev = "a2431f2adb23a003abdfe5294861bbd69de52e52";
-      sha256 = "1qd5f133rg3pqdm889zg0hxhrmgzd71maz6jif4a4hjbghi61wjs";
+      rev = "b66c1ef07005fad6a70957b90d4f47bb932e33e2";
+      sha256 = "0y8adl6dl7c501na2k2j38cs200ykm6pjva19xshiv0h2f916l2b";
     };
     dependencies = [];
 
@@ -2094,26 +2105,16 @@ rec {
   };
 
   vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easy-align-2016-03-06";
+    name = "vim-easy-align-2017-02-08";
     src = fetchgit {
       url = "git://github.com/junegunn/vim-easy-align";
-      rev = "0cb6b98fc155717b0a56c110551ac57d1d951ddb";
-      sha256 = "10j1fz7si7xqqs4p7h66jd0xzr116cv3xjyac9p20fc0yyyg1wbh";
+      rev = "3b395bd5bafbdfb1f93190fa3f259b7ad2e40eb9";
+      sha256 = "0nqvzxr2i9jsyx1qhspf636q0j4b0d8y98yqhxklcpq18ap442zp";
     };
     dependencies = [];
 
   };
 
-  vim-elixir = buildVimPluginFrom2Nix {
-      name = "vim-elixir-2017-02-01";
-      src = fetchgit {
-        url = "https://github.com/elixir-lang/vim-elixir";
-        rev = "9cbb3ee3865c594ed017f8118a80b355cd7e238f";
-        sha256 = "14mlnjpmgfal4vai2k8jjmhszwgyhnf3v75rssj05n47qnzlddk4";
-      };
-      dependencies = [];
-    };
-
   vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-gista-2016-09-21";
     src = fetchgit {
@@ -2126,11 +2127,11 @@ rec {
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitgutter-2016-12-23";
+    name = "vim-gitgutter-2017-02-06";
     src = fetchgit {
       url = "git://github.com/airblade/vim-gitgutter";
-      rev = "7b81a8a22607f073b76b106e2d5e63cc936b0d25";
-      sha256 = "19v2akrhhfb9zy7mvljjwvi7lqrnviw88gxh4xmpy82vghiwdrfs";
+      rev = "5d1a0bfa1bd2b8d8a77fff09d13394e5abbc6143";
+      sha256 = "19iz6k1wb8jy51lpr8pwp3fy80ww4sw6n6mp56lw59n8227gffc1";
     };
     dependencies = [];
 
@@ -2158,17 +2159,6 @@ rec {
 
   };
 
-  vim-misc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-misc-2015-05-21";
-    src = fetchgit {
-      url = "git://github.com/xolox/vim-misc";
-      rev = "3e6b8fb6f03f13434543ce1f5d24f6a5d3f34f0b";
-      sha256 = "0rd9788dyfc58py50xbiaz5j7nphyvf3rpp3yal7yq2dhf0awwfi";
-    };
-    dependencies = [];
-
-  };
-
   vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-multiple-cursors-2016-06-03";
     src = fetchgit {
@@ -2192,22 +2182,22 @@ rec {
   };
 
   vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signify-2016-12-31";
+    name = "vim-signify-2017-02-10";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-signify";
-      rev = "32d8797d887b0980514cdf7f11c9c1379d597e57";
-      sha256 = "1jhb6pljqbz8mlcc4zfjqzhyyp4yz5b6h7s0224m7vm4xvsphq8y";
+      rev = "a2c28f654087735a276ec7c1f558b782db5488a5";
+      sha256 = "0zhm26d5s68gcj1lmw866m0gcfss46mr4z79zggiara83x5abbxp";
     };
     dependencies = [];
 
   };
 
   vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2016-12-27";
+    name = "vim-snippets-2017-02-07";
     src = fetchgit {
       url = "git://github.com/honza/vim-snippets";
-      rev = "e24d33f96a95332dde0edaa7e7e3e7a64244de56";
-      sha256 = "1clba2x05klqab5ifkg19cxm22ibx6ycdfdn71clglk96wli1h0f";
+      rev = "b8c340daf084f243a487f8853a0984504909dfda";
+      sha256 = "1173hck15aijhvh00rjdsyiv21ax6hp9h7w2yph514zi9mhzgg8q";
     };
     dependencies = [];
 
@@ -2236,11 +2226,11 @@ rec {
   };
 
   vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimwiki-2016-12-18";
+    name = "vimwiki-2017-01-30";
     src = fetchgit {
       url = "git://github.com/vimwiki/vimwiki";
-      rev = "3a8743700581923c6fd2684510dad48a8b2b8c64";
-      sha256 = "19b27h0zsmi1xphzf1qhmry11gca4j1mh0mli12yvkr9v61rnj6b";
+      rev = "be79f68a9292cbe53d330cb37fd18d835e8f74d4";
+      sha256 = "0n43vaxh90v5wbgqld61bwlhzr11s0c72dgrp0cirj7ri7xajq8z";
     };
     dependencies = [];
 

From 4c0aae964c9e8d3f3e9361583a88c9c4561f6895 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Mon, 13 Feb 2017 01:32:37 +0000
Subject: [PATCH 842/899] ssm-agent: init at 2.0.633.0

---
 .../networking/cluster/ssm-agent/default.nix  | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/ssm-agent/default.nix

diff --git a/pkgs/applications/networking/cluster/ssm-agent/default.nix b/pkgs/applications/networking/cluster/ssm-agent/default.nix
new file mode 100644
index 00000000000..bb179606b36
--- /dev/null
+++ b/pkgs/applications/networking/cluster/ssm-agent/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, buildGoPackage }:
+
+buildGoPackage rec {
+  name    = "${pname}-${version}";
+  pname   = "amazon-ssm-agent";
+  version = "2.0.633.0";
+
+  goPackagePath = "github.com/aws/${pname}";
+  subPackages   = [ "agent" ];
+
+  src = fetchFromGitHub {
+    rev    = "v${version}";
+    owner  = "aws";
+    repo   = pname;
+    sha256 = "10arshfn2k3m3zzgw8b3xc6ywd0ss73746nq5srh2jir7mjzi4xv";
+  };
+
+  preBuild = ''
+    mv go/src/${goPackagePath}/vendor strange-vendor
+    mv strange-vendor/src go/src/${goPackagePath}/vendor
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Agent to enable remote management of your Amazon EC2 instance configuration";
+    homepage    = "https://github.com/aws/amazon-ssm-agent";
+    license     = licenses.asl20;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ copumpkin ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 67dcb8bedbe..1ad48f262d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5960,6 +5960,8 @@ with pkgs;
   spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix { };
   spidermonkey = spidermonkey_31;
 
+  ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { };
+
   supercollider = callPackage ../development/interpreters/supercollider {
     fftw = fftwSinglePrec;
   };

From 4450327c062a41f7df2f6756057df4ebb6548011 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sun, 12 Feb 2017 20:52:37 -0500
Subject: [PATCH 843/899] flow: pin ocaml to ocaml_4_02

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

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index a63e9f65e5c..c1cb4412b9c 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, lib, ocaml_4_02, libelf, cf-private, CoreServices }:
+{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices }:
 
 with lib;
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     cp bin/flow $out/bin/
   '';
 
-  buildInputs = [ ocaml_4_02 libelf ]
+  buildInputs = [ ocaml libelf ]
     ++ optionals stdenv.isDarwin [ cf-private CoreServices ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ad48f262d2..855de099cba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6363,6 +6363,7 @@ with pkgs;
   flow = callPackage ../development/tools/analysis/flow {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
     inherit (darwin) cf-private;
+    ocaml = ocaml_4_02;
   };
 
   framac = callPackage ../development/tools/analysis/frama-c { };
@@ -15600,7 +15601,7 @@ with pkgs;
   wmii_hg = callPackage ../applications/window-managers/wmii-hg { };
 
   wordnet = callPackage ../applications/misc/wordnet { };
-  
+
   worker = callPackage ../applications/misc/worker { };
 
   workrave = callPackage ../applications/misc/workrave {

From e928cb1c631fedde3837dabc518931ea12522163 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Mon, 13 Feb 2017 04:01:28 +0000
Subject: [PATCH 844/899] ssm-agent NixOS module: init

---
 nixos/modules/module-list.nix             |  1 +
 nixos/modules/services/misc/ssm-agent.nix | 45 +++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 nixos/modules/services/misc/ssm-agent.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 9bf6a400b09..cf791a67f53 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -294,6 +294,7 @@
   ./services/misc/siproxd.nix
   ./services/misc/sonarr.nix
   ./services/misc/spice-vdagentd.nix
+  ./services/misc/ssm-agent.nix
   ./services/misc/sssd.nix
   ./services/misc/subsonic.nix
   ./services/misc/sundtek.nix
diff --git a/nixos/modules/services/misc/ssm-agent.nix b/nixos/modules/services/misc/ssm-agent.nix
new file mode 100644
index 00000000000..b04959a9686
--- /dev/null
+++ b/nixos/modules/services/misc/ssm-agent.nix
@@ -0,0 +1,45 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+let
+  cfg = config.services.ssm-agent;
+
+  # The SSM agent doesn't pay attention to our /etc/os-release yet, and the lsb-release tool
+  # in nixpkgs doesn't seem to work properly on NixOS, so let's just fake the two fields SSM
+  # looks for. See https://github.com/aws/amazon-ssm-agent/issues/38 for upstream fix.
+  fake-lsb-release = pkgs.writeScriptBin "lsb_release" ''
+    #!${pkgs.stdenv.shell}
+
+    case "$1" in
+      -i) echo "nixos";;
+      -r) echo "${config.system.nixosVersion}";;
+    esac
+  '';
+in {
+  options.services.ssm-agent = {
+    enable = mkEnableOption "AWS SSM agent";
+
+    package = mkOption {
+      type = types.path;
+      description = "The SSM agent package to use";
+      default = pkgs.ssm-agent;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.ssm-agent = {
+      inherit (cfg.package.meta) description;
+      after    = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      path = [ fake-lsb-release ];
+      serviceConfig = {
+        ExecStart = "${cfg.package.bin}/bin/agent";
+        KillMode = "process";
+        Restart = "on-failure";
+        RestartSec = "15min";
+      };
+    };
+  };
+}
+

From e63d15f1732b2a27c362d376337ecb231f638649 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Mon, 13 Feb 2017 04:06:22 +0000
Subject: [PATCH 845/899] ecs-agent NixOS module: enable docker

---
 nixos/modules/virtualisation/ecs-agent.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/virtualisation/ecs-agent.nix b/nixos/modules/virtualisation/ecs-agent.nix
index ed17fbf4931..18e45e0b845 100644
--- a/nixos/modules/virtualisation/ecs-agent.nix
+++ b/nixos/modules/virtualisation/ecs-agent.nix
@@ -22,6 +22,10 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
+    # This service doesn't run if docker isn't running, and unlike potentially remote services like e.g., postgresql, docker has
+    # to be running locally so `docker.enable` will always be set if the ECS agent is enabled.
+    virtualisation.docker.enable = true;
+
     systemd.services.ecs-agent = {
       inherit (cfg.package.meta) description;
       after    = [ "network.target" ];

From 8616c0d39194291da44af0cb503b5120eb0485a6 Mon Sep 17 00:00:00 2001
From: Tim Digel <tim.digel@active-group.de>
Date: Thu, 26 Jan 2017 08:30:50 +0100
Subject: [PATCH 846/899] tsearch-extras: init at 0.2

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

diff --git a/pkgs/servers/sql/postgresql/tsearch_extras/default.nix b/pkgs/servers/sql/postgresql/tsearch_extras/default.nix
new file mode 100644
index 00000000000..d434fa98e09
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/tsearch_extras/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, pkgconfig, postgresql }:
+
+stdenv.mkDerivation rec {
+  name = "tsearch-extras-${version}";
+  version = "0.2";
+
+  src = fetchFromGitHub {
+    owner = "zulip";
+    repo = "tsearch_extras";
+    rev = version;
+    sha256 = "1ivg9zn7f1ks31ixxwywifwhzxn6py8s5ky1djyxnb0s60zckfjg";
+  };
+
+  nativebuildInputs = [ pkgconfig ];
+  buildInputs = [ postgresql ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    install -D tsearch_extras.so -t $out/lib/
+    install -D ./{tsearch_extras--1.0.sql,tsearch_extras.control} -t $out/share/extension
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Provides a few PostgreSQL functions for a lower-level data full text search";
+    homepage = https://github.com/zulip/tsearch_extras/;
+    license = licenses.postgresql;
+    maintainers = with maintainers; [ DerTim1 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 496d6e9e236..e798e1db26a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15310,6 +15310,8 @@ with pkgs;
   # We need QtWebkit which was deprecated in Qt 5.6 although it can still be build
   trojita = with qt55; callPackage ../applications/networking/mailreaders/trojita { };
 
+  tsearch_extras = callPackage ../servers/sql/postgresql/tsearch_extras { };
+
   tudu = callPackage ../applications/office/tudu { };
 
   tuxguitar = callPackage ../applications/editors/music/tuxguitar { };

From eff0752dbc36f52fce9c27ff10b8db41a5f632f4 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 13 Feb 2017 08:54:10 +0000
Subject: [PATCH 847/899] Use default qemu for azure image generation, and use
 option to enforce sizing of image to be compliant with Azure/HyperV.

(cherry picked from commit e16db5666af987f8a76be82ff219e138e92af442)
---
 nixos/modules/virtualisation/azure-image.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix
index 9fac543b03d..91fae88fc98 100644
--- a/nixos/modules/virtualisation/azure-image.nix
+++ b/nixos/modules/virtualisation/azure-image.nix
@@ -16,14 +16,14 @@ in
               cyl=$(((${diskSize}*1024*1024)/(512*63*255)))
               size=$(($cyl*255*63*512))              
               roundedsize=$((($size/(1024*1024)+1)*(1024*1024)))
-              ${pkgs.vmTools.qemu-220}/bin/qemu-img create -f raw $diskImage $roundedsize
+              ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage $roundedsize
               mv closure xchg/
             '';
 
           postVM =
             ''
               mkdir -p $out
-              ${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -O vpc $diskImage $out/disk.vhd
+              ${pkgs.qemu}/bin/qemu-img convert -f raw -o force_size -O vpc $diskImage $out/disk.vhd
               rm $diskImage
             '';
           diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw";

From af3732b6c6adb11f45cc9d72c3ddf33fd51c47e0 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 13 Feb 2017 09:54:18 +0000
Subject: [PATCH 848/899] Azure: switch back to qemu 2.2.0 for generating
 image. Seems to work best.

(cherry picked from commit 2da8a5dac8674501ba9ed10e44650088b466688a)
---
 nixos/modules/virtualisation/azure-image.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix
index 91fae88fc98..33f84986cac 100644
--- a/nixos/modules/virtualisation/azure-image.nix
+++ b/nixos/modules/virtualisation/azure-image.nix
@@ -16,14 +16,14 @@ in
               cyl=$(((${diskSize}*1024*1024)/(512*63*255)))
               size=$(($cyl*255*63*512))              
               roundedsize=$((($size/(1024*1024)+1)*(1024*1024)))
-              ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage $roundedsize
+              ${pkgs.vmTools.qemu-220}/bin/qemu-img create -f raw $diskImage $roundedsize
               mv closure xchg/
             '';
 
           postVM =
             ''
               mkdir -p $out
-              ${pkgs.qemu}/bin/qemu-img convert -f raw -o force_size -O vpc $diskImage $out/disk.vhd
+              ${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -o subformat=fixed -O vpc $diskImage $out/disk.vhd
               rm $diskImage
             '';
           diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw";

From 4af79a73316981a7ba96cfa9501ab210f589a2a8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 13 Feb 2017 12:16:39 +0100
Subject: [PATCH 849/899] Revert "linux: Apply 9p veryloose patch to 4.9"

This reverts commit a82810c7a7e62848b75739b1cccddca8f1363c75.

Fixes #22695.
---
 pkgs/os-specific/linux/kernel/patches.nix | 6 +++---
 pkgs/top-level/all-packages.nix           | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index ea93815e786..1f528f9412b 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -175,12 +175,12 @@ rec {
       };
     };
 
-  p9_caching_4_9 = rec
+  p9_caching_4_4 = rec
     { name = "9p-caching.patch";
       patch = fetchpatch {
         inherit name;
-        url = https://github.com/edolstra/linux/commit/7e20254412c780a2102761fee92cb1d32ceeaefd.patch;
-        sha256 = "001kf1sdy6pirn8sqnfgbfahvwwkc7n7vr5i8fy2n74xph1kks5a";
+        url = https://github.com/edolstra/linux/commit/d522582553368b9564e2d88a8d7b1d469bf98c65.patch;
+        sha256 = "01h7461pdgavd6ghd6w9wg136hkaca0mrmmzhy6s3phksksimbc2";
       };
     };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 855de099cba..0bd5f1e490d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11282,6 +11282,7 @@ with pkgs;
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
         kernelPatches.cpu-cgroup-v2."4.4"
+        kernelPatches.p9_caching_4_4
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11298,7 +11299,6 @@ with pkgs;
         # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking
         # kernelPatches.cpu-cgroup-v2."4.7"
         kernelPatches.modinst_arg_list_too_long
-        kernelPatches.p9_caching_4_9
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11311,7 +11311,6 @@ with pkgs;
     kernelPatches = [
       kernelPatches.bridge_stp_helper
       kernelPatches.modinst_arg_list_too_long
-      kernelPatches.p9_caching_4_9
     ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [
       kernelPatches.mips_fpureg_emu
       kernelPatches.mips_fpu_sigill

From a4ec1841da14fc98c5c35cc72242c23bb698d4ac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 13 Feb 2017 12:18:10 +0100
Subject: [PATCH 850/899] VM tests: veryloose -> cache=loose

---
 nixos/modules/virtualisation/qemu-vm.nix | 4 ++--
 pkgs/build-support/vm/default.nix        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index e0b3bb2c683..56a05028b1d 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -440,7 +440,7 @@ in
         ${if cfg.writableStore then "/nix/.ro-store" else "/nix/store"} =
           { device = "store";
             fsType = "9p";
-            options = [ "trans=virtio" "version=9p2000.L" "veryloose" ];
+            options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ];
             neededForBoot = true;
           };
         "/tmp" = mkIf config.boot.tmpOnTmpfs
@@ -453,7 +453,7 @@ in
         "/tmp/xchg" =
           { device = "xchg";
             fsType = "9p";
-            options = [ "trans=virtio" "version=9p2000.L" "veryloose" ];
+            options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ];
             neededForBoot = true;
           };
         "/tmp/shared" =
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 36cb068d93d..461bdd08fb5 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -130,7 +130,7 @@ rec {
 
     echo "mounting Nix store..."
     mkdir -p /fs${storeDir}
-    mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,veryloose
+    mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,cache=loose
 
     mkdir -p /fs/tmp /fs/run /fs/var
     mount -t tmpfs -o "mode=1777" none /fs/tmp
@@ -139,7 +139,7 @@ rec {
 
     echo "mounting host's temporary directory..."
     mkdir -p /fs/tmp/xchg
-    mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,veryloose
+    mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,cache=loose
 
     mkdir -p /fs/proc
     mount -t proc none /fs/proc

From 5d3bb96f622e62062945aa8e70a827449c21f686 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 12 Feb 2017 10:41:07 +0100
Subject: [PATCH 851/899] LTS Haskell 8.0

This includes an update to hackage-packages.nix, which was generated by hackage2nix v2.0.4-11-gd82133a
from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/53fcf983669a3f0cdfd795fec28ecb40740a64ca.
---
 .../configuration-hackage2nix.yaml            | 1307 ++-
 .../haskell-modules/hackage-packages.nix      | 9646 +++--------------
 pkgs/top-level/all-packages.nix               |    2 +-
 3 files changed, 2108 insertions(+), 8847 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 634648b9175..0a05cc6ca81 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -1,34 +1,34 @@
 # pkgs/development/haskell-modules/configuration-hackage2nix.yaml
 
-compiler: ghc-8.0.1
+compiler: ghc-8.0.2
 
 core-packages:
   - array-0.5.1.1
-  - base-4.9.0.0
+  - base-4.9.1.0
   - binary-0.8.3.0
   - bytestring-0.10.8.1
-  - Cabal-1.24.0.0
+  - Cabal-1.24.2.0
   - containers-0.5.7.1
   - deepseq-1.4.2.0
-  - directory-1.2.6.2
-  - filepath-1.4.1.0
-  - ghc-8.0.1
-  - ghc-boot-8.0.1
-  - ghc-boot-th-8.0.1
+  - directory-1.3.0.0
+  - filepath-1.4.1.1
+  - ghc-8.0.2
+  - ghc-boot-8.0.2
+  - ghc-boot-th-8.0.2
+  - ghci-8.0.2
   - ghc-prim-0.5.0.0
-  - ghci-8.0.1
-  - haskeline-0.7.2.3
+  - haskeline-0.7.3.0
   - hoopl-3.10.2.1
   - hpc-0.6.0.3
   - integer-gmp-1.0.0.1
   - pretty-1.1.3.3
-  - process-1.4.2.0
+  - process-1.4.3.0
   - rts-1.0
-  - template-haskell-2.11.0.0
+  - template-haskell-2.11.1.0
   - terminfo-0.4.0.2
   - time-1.6.0.1
   - transformers-0.5.2.0
-  - unix-2.7.2.0
+  - unix-2.7.2.1
   - xhtml-3000.2.1
 
   # Hack: The following package is a core package of GHCJS. If we don't declare
@@ -37,7 +37,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 7.19
+  # LTS Haskell 8.0
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Vector ==2.3.2
@@ -46,106 +46,124 @@ default-package-overrides:
   - ace ==0.6
   - acid-state ==0.14.2
   - action-permutations ==0.0.0.1
-  - active ==0.2.0.10
+  - active ==0.2.0.12
   - ad ==4.3.2.1
   - adjunctions ==4.3
   - adler32 ==0.1.1.0
-  - aeson ==0.11.3.0
+  - aeson ==1.0.2.1
   - aeson-better-errors ==0.9.1.0
   - aeson-casing ==0.1.0.5
   - aeson-compat ==0.3.6
+  - aeson-extra ==0.4.0.0
   - aeson-generic-compat ==0.0.1.0
   - aeson-injector ==1.0.7.0
   - aeson-pretty ==0.8.2
   - aeson-qq ==0.8.1
   - aeson-utils ==0.3.0.2
-  - Agda ==2.5.1.1
+  - Agda ==2.5.2
   - airship ==0.6.0
   - alarmclock ==0.4.0.2
-  - alex ==3.1.7
-  - amazonka ==1.4.3
-  - amazonka-apigateway ==1.4.3
-  - amazonka-application-autoscaling ==1.4.3
-  - amazonka-autoscaling ==1.4.3
-  - amazonka-certificatemanager ==1.4.3
-  - amazonka-cloudformation ==1.4.3
-  - amazonka-cloudfront ==1.4.3
-  - amazonka-cloudhsm ==1.4.3
-  - amazonka-cloudsearch ==1.4.3
-  - amazonka-cloudsearch-domains ==1.4.3
-  - amazonka-cloudtrail ==1.4.3
-  - amazonka-cloudwatch ==1.4.3
-  - amazonka-cloudwatch-events ==1.4.3
-  - amazonka-cloudwatch-logs ==1.4.3
-  - amazonka-codecommit ==1.4.3
-  - amazonka-codedeploy ==1.4.3
-  - amazonka-codepipeline ==1.4.3
-  - amazonka-cognito-identity ==1.4.3
-  - amazonka-cognito-idp ==1.4.3
-  - amazonka-cognito-sync ==1.4.3
-  - amazonka-config ==1.4.3
-  - amazonka-core ==1.4.3
-  - amazonka-datapipeline ==1.4.3
-  - amazonka-devicefarm ==1.4.3
-  - amazonka-directconnect ==1.4.3
-  - amazonka-discovery ==1.4.3
-  - amazonka-dms ==1.4.3
-  - amazonka-ds ==1.4.3
-  - amazonka-dynamodb ==1.4.3
-  - amazonka-dynamodb-streams ==1.4.3
-  - amazonka-ec2 ==1.4.3
-  - amazonka-ecr ==1.4.3
-  - amazonka-ecs ==1.4.3
-  - amazonka-efs ==1.4.3
-  - amazonka-elasticache ==1.4.3
-  - amazonka-elasticbeanstalk ==1.4.3
-  - amazonka-elasticsearch ==1.4.3
-  - amazonka-elastictranscoder ==1.4.3
-  - amazonka-elb ==1.4.3
-  - amazonka-emr ==1.4.3
-  - amazonka-gamelift ==1.4.3
-  - amazonka-glacier ==1.4.3
-  - amazonka-iam ==1.4.3
-  - amazonka-importexport ==1.4.3
-  - amazonka-inspector ==1.4.3
-  - amazonka-iot ==1.4.3
-  - amazonka-iot-dataplane ==1.4.3
-  - amazonka-kinesis ==1.4.3
-  - amazonka-kinesis-firehose ==1.4.3
-  - amazonka-kms ==1.4.3
-  - amazonka-lambda ==1.4.3
-  - amazonka-marketplace-analytics ==1.4.3
-  - amazonka-marketplace-metering ==1.4.3
-  - amazonka-ml ==1.4.3
-  - amazonka-opsworks ==1.4.3
-  - amazonka-rds ==1.4.3
-  - amazonka-redshift ==1.4.3
-  - amazonka-route53 ==1.4.3
-  - amazonka-route53-domains ==1.4.3
-  - amazonka-s3 ==1.4.3
-  - amazonka-sdb ==1.4.3
-  - amazonka-ses ==1.4.3
-  - amazonka-sns ==1.4.3
-  - amazonka-sqs ==1.4.3
-  - amazonka-ssm ==1.4.3
-  - amazonka-storagegateway ==1.4.3
-  - amazonka-sts ==1.4.3
-  - amazonka-support ==1.4.3
-  - amazonka-swf ==1.4.3
-  - amazonka-test ==1.4.3
-  - amazonka-waf ==1.4.3
-  - amazonka-workspaces ==1.4.3
+  - alex ==3.2.1
+  - alternators ==0.1.1.0
+  - ALUT ==2.4.0.2
+  - amazonka ==1.4.5
+  - amazonka-apigateway ==1.4.5
+  - amazonka-application-autoscaling ==1.4.5
+  - amazonka-appstream ==1.4.5
+  - amazonka-autoscaling ==1.4.5
+  - amazonka-budgets ==1.4.5
+  - amazonka-certificatemanager ==1.4.5
+  - amazonka-cloudformation ==1.4.5
+  - amazonka-cloudfront ==1.4.5
+  - amazonka-cloudhsm ==1.4.5
+  - amazonka-cloudsearch ==1.4.5
+  - amazonka-cloudsearch-domains ==1.4.5
+  - amazonka-cloudtrail ==1.4.5
+  - amazonka-cloudwatch ==1.4.5
+  - amazonka-cloudwatch-events ==1.4.5
+  - amazonka-cloudwatch-logs ==1.4.5
+  - amazonka-codebuild ==1.4.5
+  - amazonka-codecommit ==1.4.5
+  - amazonka-codedeploy ==1.4.5
+  - amazonka-codepipeline ==1.4.5
+  - amazonka-cognito-identity ==1.4.5
+  - amazonka-cognito-idp ==1.4.5
+  - amazonka-cognito-sync ==1.4.5
+  - amazonka-config ==1.4.5
+  - amazonka-core ==1.4.5
+  - amazonka-datapipeline ==1.4.5
+  - amazonka-devicefarm ==1.4.5
+  - amazonka-directconnect ==1.4.5
+  - amazonka-discovery ==1.4.5
+  - amazonka-dms ==1.4.5
+  - amazonka-ds ==1.4.5
+  - amazonka-dynamodb ==1.4.5
+  - amazonka-dynamodb-streams ==1.4.5
+  - amazonka-ec2 ==1.4.5
+  - amazonka-ecr ==1.4.5
+  - amazonka-ecs ==1.4.5
+  - amazonka-efs ==1.4.5
+  - amazonka-elasticache ==1.4.5
+  - amazonka-elasticbeanstalk ==1.4.5
+  - amazonka-elasticsearch ==1.4.5
+  - amazonka-elastictranscoder ==1.4.5
+  - amazonka-elb ==1.4.5
+  - amazonka-elbv2 ==1.4.5
+  - amazonka-emr ==1.4.5
+  - amazonka-gamelift ==1.4.5
+  - amazonka-glacier ==1.4.5
+  - amazonka-health ==1.4.5
+  - amazonka-iam ==1.4.5
+  - amazonka-importexport ==1.4.5
+  - amazonka-inspector ==1.4.5
+  - amazonka-iot ==1.4.5
+  - amazonka-iot-dataplane ==1.4.5
+  - amazonka-kinesis ==1.4.5
+  - amazonka-kinesis-analytics ==1.4.5
+  - amazonka-kinesis-firehose ==1.4.5
+  - amazonka-kms ==1.4.5
+  - amazonka-lambda ==1.4.5
+  - amazonka-lightsail ==1.4.5
+  - amazonka-marketplace-analytics ==1.4.5
+  - amazonka-marketplace-metering ==1.4.5
+  - amazonka-ml ==1.4.5
+  - amazonka-opsworks ==1.4.5
+  - amazonka-opsworks-cm ==1.4.5
+  - amazonka-pinpoint ==1.4.5
+  - amazonka-polly ==1.4.5
+  - amazonka-rds ==1.4.5
+  - amazonka-redshift ==1.4.5
+  - amazonka-rekognition ==1.4.5
+  - amazonka-route53 ==1.4.5
+  - amazonka-route53-domains ==1.4.5
+  - amazonka-s3 ==1.4.5
+  - amazonka-s3-streaming ==0.1.0.4
+  - amazonka-sdb ==1.4.5
+  - amazonka-servicecatalog ==1.4.5
+  - amazonka-ses ==1.4.5
+  - amazonka-shield ==1.4.5
+  - amazonka-sms ==1.4.5
+  - amazonka-snowball ==1.4.5
+  - amazonka-sns ==1.4.5
+  - amazonka-sqs ==1.4.5
+  - amazonka-ssm ==1.4.5
+  - amazonka-stepfunctions ==1.4.5
+  - amazonka-storagegateway ==1.4.5
+  - amazonka-sts ==1.4.5
+  - amazonka-support ==1.4.5
+  - amazonka-swf ==1.4.5
+  - amazonka-test ==1.4.5
+  - amazonka-waf ==1.4.5
+  - amazonka-workspaces ==1.4.5
+  - amazonka-xray ==1.4.5
   - amqp ==0.14.1
-  - angel ==0.6.2
   - annotated-wl-pprint ==0.7.0
-  - anonymous-sums ==0.4.0.0
+  - anonymous-sums ==0.6.0.0
   - ansi-terminal ==0.6.2.3
   - ansi-wl-pprint ==0.6.7.3
-  - ansigraph ==0.2.0.0
-  - api-field-json-th ==0.1.0.1
+  - ansigraph ==0.3.0.2
   - app-settings ==0.2.0.10
   - appar ==0.1.4
-  - apply-refact ==0.3.0.0
   - arbtt ==0.9.0.12
   - arithmoi ==0.4.3.0
   - array-memoize ==0.6.0
@@ -157,24 +175,29 @@ default-package-overrides:
   - asn1-types ==0.3.2
   - async ==2.1.1
   - async-dejafu ==0.1.3.0
-  - atndapi ==0.1.1.0
-  - atom-conduit ==0.3.1.2
+  - async-extra ==0.1.0.0
+  - atom-basic ==0.2.4
+  - atom-conduit ==0.4.0.1
   - atomic-primops ==0.8.0.4
   - atomic-write ==0.2.0.5
   - attoparsec ==0.13.1.0
   - attoparsec-binary ==0.2
   - attoparsec-expr ==0.1.1.2
   - authenticate ==1.3.3.2
-  - authenticate-oauth ==1.5.1.2
+  - authenticate-oauth ==1.6
   - auto ==0.4.3.1
   - auto-update ==0.1.4
-  - autoexporter ==0.2.3
-  - aws ==0.14.1
+  - autoexporter ==1.0.0
+  - avers ==0.0.17.1
+  - avers-api ==0.0.18.0
+  - avers-api-docs ==0.0.18.0
+  - avers-server ==0.0.18.0
+  - avwx ==0.3.0.2
   - b9 ==0.5.31
-  - bake ==0.4
+  - bake ==0.5
   - bank-holidays-england ==0.1.0.5
   - base-compat ==0.9.1
-  - base-noprelude ==4.9.0.0
+  - base-noprelude ==4.9.1.0
   - base-orphans ==0.5.4
   - base-prelude ==1.0.1.1
   - base-unicode-symbols ==0.2.2.4
@@ -193,9 +216,11 @@ default-package-overrides:
   - bimap-server ==0.1.0.1
   - binary-bits ==0.5
   - binary-conduit ==1.2.4.1
+  - binary-ieee754 ==0.1.0.0
   - binary-list ==1.1.1.2
   - binary-orphans ==0.1.6.0
   - binary-parser ==0.5.2
+  - binary-parsers ==0.2.3.0
   - binary-search ==1.0.0.3
   - binary-tagged ==0.1.4.2
   - binary-typed ==1.0
@@ -208,15 +233,13 @@ default-package-overrides:
   - biofasta ==0.0.3
   - biofastq ==0.1
   - biopsl ==0.4
-  - bitcoin-api ==0.12.1
-  - bitcoin-api-extra ==0.9.1
+  - bitarray ==0.0.1.1
   - bitcoin-block ==0.13.1
-  - bitcoin-payment-channel ==0.3.0.1
   - bitcoin-script ==0.11.1
   - bitcoin-tx ==0.13.1
   - bitcoin-types ==0.9.2
   - bits ==0.5
-  - bitx-bitcoin ==0.10.0.0
+  - bitx-bitcoin ==0.11.0.0
   - blake2 ==0.2.0
   - blank-canvas ==0.6
   - BlastHTTP ==1.2.1
@@ -227,23 +250,29 @@ default-package-overrides:
   - blaze-markup ==0.7.1.1
   - blaze-svg ==0.3.6
   - blaze-textual ==0.2.1.0
-  - bloodhound ==0.11.0.0
-  - blosum ==0.1.1.2
+  - BlogLiterately ==0.8.4.3
+  - BlogLiterately-diagrams ==0.2.0.5
+  - bloodhound ==0.12.1.0
+  - blosum ==0.1.1.4
   - bmp ==1.2.6.3
+  - bool-extras ==0.4.0
   - Boolean ==0.2.3
+  - boolean-like ==0.1.1.0
   - boolsimplifier ==0.1.8
   - boomerang ==1.4.5.2
   - both ==0.1.1.0
   - BoundedChan ==1.0.3.0
   - boundingboxes ==0.2.3
-  - bower-json ==0.8.1
+  - bower-json ==1.0.0.1
   - boxes ==0.1.4
+  - brick ==0.17
   - broadcast-chan ==0.1.1
   - bson ==0.3.2.3
   - bson-lens ==0.1.1
-  - btrfs ==0.1.2.0
+  - btrfs ==0.1.2.3
+  - buffer-builder ==0.2.4.4
   - bumper ==0.6.0.3
-  - bustle ==0.5.4
+  - bv ==0.4.1
   - byteable ==0.1.1
   - bytedump ==1.0
   - byteorder ==1.0.4
@@ -260,28 +289,26 @@ default-package-overrides:
   - bzlib-conduit ==0.2.1.4
   - c2hs ==0.28.1
   - Cabal ==1.24.2.0
-  - cabal-dependency-licenses ==0.1.2.0
+  - cabal-dependency-licenses ==0.2.0.0
   - cabal-doctest ==1
   - cabal-file-th ==0.2.4
   - cabal-helper ==0.7.3.0
-  - cabal-rpm ==0.10.1
-  - cabal-sort ==0.0.5.3
-  - cabal-src ==0.3.0.2
+  - cabal-rpm ==0.11
   - cache ==0.1.0.0
-  - cacophony ==0.8.0
+  - cacophony ==0.9.1
   - cairo ==0.13.3.1
   - call-stack ==0.1.0
-  - camfort ==0.900
+  - camfort ==0.901
   - carray ==0.1.6.5
   - cartel ==0.18.0.2
   - case-insensitive ==1.2.0.7
   - cased ==0.1.0.0
-  - cases ==0.1.3.1
+  - cases ==0.1.3.2
   - cassava ==0.4.5.1
-  - cassava-conduit ==0.3.2
+  - cassava-conduit ==0.3.5.1
   - cassava-megaparsec ==0.1.0
   - cassette ==0.1.0
-  - cayley-client ==0.2.1.1
+  - cayley-client ==0.4.0
   - cereal ==0.5.4.0
   - cereal-conduit ==0.7.3
   - cereal-text ==0.1.0.2
@@ -293,6 +320,7 @@ default-package-overrides:
   - Chart ==1.8.1
   - Chart-cairo ==1.8.1
   - Chart-diagrams ==1.8.1
+  - chart-unit ==0.1.0.0
   - ChasingBottoms ==1.3.1.2
   - cheapskate ==0.1.0.5
   - cheapskate-highlight ==0.1.0.0
@@ -300,7 +328,7 @@ default-package-overrides:
   - check-email ==1.0
   - checkers ==0.4.6
   - chell ==0.4.0.1
-  - chell-quickcheck ==0.2.5
+  - choice ==0.2.0
   - chunked-data ==0.3.0
   - cipher-aes ==0.2.11
   - cipher-aes128 ==0.7.0.3
@@ -309,27 +337,30 @@ default-package-overrides:
   - cipher-des ==0.0.6
   - cipher-rc4 ==0.1.4
   - circle-packing ==0.1.0.5
-  - clash-lib ==0.6.21
-  - clash-prelude ==0.10.14
-  - clash-systemverilog ==0.6.10
-  - clash-verilog ==0.6.10
-  - clash-vhdl ==0.6.16
-  - classy-prelude ==1.0.2
-  - classy-prelude-conduit ==1.0.2
-  - classy-prelude-yesod ==1.0.2
-  - clay ==0.11
-  - clckwrks ==0.23.19.2
+  - clang-pure ==0.2.0.2
+  - clash-ghc ==0.7.0.1
+  - clash-lib ==0.7
+  - clash-prelude ==0.11
+  - clash-systemverilog ==0.7
+  - clash-verilog ==0.7
+  - clash-vhdl ==0.7
+  - classy-prelude ==1.2.0
+  - classy-prelude-conduit ==1.2.0
+  - classy-prelude-yesod ==1.2.0
+  - clay ==0.12.1
+  - clckwrks ==0.24.0.3
   - clckwrks-cli ==0.2.17.1
-  - clckwrks-plugin-media ==0.6.16.2
-  - clckwrks-plugin-page ==0.4.3.5
+  - clckwrks-plugin-media ==0.6.16.3
+  - clckwrks-plugin-page ==0.4.3.9
   - clckwrks-theme-bootstrap ==0.4.2.1
   - cli ==0.1.2
   - clientsession ==0.9.1.2
   - Clipboard ==2.3.1.0
   - clock ==0.7.2
+  - clock-extras ==0.1.0.2
   - clumpiness ==0.17.0.0
-  - ClustalParser ==1.1.4
-  - clustering ==0.2.1
+  - ClustalParser ==1.2.1
+  - clustering ==0.3.1
   - cmark ==0.5.5
   - cmark-highlight ==0.2.0.0
   - cmark-lucid ==0.1.0.0
@@ -337,22 +368,21 @@ default-package-overrides:
   - code-builder ==0.1.3
   - code-page ==0.1.1
   - codo-notation ==0.5.2
+  - colorful-monoids ==0.2.1.0
   - colour ==2.3.3
   - commutative ==0.0.1.4
   - comonad ==5
   - comonad-transformers ==4.0
   - comonads-fd ==4.0
   - compactmap ==0.1.4.2
-  - compdata ==0.10.1
   - composition ==1.0.2.1
   - composition-extra ==2.0.0
-  - concatenative ==1.0.1
   - concurrency ==1.0.0.0
-  - concurrent-extra ==0.7.0.10
   - concurrent-output ==1.7.8
   - concurrent-supply ==0.1.8
-  - conduit ==1.2.8
-  - conduit-combinators ==1.0.8.3
+  - conduit ==1.2.9
+  - conduit-combinators ==1.1.0
+  - conduit-connection ==0.1.0.3
   - conduit-extra ==1.1.15
   - conduit-iconv ==0.1.1.1
   - conduit-parse ==0.1.2.0
@@ -361,31 +391,35 @@ default-package-overrides:
   - configurator ==0.3.0.0
   - configurator-export ==0.1.0.1
   - connection ==0.2.7
-  - constraints ==0.8
-  - consul-haskell ==0.3
+  - console-style ==0.0.2.1
+  - constraints ==0.9
+  - consul-haskell ==0.4.2
   - containers-unicode-symbols ==0.3.1.1
-  - continued-fractions ==0.9.1.1
   - contravariant ==1.4
   - contravariant-extras ==0.3.3.1
   - control-bool ==0.2.1
   - control-monad-free ==0.6.1
   - control-monad-loop ==0.1
   - control-monad-omega ==0.3.1
-  - converge ==0.1.0.1
+  - convert-annotation ==0.5.0.1
   - convertible ==1.1.1.0
   - cookie ==0.4.2.1
   - countable ==1.0
   - courier ==0.1.1.4
-  - cpphs ==1.20.2
+  - cpphs ==1.20.3
   - cprng-aes ==0.6.1
   - cpu ==0.1.2
-  - crackNum ==1.5
-  - criterion ==1.1.1.0
-  - cron ==0.4.2
+  - cpuinfo ==0.1.0.1
+  - cql ==3.1.1
+  - cql-io ==0.16.0
+  - crackNum ==1.9
+  - criterion ==1.1.4.0
+  - cron ==0.5.0
   - crypto-api ==0.13.2
   - crypto-api-tests ==0.3
   - crypto-cipher-tests ==0.0.11
   - crypto-cipher-types ==0.0.9
+  - crypto-enigma ==0.0.2.8
   - crypto-numbers ==0.2.7
   - crypto-pubkey ==0.2.8
   - crypto-pubkey-types ==0.4.3
@@ -400,12 +434,16 @@ default-package-overrides:
   - cryptohash-sha256 ==0.11.100.1
   - cryptol ==2.4.0
   - cryptonite ==0.21
-  - cryptonite-conduit ==0.1
+  - cryptonite-conduit ==0.2.0
+  - cryptonite-openssl ==0.5
   - css-syntax ==0.0.5
   - css-text ==0.1.2.2
   - csv ==0.1.2
+  - csv-conduit ==0.6.7
   - ctrie ==0.1.1.0
+  - cubicbezier ==0.5.0.0
   - cubicspline ==0.1.2
+  - cue-sheet ==0.1.0
   - curl ==1.3.8
   - darcs ==2.12.5
   - data-accessor ==0.2.2.7
@@ -421,39 +459,39 @@ default-package-overrides:
   - data-inttrie ==0.1.2
   - data-lens-light ==0.1.2.2
   - data-memocombinators ==0.5.1
+  - data-msgpack ==0.0.9
   - data-or ==1.0.0.5
   - data-ordlist ==0.4.7.0
   - data-reify ==0.6.1
+  - datasets ==0.2.1
   - dataurl ==0.1.0.0
   - DAV ==1.3.1
   - dawg-ord ==0.5.1.0
-  - dbus ==0.10.12
   - debian-build ==0.10.1.0
   - Decimal ==0.4.2
-  - declarative ==0.2.3
+  - declarative ==0.5.1
   - deepseq-generics ==0.2.0.0
   - dejafu ==0.4.0.0
   - dependent-map ==0.2.4.0
-  - dependent-sum ==0.3.2.2
-  - dependent-sum-template ==0.0.0.5
-  - derive ==2.5.26
+  - dependent-sum ==0.4
   - deriving-compat ==0.3.5
   - descriptive ==0.9.4
-  - diagrams ==1.3.0.1
-  - diagrams-cairo ==1.3.1.1
-  - diagrams-canvas ==1.3.0.6
-  - diagrams-contrib ==1.3.0.12
-  - diagrams-core ==1.3.0.8
-  - diagrams-gtk ==1.3.0.2
-  - diagrams-html5 ==1.3.0.7
-  - diagrams-lib ==1.3.1.4
-  - diagrams-postscript ==1.3.0.7
-  - diagrams-rasterific ==1.3.1.8
+  - diagrams ==1.4
+  - diagrams-builder ==0.8.0.1
+  - diagrams-cairo ==1.4
+  - diagrams-canvas ==1.4
+  - diagrams-contrib ==1.4.0.1
+  - diagrams-core ==1.4
+  - diagrams-gtk ==1.4
+  - diagrams-html5 ==1.4
+  - diagrams-lib ==1.4.0.1
+  - diagrams-postscript ==1.4
+  - diagrams-rasterific ==1.4
   - diagrams-solve ==0.1.0.1
-  - diagrams-svg ==1.4.0.3
+  - diagrams-svg ==1.4.1
   - dice ==0.1
   - Diff ==0.3.4
-  - diff3 ==0.2.0.3
+  - diff3 ==0.3.0
   - digest ==0.0.1.2
   - digits ==0.3.1
   - dimensional ==1.0.1.3
@@ -461,23 +499,29 @@ default-package-overrides:
   - directory-tree ==0.12.1
   - discount ==0.1.1
   - disk-free-space ==0.1.0.1
+  - distance ==0.1.0.0
   - distributed-closure ==0.3.3.0
+  - distributed-process ==0.6.6
+  - distributed-process-simplelocalnet ==0.2.3.3
   - distributed-static ==0.3.5.0
   - distribution-nixpkgs ==1.0.0.1
   - distributive ==0.5.2
-  - diversity ==0.8.0.1
+  - diversity ==0.8.0.2
   - djinn-ghc ==0.0.2.3
   - djinn-lib ==0.0.1.2
   - dlist ==0.8.0.2
   - dlist-instances ==0.1.1.1
+  - dmenu ==0.3.1.1
+  - dmenu-pkill ==0.1.0.1
+  - dmenu-pmount ==0.1.0.1
+  - dmenu-search ==0.1.0.1
   - dns ==2.0.10
   - do-list ==1.0.1
   - dockerfile ==0.1.0.1
   - docopt ==0.7.0.5
+  - doctemplates ==0.1.0.2
   - doctest ==0.11.1
   - doctest-discover ==0.1.0.7
-  - doctest-prop ==0.2.0.1
-  - docvim ==0.3.2.1
   - dotenv ==0.3.1.0
   - dotnet-timespan ==0.0.1.0
   - double-conversion ==2.0.2.0
@@ -486,13 +530,14 @@ default-package-overrides:
   - drawille ==0.1.2.0
   - DRBG ==0.5.5
   - drifter ==0.2.2
-  - drifter-postgresql ==0.0.2
+  - drifter-postgresql ==0.1.0
   - dual-tree ==0.2.0.9
   - dynamic-state ==0.2.2.0
   - dyre ==0.8.12
   - Earley ==0.11.0.1
   - easy-file ==0.2.1
   - Ebnf2ps ==1.0.15
+  - echo ==0.1.3
   - ed25519 ==0.0.5.0
   - ede ==0.2.8.7
   - EdisonAPI ==1.3.1
@@ -505,26 +550,34 @@ default-package-overrides:
   - ekg ==0.4.0.12
   - ekg-core ==0.1.1.1
   - ekg-json ==0.1.0.4
+  - ekg-statsd ==0.2.1.0
   - elerea ==2.9.0
-  - elm-bridge ==0.3.0.2
+  - elm-bridge ==0.4.0
   - elm-core-sources ==1.0.0
+  - elm-export ==0.6.0.1
+  - elm-export-persistent ==0.1.2
   - email-validate ==2.2.0
-  - emailaddress ==0.1.6.0
+  - emailaddress ==0.2.0.0
   - enclosed-exceptions ==1.0.2
   - encoding-io ==0.0.1
+  - EntrezHTTP ==1.0.3
   - entropy ==0.3.7
   - enummapset-th ==0.6.1.1
-  - envelope ==0.1.0.0
+  - envelope ==0.2.1.0
+  - envparse ==0.4
+  - envy ==1.3.0.1
+  - epub-metadata ==4.5
   - eq ==4.0.4
-  - equivalence ==0.3.1
+  - equivalence ==0.3.2
   - erf ==2.0.0.0
   - errors ==2.1.3
   - ersatz ==0.3.1
+  - esqueleto ==2.5.1
   - etcd ==1.0.5
   - ether ==0.4.0.2
   - euphoria ==0.8.0.0
   - event ==0.1.4
-  - eventstore ==0.13.1.2
+  - eventstore ==0.14.0.1
   - exact-combinatorics ==0.2.0.8
   - exact-pi ==0.4.1.2
   - exception-mtl ==0.4.0.1
@@ -533,28 +586,26 @@ default-package-overrides:
   - exceptions ==0.8.3
   - executable-hash ==0.2.0.4
   - executable-path ==0.0.3
-  - exp-pairs ==0.1.5.1
+  - exhaustive ==1.1.3
+  - exp-pairs ==0.1.5.2
   - expiring-cache-map ==0.0.6.1
-  - explicit-exception ==0.1.8
   - extensible ==0.3.7
   - extensible-effects ==1.11.0.4
   - extensible-exceptions ==0.1.1.4
-  - extra ==1.4.10
-  - extract-dependencies ==0.2.0.1
+  - extra ==1.5.1
   - fail ==4.9.0.0
   - farmhash ==0.1.0.5
   - fast-builder ==0.0.0.6
   - fast-digits ==0.2.1.0
   - fast-logger ==2.4.10
-  - fasta ==0.10.4.0
-  - fay ==0.23.1.12
+  - fasta ==0.10.4.1
+  - fay ==0.23.1.16
   - fay-base ==0.20.0.1
   - fay-builder ==0.2.0.5
   - fay-dom ==0.5.0.1
   - fay-jquery ==0.6.1.0
   - fay-text ==0.3.2.2
   - fay-uri ==0.2.0.0
-  - fb ==1.0.13
   - fclabels ==2.0.3.2
   - feature-flags ==0.1.0.1
   - feed ==0.3.12.0
@@ -567,15 +618,17 @@ default-package-overrides:
   - filecache ==0.2.9
   - filelock ==0.1.0.1
   - filemanip ==0.3.6.3
-  - find-clumpiness ==0.2.0.1
-  - FindBin ==0.0.5
   - fingertree ==0.1.1.0
   - fingertree-psqueue ==0.3
+  - finite-typelits ==0.1.1.0
   - fixed ==0.2.1.1
-  - fixed-vector ==0.8.1.0
+  - fixed-vector ==0.9.0.0
   - fixed-vector-hetero ==0.3.1.1
-  - flat-mcmc ==1.0.1
+  - flac ==0.1.1
+  - flac-picture ==0.1.0
+  - flat-mcmc ==1.5.0
   - flexible-defaults ==0.0.1.2
+  - FloatingHex ==0.4
   - flock ==0.3.1.8
   - flow ==1.0.7
   - fmlist ==0.9
@@ -584,43 +637,44 @@ default-package-overrides:
   - fold-debounce ==0.2.0.5
   - fold-debounce-conduit ==0.1.0.5
   - foldl ==1.2.3
+  - foldl-statistics ==0.1.4.2
+  - folds ==0.7.1
   - FontyFruity ==0.5.3.2
   - force-layout ==0.4.0.6
-  - forecast-io ==0.2.0.0
   - foreign-store ==0.2
+  - format-numbers ==0.1.0.0
   - formatting ==6.2.4
   - fortran-src ==0.1.0.4
   - Frames ==0.1.9
   - free ==4.12.4
   - free-vl ==0.1.4
   - freenect ==1.2.1
-  - freer ==0.2.4.1
   - friendly-time ==0.4
   - frisby ==0.2
+  - from-sum ==0.2.1.0
   - frontmatter ==0.1.0.2
   - fsnotify ==0.2.1
   - fsnotify-conduit ==0.1.0.0
   - funcmp ==1.8
   - fuzzcheck ==0.1.1
-  - gamma ==0.9.0.2
   - gd ==3000.7.3
   - Genbank ==1.0.3
   - generic-aeson ==0.2.0.8
   - generic-deriving ==1.11.1
+  - generic-random ==0.4.0.0
   - generic-xmlpickler ==0.1.0.5
   - GenericPretty ==1.2.1
   - generics-eot ==0.2.1.1
   - generics-sop ==0.2.4.0
   - generics-sop-lens ==0.1.2.1
   - geniplate-mirror ==0.7.4
-  - genvalidity ==0.2.0.4
-  - genvalidity-hspec ==0.2.0.5
   - getopt-generics ==0.13
   - ghc-events ==0.4.4.0
-  - ghc-exactprint ==0.5.2.1
+  - ghc-exactprint ==0.5.3.0
   - ghc-heap-view ==0.5.7
-  - ghc-mod ==5.6.0.0
+  - ghc-mod ==5.7.0.0
   - ghc-paths ==0.1.0.9
+  - ghc-prof ==1.3.0.2
   - ghc-syb-utils ==0.2.3
   - ghc-tcplugins-extra ==0.2
   - ghc-typelits-extra ==0.2.2
@@ -629,138 +683,145 @@ default-package-overrides:
   - ghcid ==0.6.6
   - ghcjs-codemirror ==0.0.0.1
   - ghcjs-hplay ==0.3.4.2
-  - ghcjs-perch ==0.3.3
-  - gi-atk ==2.0.3
-  - gi-cairo ==1.0.3
-  - gi-gdk ==3.0.3
-  - gi-gdkpixbuf ==2.0.3
-  - gi-gio ==2.0.3
-  - gi-glib ==2.0.3
-  - gi-gobject ==2.0.3
-  - gi-gtk ==3.0.3
-  - gi-javascriptcore ==3.0.3
-  - gi-pango ==1.0.3
-  - gi-soup ==2.4.3
-  - gi-webkit ==3.0.3
+  - ghcjs-perch ==0.3.3.1
+  - gi-atk ==2.0.11
+  - gi-cairo ==1.0.11
+  - gi-gdk ==3.0.11
+  - gi-gdkpixbuf ==2.0.11
+  - gi-gio ==2.0.11
+  - gi-glib ==2.0.11
+  - gi-gobject ==2.0.11
+  - gi-gtk ==3.0.11
+  - gi-javascriptcore ==3.0.11
+  - gi-pango ==1.0.11
+  - gi-soup ==2.4.11
+  - gi-webkit ==3.0.11
+  - ginger ==0.3.9.1
   - gio ==0.13.3.1
   - gipeda ==0.3.3.1
-  - giphy-api ==0.4.0.0
-  - git-fmt ==0.4.1.0
+  - giphy-api ==0.5.2.0
+  - github ==0.15.0
+  - github-release ==1.0.1
   - github-types ==0.2.1
   - github-webhook-handler ==0.0.8
+  - github-webhook-handler-snap ==0.0.7
   - gitlib ==3.1.1
   - gitlib-libgit2 ==3.1.1
   - gitlib-test ==3.1.0.3
   - gitrev ==1.2.0
   - gitson ==0.5.2
-  - gl ==0.7.8.1
-  - glabrous ==0.1.3.0
+  - glabrous ==0.3.1
+  - glaze ==0.2.0.2
+  - glazier ==0.7.0.0
+  - glazier-pipes ==0.1.4.0
   - GLFW-b ==1.4.8.1
   - glib ==0.13.4.1
   - Glob ==0.7.14
+  - glob-posix ==0.1.0.1
   - gloss ==1.10.2.5
   - gloss-rendering ==1.10.3.5
   - GLURaw ==2.0.0.3
   - GLUT ==2.7.0.11
-  - gogol ==0.1.0
-  - gogol-adexchange-buyer ==0.1.0
-  - gogol-adexchange-seller ==0.1.0
-  - gogol-admin-datatransfer ==0.1.0
-  - gogol-admin-directory ==0.1.0
-  - gogol-admin-emailmigration ==0.1.0
-  - gogol-admin-reports ==0.1.0
-  - gogol-adsense ==0.1.0
-  - gogol-adsense-host ==0.1.0
-  - gogol-affiliates ==0.1.0
-  - gogol-analytics ==0.1.0
-  - gogol-android-enterprise ==0.1.0
-  - gogol-android-publisher ==0.1.0
-  - gogol-appengine ==0.1.0
-  - gogol-apps-activity ==0.1.0
-  - gogol-apps-calendar ==0.1.0
-  - gogol-apps-licensing ==0.1.0
-  - gogol-apps-reseller ==0.1.0
-  - gogol-apps-tasks ==0.1.0
-  - gogol-appstate ==0.1.0
-  - gogol-autoscaler ==0.1.0
-  - gogol-bigquery ==0.1.0
-  - gogol-billing ==0.1.0
-  - gogol-blogger ==0.1.0
-  - gogol-books ==0.1.0
-  - gogol-civicinfo ==0.1.0
-  - gogol-classroom ==0.1.0
-  - gogol-cloudmonitoring ==0.1.0
-  - gogol-cloudtrace ==0.1.0
-  - gogol-compute ==0.1.0
-  - gogol-container ==0.1.0
-  - gogol-core ==0.1.0
-  - gogol-customsearch ==0.1.0
-  - gogol-dataflow ==0.1.0
-  - gogol-dataproc ==0.1.0
-  - gogol-datastore ==0.1.0
-  - gogol-debugger ==0.1.0
-  - gogol-deploymentmanager ==0.1.0
-  - gogol-dfareporting ==0.1.0
-  - gogol-discovery ==0.1.0
-  - gogol-dns ==0.1.0
-  - gogol-doubleclick-bids ==0.1.0
-  - gogol-doubleclick-search ==0.1.0
-  - gogol-drive ==0.1.0
-  - gogol-firebase-rules ==0.1.0
-  - gogol-fitness ==0.1.0
-  - gogol-fonts ==0.1.0
-  - gogol-freebasesearch ==0.1.0
-  - gogol-fusiontables ==0.1.0
-  - gogol-games ==0.1.0
-  - gogol-games-configuration ==0.1.0
-  - gogol-games-management ==0.1.0
-  - gogol-genomics ==0.1.0
-  - gogol-gmail ==0.1.0
-  - gogol-groups-migration ==0.1.0
-  - gogol-groups-settings ==0.1.0
-  - gogol-identity-toolkit ==0.1.0
-  - gogol-kgsearch ==0.1.0
-  - gogol-latencytest ==0.1.0
-  - gogol-logging ==0.1.0
-  - gogol-maps-coordinate ==0.1.0
-  - gogol-maps-engine ==0.1.0
-  - gogol-mirror ==0.1.0
-  - gogol-monitoring ==0.1.0
-  - gogol-oauth2 ==0.1.0
-  - gogol-pagespeed ==0.1.0
-  - gogol-partners ==0.1.0
-  - gogol-people ==0.1.0
-  - gogol-play-moviespartner ==0.1.0
-  - gogol-plus ==0.1.0
-  - gogol-plus-domains ==0.1.0
-  - gogol-prediction ==0.1.0
-  - gogol-proximitybeacon ==0.1.0
-  - gogol-pubsub ==0.1.0
-  - gogol-qpxexpress ==0.1.0
-  - gogol-replicapool ==0.1.0
-  - gogol-replicapool-updater ==0.1.0
-  - gogol-resourcemanager ==0.1.0
-  - gogol-resourceviews ==0.1.0
-  - gogol-script ==0.1.0
-  - gogol-sheets ==0.1.0
-  - gogol-shopping-content ==0.1.0
-  - gogol-siteverification ==0.1.0
-  - gogol-spectrum ==0.1.0
-  - gogol-sqladmin ==0.1.0
-  - gogol-storage ==0.1.0
-  - gogol-storage-transfer ==0.1.0
-  - gogol-tagmanager ==0.1.0
-  - gogol-taskqueue ==0.1.0
-  - gogol-translate ==0.1.0
-  - gogol-urlshortener ==0.1.0
-  - gogol-useraccounts ==0.1.0
-  - gogol-vision ==0.1.0
-  - gogol-webmaster-tools ==0.1.0
-  - gogol-youtube ==0.1.0
-  - gogol-youtube-analytics ==0.1.0
-  - gogol-youtube-reporting ==0.1.0
+  - gogol ==0.1.1
+  - gogol-adexchange-buyer ==0.1.1
+  - gogol-adexchange-seller ==0.1.1
+  - gogol-admin-datatransfer ==0.1.1
+  - gogol-admin-directory ==0.1.1
+  - gogol-admin-emailmigration ==0.1.1
+  - gogol-admin-reports ==0.1.1
+  - gogol-adsense ==0.1.1
+  - gogol-adsense-host ==0.1.1
+  - gogol-affiliates ==0.1.1
+  - gogol-analytics ==0.1.1
+  - gogol-android-enterprise ==0.1.1
+  - gogol-android-publisher ==0.1.1
+  - gogol-appengine ==0.1.1
+  - gogol-apps-activity ==0.1.1
+  - gogol-apps-calendar ==0.1.1
+  - gogol-apps-licensing ==0.1.1
+  - gogol-apps-reseller ==0.1.1
+  - gogol-apps-tasks ==0.1.1
+  - gogol-appstate ==0.1.1
+  - gogol-autoscaler ==0.1.1
+  - gogol-bigquery ==0.1.1
+  - gogol-billing ==0.1.1
+  - gogol-blogger ==0.1.1
+  - gogol-books ==0.1.1
+  - gogol-civicinfo ==0.1.1
+  - gogol-classroom ==0.1.1
+  - gogol-cloudmonitoring ==0.1.1
+  - gogol-cloudtrace ==0.1.1
+  - gogol-compute ==0.1.1
+  - gogol-container ==0.1.1
+  - gogol-core ==0.1.1
+  - gogol-customsearch ==0.1.1
+  - gogol-dataflow ==0.1.1
+  - gogol-dataproc ==0.1.1
+  - gogol-datastore ==0.1.1
+  - gogol-debugger ==0.1.1
+  - gogol-deploymentmanager ==0.1.1
+  - gogol-dfareporting ==0.1.1
+  - gogol-discovery ==0.1.1
+  - gogol-dns ==0.1.1
+  - gogol-doubleclick-bids ==0.1.1
+  - gogol-doubleclick-search ==0.1.1
+  - gogol-drive ==0.1.1
+  - gogol-firebase-rules ==0.1.1
+  - gogol-fitness ==0.1.1
+  - gogol-fonts ==0.1.1
+  - gogol-freebasesearch ==0.1.1
+  - gogol-fusiontables ==0.1.1
+  - gogol-games ==0.1.1
+  - gogol-games-configuration ==0.1.1
+  - gogol-games-management ==0.1.1
+  - gogol-genomics ==0.1.1
+  - gogol-gmail ==0.1.1
+  - gogol-groups-migration ==0.1.1
+  - gogol-groups-settings ==0.1.1
+  - gogol-identity-toolkit ==0.1.1
+  - gogol-kgsearch ==0.1.1
+  - gogol-latencytest ==0.1.1
+  - gogol-logging ==0.1.1
+  - gogol-maps-coordinate ==0.1.1
+  - gogol-maps-engine ==0.1.1
+  - gogol-mirror ==0.1.1
+  - gogol-monitoring ==0.1.1
+  - gogol-oauth2 ==0.1.1
+  - gogol-pagespeed ==0.1.1
+  - gogol-partners ==0.1.1
+  - gogol-people ==0.1.1
+  - gogol-play-moviespartner ==0.1.1
+  - gogol-plus ==0.1.1
+  - gogol-plus-domains ==0.1.1
+  - gogol-prediction ==0.1.1
+  - gogol-proximitybeacon ==0.1.1
+  - gogol-pubsub ==0.1.1
+  - gogol-qpxexpress ==0.1.1
+  - gogol-replicapool ==0.1.1
+  - gogol-replicapool-updater ==0.1.1
+  - gogol-resourcemanager ==0.1.1
+  - gogol-resourceviews ==0.1.1
+  - gogol-script ==0.1.1
+  - gogol-sheets ==0.1.1
+  - gogol-shopping-content ==0.1.1
+  - gogol-siteverification ==0.1.1
+  - gogol-spectrum ==0.1.1
+  - gogol-sqladmin ==0.1.1
+  - gogol-storage ==0.1.1
+  - gogol-storage-transfer ==0.1.1
+  - gogol-tagmanager ==0.1.1
+  - gogol-taskqueue ==0.1.1
+  - gogol-translate ==0.1.1
+  - gogol-urlshortener ==0.1.1
+  - gogol-useraccounts ==0.1.1
+  - gogol-vision ==0.1.1
+  - gogol-webmaster-tools ==0.1.1
+  - gogol-youtube ==0.1.1
+  - gogol-youtube-analytics ==0.1.1
+  - gogol-youtube-reporting ==0.1.1
   - google-cloud ==0.0.4
   - google-oauth2-jwt ==0.1.3
+  - google-translate ==0.3
   - gpolyline ==0.1.0.1
   - graph-core ==0.3.0.0
   - graph-wrapper ==0.2.5.1
@@ -779,53 +840,64 @@ default-package-overrides:
   - gtksourceview3 ==0.13.3.1
   - H ==0.9.0.1
   - hackage-db ==1.22
-  - hackage-mirror ==0.1.1.1
   - hackage-security ==0.5.2.2
-  - hackage-whatsnew ==0.1.0.1
-  - hackmanager ==0.1.0.0
-  - haddock-api ==2.17.3
+  - hackernews ==1.1.1.0
   - haddock-library ==1.4.2
   - hailgun ==0.4.1.1
+  - hailgun-simple ==0.1.0.0
+  - hakyll ==4.9.5.1
   - half ==0.2.2.3
+  - hamilton ==0.1.0.0
   - hamlet ==1.2.0
   - HandsomeSoup ==0.4.2
-  - handwriting ==0.1.0.3
   - hapistrano ==0.2.1.2
   - happstack-authenticate ==2.3.4.7
   - happstack-clientsession ==7.3.1
   - happstack-hsp ==7.3.7.1
   - happstack-jmacro ==7.0.11
-  - happstack-server ==7.4.6.2
+  - happstack-server ==7.4.6.3
   - happstack-server-tls ==7.1.6.2
   - happy ==1.19.5
-  - HaRe ==0.8.3.0
   - harp ==0.4.2
-  - hashable ==1.2.4.0
-  - hashable-extras ==0.2.3
+  - hashable ==1.2.5.0
   - hashable-time ==0.2
   - hashmap ==1.3.2
   - hashtables ==1.2.1.0
-  - haskeline ==0.7.3.0
-  - haskell-gi ==0.18
-  - haskell-gi-base ==0.18.4
+  - haskeline ==0.7.3.1
+  - haskell-gi ==0.20
+  - haskell-gi-base ==0.20
   - haskell-lexer ==1.0.1
-  - haskell-names ==0.7.0
+  - haskell-names ==0.8.0
   - haskell-neo4j-client ==0.3.2.4
-  - haskell-packages ==0.4
+  - haskell-packages ==0.5
   - haskell-spacegoo ==0.2.0.1
   - haskell-src ==1.0.2.0
-  - haskell-src-exts ==1.17.1
-  - haskell-src-meta ==0.6.0.14
+  - haskell-src-exts ==1.18.2
+  - haskell-src-exts-simple ==1.19.0.0
+  - haskell-src-meta ==0.7.0.1
+  - haskell-tools-ast ==0.5.0.0
+  - haskell-tools-backend-ghc ==0.5.0.0
+  - haskell-tools-cli ==0.5.0.0
+  - haskell-tools-daemon ==0.5.0.0
+  - haskell-tools-debug ==0.5.0.0
+  - haskell-tools-demo ==0.5.0.0
+  - haskell-tools-prettyprint ==0.5.0.0
+  - haskell-tools-refactor ==0.5.0.0
+  - haskell-tools-rewrite ==0.5.0.0
   - HaskellNet ==0.5.1
   - HaskellNet-SSL ==0.3.3.0
-  - haskintex ==0.6.0.1
-  - haskoin-core ==0.4.0
+  - haskintex ==0.7.0.1
   - hasql ==0.19.16
+  - hasql-migration ==0.1.3
+  - hasql-transaction ==0.5
   - hastache ==0.6.1
-  - hasty-hamiltonian ==1.1.5
+  - hasty-hamiltonian ==1.3.0
   - HaTeX ==3.17.1.0
   - hatex-guide ==1.3.1.6
-  - hbayes ==0.5.2
+  - haxl ==0.5.0.0
+  - haxl-amazonka ==0.1.1
+  - HaXml ==1.25.3
+  - haxr ==3000.11.2
   - hbeanstalk ==0.2.4
   - Hclip ==3.0.0.4
   - HCodecs ==0.5
@@ -839,37 +911,43 @@ default-package-overrides:
   - hedis ==0.9.7
   - here ==1.2.9
   - heredoc ==0.2.0.0
+  - heterocephalus ==1.0.4.0
   - hex ==0.1.2
+  - hexml ==0.3.1
   - hexstring ==0.11.1
   - hflags ==0.4.2
   - hformat ==0.1.0.1
   - hfsevents ==0.1.6
-  - hgettext ==0.1.30
   - hid ==0.2.2
   - hidapi ==0.1.4
   - hierarchical-clustering ==0.4.6
+  - highjson ==0.4.0.0
+  - highjson-swagger ==0.4.0.0
+  - highjson-th ==0.4.0.0
   - highlighting-kate ==0.6.4
   - hinotify ==0.3.9
   - hint ==0.6.0
-  - hip ==1.2.0.0
+  - hip ==1.5.2.0
   - histogram-fill ==0.8.4.1
   - hit ==0.6.3
+  - hjpath ==3.0.1
   - hjsmin ==0.2.0.2
-  - hjsonpointer ==1.0.0.2
-  - hjsonschema ==1.1.0.1
-  - hlibgit2 ==0.18.0.15
+  - hjson ==1.3.2
+  - hjsonpointer ==1.1.0.2
+  - hjsonschema ==1.5.0.1
+  - hlibgit2 ==0.18.0.16
   - hlibsass ==0.1.5.0
-  - hlint ==1.9.35
-  - hmatrix ==0.17.0.2
-  - hmatrix-gsl ==0.17.0.0
-  - hmatrix-gsl-stats ==0.4.1.4
+  - hlint ==1.9.41
+  - hmatrix ==0.18.0.0
+  - hmatrix-gsl ==0.18.0.1
+  - hmatrix-gsl-stats ==0.4.1.6
+  - hmatrix-repa ==0.1.2.2
   - hmatrix-special ==0.4.0.1
   - hmpfr ==0.4.2.1
   - hmt ==0.15
-  - hoauth2 ==0.5.4.0
-  - hocilib ==0.1.0
+  - hoauth2 ==0.5.7
+  - hocilib ==0.2.0
   - holy-project ==0.2.0.1
-  - homplexity ==0.4.3.3
   - hOpenPGP ==2.5.5
   - hopenpgp-tools ==0.19.4
   - hopenssl ==1.7
@@ -877,29 +955,30 @@ default-package-overrides:
   - hostname ==1.0
   - hostname-validate ==1.0.0
   - hourglass ==0.2.10
-  - hpack-convert ==0.14.6
   - hpc-coveralls ==1.0.8
   - hPDB ==1.2.0.9
   - hPDB-examples ==1.2.0.7
   - HPDF ==1.4.10
   - hpio ==0.8.0.6
-  - hprotoc ==2.4.0
+  - hpp ==0.4.0
+  - hpqtypes ==1.5.1.1
   - hquantlib ==0.0.3.3
-  - hreader ==1.0.2
+  - hreader ==1.1.0
   - hruby ==0.3.4.3
   - hs-bibutils ==5.5
   - hs-GeoIP ==0.3
   - hsass ==0.4.0
   - hsb2hs ==0.3.1
   - hscolour ==1.24.1
-  - hsdns ==1.6.1
-  - hse-cpp ==0.1
+  - hsdns ==1.7
+  - hse-cpp ==0.2
   - hsebaysdk ==0.4.0.0
   - hsemail ==1.7.7
   - HSet ==0.0.0
   - hset ==2.2.0
   - hsexif ==0.6.0.10
-  - hsignal ==0.2.7.4
+  - hsignal ==0.2.7.5
+  - hsinstall ==1.5
   - hslogger ==1.2.10
   - hslua ==0.4.1
   - hsndfile ==0.8.0
@@ -907,63 +986,67 @@ default-package-overrides:
   - HsOpenSSL ==0.11.4
   - HsOpenSSL-x509-system ==0.1.0.3
   - hsp ==0.10.0
-  - hspec ==2.2.4
+  - hspec ==2.4.1
   - hspec-attoparsec ==0.1.0.2
-  - hspec-contrib ==0.3.0
-  - hspec-core ==2.2.4
-  - hspec-discover ==2.2.4
-  - hspec-expectations ==0.7.2
+  - hspec-core ==2.4.1
+  - hspec-discover ==2.4.1
+  - hspec-expectations ==0.8.2
   - hspec-expectations-pretty-diff ==0.7.2.4
   - hspec-golden-aeson ==0.2.0.3
-  - hspec-jenkins ==0.1.1
-  - hspec-megaparsec ==0.2.1
-  - hspec-meta ==2.2.1
-  - hspec-setup ==0.1.1.1
-  - hspec-smallcheck ==0.4.1
-  - hspec-wai ==0.6.6
-  - hspec-wai-json ==0.6.1
+  - hspec-megaparsec ==0.3.1
+  - hspec-meta ==2.3.2
+  - hspec-setup ==0.2.1.0
+  - hspec-smallcheck ==0.4.2
+  - hspec-wai ==0.8.0
+  - hspec-wai-json ==0.8.0
   - hspec-webdriver ==1.2.0
-  - hstatistics ==0.2.5.4
+  - hstatistics ==0.3
   - hstatsd ==0.1
   - HStringTemplate ==0.8.5
   - hsx-jmacro ==7.3.8
-  - hsx2hs ==0.13.5
+  - hsx2hs ==0.14.0
   - hsyslog ==4
   - htaglib ==1.0.4
   - HTF ==0.13.1.0
   - html ==1.0.1.2
   - html-conduit ==1.2.1.1
+  - html-email-validate ==0.2.0.0
   - htoml ==1.0.0.3
   - HTTP ==4000.3.5
-  - http-api-data ==0.2.4
-  - http-client ==0.4.31.2
+  - http-api-data ==0.3.5
+  - http-client ==0.5.5
   - http-client-openssl ==0.2.0.4
-  - http-client-tls ==0.2.4.1
+  - http-client-tls ==0.3.3.1
   - http-common ==0.8.2.0
-  - http-conduit ==2.1.11
+  - http-conduit ==2.2.3
   - http-date ==0.0.6.1
   - http-link-header ==1.0.3
   - http-media ==0.6.4
   - http-reverse-proxy ==0.4.3.2
   - http-streams ==0.8.4.0
   - http-types ==0.9.1
-  - http2 ==1.6.2
-  - httpd-shed ==0.4.0.3
+  - http2 ==1.6.3
   - human-readable-duration ==0.2.0.3
-  - HUnit ==1.3.1.2
-  - HUnit-approx ==1.0
+  - HUnit ==1.5.0.0
+  - HUnit-approx ==1.1
   - hunit-dejafu ==0.3.0.3
-  - hvect ==0.3.1.0
-  - hw-bits ==0.1.0.1
-  - hw-conduit ==0.0.0.11
+  - hvect ==0.4.0.0
+  - hw-balancedparens ==0.1.0.0
+  - hw-bits ==0.5.0.0
+  - hw-conduit ==0.1.0.0
   - hw-diagnostics ==0.0.0.5
+  - hw-excess ==0.1.0.0
+  - hw-int ==0.0.0.1
+  - hw-json ==0.4.0.0
+  - hw-mquery ==0.1.0.1
   - hw-parser ==0.0.0.1
-  - hw-prim ==0.1.0.3
-  - hw-rankselect ==0.3.0.0
-  - hw-succinct ==0.0.0.14
+  - hw-prim ==0.4.0.2
+  - hw-rankselect ==0.8.0.0
+  - hw-rankselect-base ==0.2.0.0
+  - hw-string-parse ==0.0.0.3
+  - hw-succinct ==0.1.0.1
   - hweblib ==0.6.3
   - hworker ==0.1.0.1
-  - hworker-ses ==0.1.1.0
   - hxt ==9.3.1.16
   - hxt-charproperties ==9.2.0.1
   - hxt-css ==0.1.0.3
@@ -975,33 +1058,38 @@ default-package-overrides:
   - hyphenation ==0.6
   - ical ==0.0.1
   - iconv ==0.4.1.3
-  - identicon ==0.1.0
-  - idris ==0.12.3
-  - ieee754 ==0.7.9
+  - identicon ==0.2.0
+  - ieee754 ==0.8.0
+  - if ==0.1.0.0
   - IfElse ==0.85
   - ignore ==0.1.1.0
   - ilist ==0.2.0.0
   - imagesize-conduit ==1.1
-  - imm ==1.0.1.0
+  - imm ==1.1.0.0
   - immortal ==0.2.2
   - include-file ==0.1.0.3
   - incremental-parser ==0.2.5
   - indentation-core ==0.0
   - indentation-parsec ==0.0
-  - indents ==0.3.3
-  - inflections ==0.2.0.1
+  - indents ==0.4.0.0
+  - inflections ==0.3.0.0
   - ini ==0.3.5
   - inline-c ==0.5.6.1
   - inline-c-cpp ==0.1.0.0
+  - inline-java ==0.6.1
   - inline-r ==0.9.0.1
-  - insert-ordered-containers ==0.1.0.1
+  - insert-ordered-containers ==0.2.0.0
+  - instance-control ==0.1.1.1
+  - integer-logarithms ==1.0.1
   - integration ==0.2.1
   - intero ==0.1.20
   - interpolate ==0.1.0
   - interpolatedstring-perl6 ==1.0.0
   - IntervalMap ==0.5.2.0
   - intervals ==0.7.2
+  - intro ==0.1.0.6
   - invariant ==0.4
+  - invertible ==0.2.0
   - io-choice ==0.0.6
   - io-machine ==0.2.0.0
   - io-manager ==0.1.0.2
@@ -1030,21 +1118,28 @@ default-package-overrides:
   - jmacro ==0.6.14
   - jmacro-rpc ==0.3.2
   - jmacro-rpc-happstack ==0.3.2
-  - jose ==0.4.0.3
+  - jmacro-rpc-snap ==0.3
+  - jni ==0.2.3
+  - jose ==0.5.0.2
   - jose-jwt ==0.7.4
   - js-flot ==0.8.3
   - js-jquery ==3.1.1
   - json ==0.9.1
-  - json-autotype ==1.0.15
+  - json-builder ==0.3
   - json-rpc-generic ==0.2.1.2
   - json-schema ==0.7.4.1
+  - json-stream ==0.4.1.3
   - JuicyPixels ==3.2.8
   - JuicyPixels-extra ==0.1.1
   - JuicyPixels-scale-dct ==0.1.1.2
+  - jvm ==0.1.2
+  - jvm-streaming ==0.1
   - jwt ==0.7.2
   - kan-extensions ==5.0.1
   - kansas-comet ==0.4
-  - kawhi ==0.0.1
+  - katip ==0.3.1.4
+  - katip-elasticsearch ==0.3.0.2
+  - kawhi ==0.2.1
   - kdt ==0.2.4
   - keter ==1.4.3.2
   - keycode ==0.2.2
@@ -1053,6 +1148,8 @@ default-package-overrides:
   - knob ==0.1.1
   - koofr-client ==1.0.0.3
   - kraken ==0.0.3
+  - l10n ==0.1.0.0
+  - labels ==0.3.0
   - lackey ==0.4.2
   - language-c ==0.5.0
   - language-c-quote ==0.11.7.1
@@ -1065,14 +1162,16 @@ default-package-overrides:
   - language-javascript ==0.6.0.9
   - language-lua2 ==0.1.0.5
   - language-nix ==2.1.0.1
-  - language-puppet ==1.3.1.1
-  - language-thrift ==0.9.0.2
+  - language-puppet ==1.3.5.1
+  - language-python ==0.5.4
+  - language-thrift ==0.10.0.0
+  - large-hashable ==0.1.0.3
   - largeword ==1.2.5
   - lattices ==1.5.0
   - lazy-csv ==0.5.1
   - lca ==0.3
   - leapseconds-announced ==2017
-  - lens ==4.14
+  - lens ==4.15.1
   - lens-action ==0.2.0.2
   - lens-aeson ==1.0.0.5
   - lens-datetime ==0.3
@@ -1081,6 +1180,7 @@ default-package-overrides:
   - lens-family-th ==0.5.0.0
   - lens-regex ==0.1.0
   - lens-simple ==0.1.0.9
+  - lentil ==1.0.8.0
   - leveldb-haskell ==0.6.4
   - lexer-applicative ==2.1.0.1
   - lhs2tex ==1.19
@@ -1088,33 +1188,47 @@ default-package-overrides:
   - libinfluxdb ==0.0.4
   - libmpd ==0.9.0.6
   - libnotify ==0.2
-  - libxml-sax ==0.7.5
+  - librato ==0.2.0.1
+  - libsystemd-journal ==1.4.1
   - LibZip ==1.0.1
+  - licensor ==0.2.0
   - lift-generics ==0.1.1
   - lifted-async ==0.9.1.1
   - lifted-base ==0.2.3.8
-  - line ==1.0.1.0
+  - line ==2.2.0
   - linear ==1.20.5
   - linear-accelerate ==0.2
+  - linked-list-with-iterator ==0.1.1.0
   - linux-file-extents ==0.2.0.0
   - linux-namespaces ==0.1.2.0
+  - List ==0.6.0
   - list-fusion-probe ==0.1.0.6
   - list-prompt ==0.1.1.0
   - list-t ==1
   - ListLike ==4.5.1
-  - load-env ==0.1.1
+  - lmdb ==0.2.5
   - loch-th ==0.2.1
-  - log-domain ==0.10.3.1
+  - log ==0.7
+  - log-base ==0.7
+  - log-domain ==0.11
+  - log-elasticsearch ==0.7
+  - log-postgres ==0.7
   - logfloat ==0.13.3.3
+  - logger-thread ==0.1.0.2
+  - logging-effect ==1.1.2
   - logging-facade ==0.1.1
   - logict ==0.6.0.2
   - loop ==0.3.0
   - lrucache ==1.2.0.0
   - lrucaching ==0.3.1
-  - ltext ==0.1.2.1
   - lucid ==2.9.7
   - lucid-svg ==0.7.0.0
+  - lzma-conduit ==1.1.3.1
   - machines ==0.6.1
+  - machines-binary ==0.3.0.3
+  - machines-directory ==0.2.0.10
+  - machines-io ==0.2.0.13
+  - machines-process ==0.2.0.8
   - magic ==1.1
   - mainland-pretty ==0.4.1.4
   - makefile ==0.1.0.5
@@ -1124,43 +1238,47 @@ default-package-overrides:
   - markdown-unlit ==0.4.0
   - markup ==3.1.0
   - math-functions ==0.2.1.0
+  - mathexpr ==0.3.0.0
   - matrices ==0.4.4
   - matrix ==0.3.5.0
   - maximal-cliques ==0.1.1
   - mbox ==0.3.3
   - mcmc-types ==1.0.3
-  - megaparsec ==5.0.1
-  - memory ==0.13
-  - MemoTrie ==0.6.4
+  - median-stream ==0.7.0.0
+  - mega-sdist ==0.3.0
+  - megaparsec ==5.2.0
+  - memory ==0.14.1
+  - MemoTrie ==0.6.7
   - mersenne-random ==1.0.0.1
-  - mersenne-random-pure64 ==0.2.0.5
+  - mersenne-random-pure64 ==0.2.2.0
   - messagepack ==0.5.4
   - messagepack-rpc ==0.5.1
-  - metrics ==0.3.0.2
+  - metrics ==0.4.0.1
   - MFlow ==0.4.6.0
+  - mfsolve ==0.3.2.0
   - microformats2-parser ==1.0.1.6
   - microlens ==0.4.7.0
-  - microlens-aeson ==2.1.1.3
+  - microlens-aeson ==2.2.0
   - microlens-contra ==0.1.0.1
   - microlens-ghc ==0.4.7.0
   - microlens-mtl ==0.1.10.0
   - microlens-platform ==0.3.7.1
   - microlens-th ==0.4.1.1
-  - mighty-metropolis ==1.0.4
-  - mime-mail ==0.4.12
+  - mighty-metropolis ==1.2.0
+  - mime-mail ==0.4.13
   - mime-mail-ses ==0.3.2.3
   - mime-types ==0.1.0.7
+  - mintty ==0.1
   - misfortune ==0.1.1.2
   - missing-foreign ==0.1.1
   - MissingH ==1.4.0.1
   - mmap ==0.5.9
   - mmorph ==1.0.9
   - mockery ==0.3.4
-  - modify-fasta ==0.8.2.1
-  - moesocks ==1.0.0.41
+  - modify-fasta ==0.8.2.3
   - monad-control ==1.0.1.0
   - monad-coroutine ==0.9.0.3
-  - monad-extras ==0.5.11
+  - monad-extras ==0.6.0
   - monad-http ==0.1.0.0
   - monad-journal ==0.7.2
   - monad-logger ==0.3.20.1
@@ -1168,6 +1286,7 @@ default-package-overrides:
   - monad-logger-prefix ==0.1.6
   - monad-logger-syslog ==0.1.3.0
   - monad-loops ==0.4.3
+  - monad-metrics ==0.1.0.2
   - monad-par ==0.3.4.8
   - monad-par-extras ==0.3.3
   - monad-parallel ==0.7.2.2
@@ -1184,16 +1303,17 @@ default-package-overrides:
   - monadloc ==0.7.1
   - monadplus ==1.4.2
   - MonadPrompt ==1.0.0.5
-  - MonadRandom ==0.4.2.3
+  - MonadRandom ==0.5.1
   - monads-tf ==0.1.0.3
   - mongoDB ==2.1.1.1
   - mono-traversable ==1.0.1.1
   - mono-traversable-instances ==0.1.0.0
   - monoid-extras ==0.4.2
-  - monoid-subclasses ==0.4.2.1
+  - monoid-subclasses ==0.4.3.1
   - monoidal-containers ==0.3.0.1
-  - morte ==1.6.2
+  - morte ==1.6.5
   - mountpoints ==1.0.2
+  - mstate ==0.2.7
   - mtl ==2.2.1
   - mtl-compat ==0.2.1.3
   - mtl-prelude ==2.0.3.1
@@ -1202,14 +1322,17 @@ default-package-overrides:
   - multipart ==0.1.2
   - multiset ==0.3.3
   - multiset-comb ==0.2.4.1
+  - multistate ==0.7.1.1
   - murmur-hash ==0.1.0.9
-  - murmur3 ==1.0.3
   - MusicBrainz ==0.2.4
-  - mustache ==2.1.2
   - mutable-containers ==0.3.3
-  - mwc-probability ==1.2.2
+  - mwc-probability ==1.3.0
   - mwc-random ==0.13.5.0
   - mwc-random-monad ==0.7.3.1
+  - mysql ==0.1.4
+  - mysql-haskell ==0.8.0.0
+  - mysql-haskell-openssl ==0.8.0.0
+  - mysql-simple ==0.4.0.0
   - nagios-check ==0.3.2
   - names-th ==0.2.0.2
   - nano-erl ==0.1.0.1
@@ -1217,18 +1340,25 @@ default-package-overrides:
   - nationstates ==0.5.0.0
   - nats ==1.1.1
   - natural-sort ==0.1.2
-  - natural-transformation ==0.3.1
+  - natural-transformation ==0.4
   - ndjson-conduit ==0.1.0.5
   - neat-interpolation ==0.3.2.1
   - netpbm ==1.0.2
   - nettle ==0.2.0
+  - netwire ==5.0.2
+  - netwire-input ==0.0.6
+  - netwire-input-glfw ==0.0.6
   - network ==2.6.3.1
   - network-anonymous-i2p ==0.10.0
   - network-anonymous-tor ==0.11.0
   - network-attoparsec ==0.12.2
+  - network-carbon ==1.0.8
   - network-conduit-tls ==1.2.2
   - network-house ==0.1.0.2
   - network-info ==0.2.0.8
+  - network-msgpack-rpc ==0.0.3
+  - network-multicast ==0.2.0
+  - Network-NineP ==0.4.1
   - network-simple ==0.4.0.5
   - network-transport ==0.4.4.0
   - network-transport-composed ==0.2.0.1
@@ -1236,9 +1366,12 @@ default-package-overrides:
   - network-transport-tcp ==0.5.1
   - network-transport-tests ==0.2.3.0
   - network-uri ==2.6.1.0
-  - network-uri-flag ==0.1
   - newtype ==0.2
+  - newtype-generics ==0.5
+  - next-ref ==0.1.0.2
+  - nfc ==0.0.1
   - nicify-lib ==1.0.1
+  - NineP ==0.0.2.1
   - nix-paths ==1.0.0.1
   - non-empty-sequence ==0.2.0.2
   - nonce ==1.0.2
@@ -1248,21 +1381,23 @@ default-package-overrides:
   - numeric-extras ==0.1
   - NumInstances ==1.4
   - numtype-dk ==0.5.0.1
+  - oanda-rest-api ==0.3.0.0
   - objective ==1.1.1
   - ObjectName ==1.1.0.1
-  - octane ==0.16.3
+  - octane ==0.18.2
   - Octree ==0.5.4.3
   - oeis ==0.3.8
   - ofx ==0.4.2.0
   - old-locale ==1.0.0.7
   - old-time ==1.1.0.3
-  - omnifmt ==0.2.1.1
   - once ==0.2
   - OneTuple ==0.2.1
   - oo-prototypes ==0.1.0.0
-  - opaleye ==0.5.2.2
+  - opaleye ==0.5.3.0
   - opaleye-trans ==0.3.4
   - open-browser ==0.2.1.0
+  - open-witness ==0.4
+  - OpenAL ==1.7.0.4
   - OpenGL ==3.0.1.0
   - OpenGLRaw ==3.2.4.0
   - openpgp-asciiarmor ==0.1
@@ -1270,32 +1405,35 @@ default-package-overrides:
   - openssl-streams ==1.2.1.0
   - operational ==0.2.3.5
   - operational-class ==0.3.0.0
-  - opml-conduit ==0.5.0.1
+  - opml-conduit ==0.6.0.1
   - optional-args ==1.0.1
   - options ==1.2.1.1
-  - optparse-applicative ==0.12.1.0
-  - optparse-generic ==1.1.1
+  - optparse-applicative ==0.13.1.0
+  - optparse-generic ==1.1.4
   - optparse-helper ==0.2.1.1
   - optparse-simple ==0.0.3
   - optparse-text ==0.1.1.0
   - osdkeys ==0.0
   - overloaded-records ==0.4.2.0
-  - package-description-remote ==0.2.0.0
   - packdeps ==0.4.3
   - pager ==0.1.1.0
-  - pagerduty ==0.0.7
+  - pagerduty ==0.0.8
   - pagination ==0.1.1
   - palette ==0.1.0.4
-  - pandoc ==1.17.1
+  - pandoc ==1.19.2.1
   - pandoc-citeproc ==0.10.4
-  - pandoc-types ==1.16.1.1
+  - pandoc-types ==1.17.0.5
   - pango ==0.13.3.1
   - parallel ==3.2.1.0
   - parallel-io ==0.3.3
   - parseargs ==0.2.0.8
   - parsec ==3.1.11
+  - parsec-numeric ==0.1.0.0
+  - ParsecTools ==0.0.2.0
   - parsers ==0.12.4
   - partial-handler ==1.0.2
+  - partial-isomorphisms ==0.2.2
+  - patat ==0.5.0.0
   - path ==0.5.12
   - path-extra ==0.0.3
   - path-io ==1.2.2
@@ -1303,8 +1441,6 @@ default-package-overrides:
   - pathwalk ==0.3.1.2
   - patience ==0.1.1
   - pattern-arrows ==0.0.2
-  - pbkdf ==1.1.1.1
-  - pcap ==0.4.5.2
   - pcre-heavy ==1.0.0.2
   - pcre-light ==0.4.0.4
   - pcre-utils ==0.1.8.1
@@ -1317,6 +1453,7 @@ default-package-overrides:
   - persistable-record ==0.4.1.0
   - persistable-types-HDBC-pg ==0.0.1.4
   - persistent ==2.6
+  - persistent-mysql ==2.6
   - persistent-postgresql ==2.6
   - persistent-redis ==2.5.2
   - persistent-refs ==0.4
@@ -1324,39 +1461,41 @@ default-package-overrides:
   - persistent-template ==2.5.1.6
   - pgp-wordlist ==0.1.0.2
   - phantom-state ==0.2.1.2
+  - picedit ==0.2.3.0
   - picoparsec ==0.1.2.3
-  - pinboard ==0.9.6
+  - pid1 ==0.1.0.1
+  - pinboard ==0.9.12.4
   - pinch ==0.3.0.2
-  - pinchot ==0.22.0.0
-  - pipes ==4.1.9
-  - pipes-aeson ==0.4.1.7
+  - pinchot ==0.24.0.0
+  - pipes ==4.3.2
   - pipes-attoparsec ==0.5.1.4
-  - pipes-bgzf ==0.2.0.1
   - pipes-bytestring ==2.1.4
-  - pipes-cacophony ==0.4.0
-  - pipes-cliff ==0.12.0.0
+  - pipes-cacophony ==0.4.1
+  - pipes-category ==0.2.0.1
   - pipes-concurrency ==2.0.7
   - pipes-csv ==1.4.3
   - pipes-extras ==1.0.8
-  - pipes-fastx ==0.3.0.0
+  - pipes-fluid ==0.5.0.3
   - pipes-group ==1.0.6
-  - pipes-http ==1.0.5
-  - pipes-illumina ==0.1.0.0
+  - pipes-misc ==0.2.3.0
   - pipes-mongodb ==0.1.0.0
-  - pipes-network ==0.6.4.1
   - pipes-parse ==3.0.8
   - pipes-random ==1.0.0.3
-  - pipes-safe ==2.2.4
+  - pipes-safe ==2.2.5
   - pipes-text ==0.0.2.5
   - pipes-wai ==3.2.0
   - pixelated-avatar-generator ==0.1.3
-  - pkcs10 ==0.1.1.0
+  - pkcs10 ==0.2.0.0
   - placeholders ==0.1
   - plan-b ==0.2.0
+  - plot ==0.2.3.6
+  - plot-gtk ==0.2.0.4
+  - plot-gtk-ui ==0.3.0.2
+  - plot-gtk3 ==0.1.0.2
   - point-octree ==0.5.5.3
   - pointed ==5
   - pointedlist ==0.6.1
-  - pointful ==1.0.8
+  - pointful ==1.0.9
   - pointless-fun ==1.1.0.6
   - polynomials-bernstein ==1.1.2
   - polyparse ==1.12
@@ -1364,11 +1503,12 @@ default-package-overrides:
   - post-mess-age ==0.2.1.0
   - postgresql-binary ==0.9.2
   - postgresql-libpq ==0.9.3.0
-  - postgresql-query ==3.0.1
-  - postgresql-schema ==0.1.10
   - postgresql-simple ==0.5.2.1
-  - postgresql-simple-url ==0.1.0.1
+  - postgresql-simple-migration ==0.1.8.0
+  - postgresql-simple-url ==0.2.0.0
   - postgresql-transactional ==1.1.1
+  - postgresql-typed ==0.5.0
+  - pqueue ==1.3.2
   - pred-set ==0.0.1
   - prednote ==0.36.0.4
   - prefix-units ==0.2.0
@@ -1379,13 +1519,15 @@ default-package-overrides:
   - pretty-class ==1.0.1.1
   - pretty-hex ==1.0
   - pretty-show ==1.6.12
+  - pretty-simple ==2.0.0.0
   - pretty-types ==0.2.3.1
   - prettyclass ==1.0.0.0
   - primes ==0.2.1.0
   - primitive ==0.6.1.0
-  - process-extras ==0.4.1.4
+  - printcess ==0.1.0.3
+  - process-extras ==0.7.1
   - product-profunctors ==0.7.1.0
-  - profiteur ==0.3.0.3
+  - profiteur ==0.4.2.0
   - profunctor-extras ==4.0
   - profunctors ==5.2
   - project-template ==0.2.0
@@ -1402,30 +1544,29 @@ default-package-overrides:
   - psql-helpers ==0.1.0.0
   - PSQueue ==1.1
   - psqueues ==0.2.2.3
-  - publicsuffix ==0.20160716
+  - publicsuffix ==0.20170109
   - pure-cdb ==0.1.2
   - pure-io ==0.2.1
   - pureMD5 ==2.1.3
-  - purescript ==0.9.3
-  - purescript-bridge ==0.8.0.1
+  - purescript-bridge ==0.10.0.0
+  - pusher-http-haskell ==1.1.0.4
   - pwstore-fast ==2.4.4
   - pwstore-purehaskell ==2.1.4
-  - quantum-random ==0.6.4
   - QuasiText ==0.1.2.6
   - questioner ==0.1.1.0
   - quickbench ==1.0
-  - QuickCheck ==2.8.2
+  - QuickCheck ==2.9.2
   - quickcheck-arbitrary-adt ==0.2.0.0
-  - quickcheck-assertions ==0.2.0
-  - quickcheck-combinators ==0.0.1
+  - quickcheck-assertions ==0.3.0
   - quickcheck-instances ==0.3.12
   - quickcheck-io ==0.1.4
-  - quickcheck-properties ==0.1
   - quickcheck-simple ==0.1.0.1
+  - quickcheck-special ==0.1.0.3
   - quickcheck-text ==0.1.2.1
   - quickcheck-unicode ==1.0.0.1
   - rainbow ==0.28.0.4
   - rainbox ==0.18.0.10
+  - ramus ==0.1.2
   - random ==1.1
   - random-fu ==0.2.7.0
   - random-shuffle ==0.0.4
@@ -1434,29 +1575,36 @@ default-package-overrides:
   - range ==0.1.2.0
   - range-set-list ==0.1.2.0
   - rank1dynamic ==0.3.3.0
-  - Rasterific ==0.6.1.1
-  - rasterific-svg ==0.3.1.2
+  - Rasterific ==0.7.1
+  - rasterific-svg ==0.3.2.1
   - ratel ==0.3.2
   - ratel-wai ==0.2.0
+  - rattletrap ==2.1.5
   - raw-strings-qq ==1.1
+  - rawfilepath ==0.1.0.0
+  - rawstring-qm ==0.2.3.0
+  - rdf ==0.1.0.1
   - read-editor ==0.1.0.2
   - read-env-var ==0.1.0.1
   - readable ==0.3.1
   - ReadArgs ==1.2.3
   - readline ==1.0.3.0
   - rebase ==1.0.8
+  - recursion-schemes ==5.0.1
   - redis-io ==0.7.0
   - redis-resp ==0.4.0
   - reducers ==3.12.1
+  - reedsolomon ==0.0.4.3
   - ref-fd ==0.4.0.1
   - refact ==0.3.0.2
+  - references ==0.3.2.1
   - reflection ==2.1.2
   - reform ==0.2.7.1
-  - reform-blaze ==0.2.4.1
-  - reform-hamlet ==0.0.5.1
+  - reform-blaze ==0.2.4.3
+  - reform-hamlet ==0.0.5.3
   - reform-happstack ==0.2.5.1
   - reform-hsp ==0.2.7.1
-  - RefSerialize ==0.3.1.4
+  - RefSerialize ==0.4.0
   - regex-applicative ==0.3.3
   - regex-applicative-text ==0.1.0.1
   - regex-base ==0.93.2
@@ -1477,15 +1625,19 @@ default-package-overrides:
   - repa-algorithms ==3.4.1.1
   - repa-io ==3.4.1.1
   - RepLib ==0.5.4
+  - repline ==0.1.6.0
+  - req ==0.2.0
+  - req-conduit ==0.1.0
   - rerebase ==1.0.3
-  - reroute ==0.4.0.1
+  - reroute ==0.4.1.0
   - resolve-trivial-conflicts ==0.3.2.4
   - resource-pool ==0.2.3.2
   - resourcet ==1.1.9
   - rest-client ==0.5.1.1
   - rest-core ==0.39
-  - rest-gen ==0.19.0.3
+  - rest-gen ==0.20.0.0
   - rest-happstack ==0.3.1.1
+  - rest-snap ==0.2.0.1
   - rest-stringmap ==0.2.0.6
   - rest-types ==1.14.1.1
   - rest-wai ==0.2.0.1
@@ -1495,32 +1647,37 @@ default-package-overrides:
   - retry ==0.7.4.2
   - rev-state ==0.1.2
   - rfc5051 ==0.1.0.3
+  - riak ==1.1.1.0
+  - riak-protobuf ==0.22.0.0
+  - RNAlien ==1.3.1
   - rng-utils ==0.2.1
   - rose-trees ==0.0.4.3
-  - rosezipper ==0.2
-  - rotating-log ==0.4
+  - rotating-log ==0.4.2
   - RSA ==2.2.0
-  - rss-conduit ==0.2.0.2
+  - rss-conduit ==0.3.0.0
   - runmemo ==1.0.0.1
   - rvar ==0.2.0.3
   - s3-signer ==0.3.0.0
-  - safe ==0.3.11
+  - safe ==0.3.13
   - safe-exceptions ==0.1.4.0
+  - safe-exceptions-checked ==0.1.0
   - safecopy ==0.9.2
   - SafeSemaphore ==0.10.1
-  - sampling ==0.2.0
+  - sampling ==0.3.2
   - sandi ==0.4.0
   - sandman ==0.2.0.1
   - say ==0.1.0.0
-  - sbv ==5.12
-  - scalpel ==0.3.1
+  - sbv ==5.14
+  - scalpel ==0.5.0
+  - scalpel-core ==0.5.0
   - scanner ==0.2
-  - scientific ==0.3.4.9
+  - scientific ==0.3.4.10
   - scotty ==0.11.0
-  - scrape-changes ==0.1.0.4
   - scrypt ==0.5.0
-  - sdl2 ==2.1.3.1
-  - secp256k1 ==0.4.6
+  - sdl2 ==2.2.0
+  - sdl2-gfx ==0.2
+  - sdl2-image ==2.0.0
+  - sdl2-mixer ==0.1
   - securemem ==0.1.9
   - SegmentTree ==0.3
   - semigroupoid-extras ==5
@@ -1532,19 +1689,21 @@ default-package-overrides:
   - seqalign ==0.2.0.4
   - seqloc ==0.6.1.1
   - serf ==0.1.1.0
-  - servant ==0.8.1
+  - servant ==0.9.1.1
   - servant-aeson-specs ==0.5.2.0
+  - servant-auth-cookie ==0.4.3.2
   - servant-blaze ==0.7.1
   - servant-cassava ==0.8
-  - servant-client ==0.8.1
-  - servant-docs ==0.8.1
-  - servant-foreign ==0.8.1
-  - servant-js ==0.8.1
+  - servant-client ==0.9.1.1
+  - servant-docs ==0.9.1.1
+  - servant-elm ==0.4.0.0
+  - servant-foreign ==0.9.1.1
+  - servant-js ==0.9.1
   - servant-JuicyPixels ==0.3.0.2
   - servant-lucid ==0.7.1
   - servant-mock ==0.8.1.1
-  - servant-purescript ==0.3.1.5
-  - servant-server ==0.8.1
+  - servant-purescript ==0.6.0.0
+  - servant-server ==0.9.1.1
   - servant-subscriber ==0.5.0.3
   - servant-swagger ==1.1.2
   - servant-swagger-ui ==0.2.2.2.2.8
@@ -1563,15 +1722,15 @@ default-package-overrides:
   - shake-language-c ==0.10.0
   - shakespeare ==2.0.12.1
   - shell-conduit ==4.5.2
-  - shelly ==1.6.8.1
   - shortcut-links ==0.4.2.0
   - should-not-typecheck ==2.1.0
-  - show-type ==0.1.1
+  - show-prettyprint ==0.1.2
+  - sibe ==0.2.0.4
   - signal ==0.1.0.3
   - silently ==1.2.5
   - simple ==0.11.1
   - simple-download ==0.0.2
-  - simple-log ==0.4.0
+  - simple-log ==0.5.1
   - simple-reflect ==0.3.2
   - simple-sendfile ==0.2.25
   - simple-session ==0.10.1.1
@@ -1582,12 +1741,12 @@ default-package-overrides:
   - siphash ==1.0.3
   - skein ==1.0.9.4
   - skeletons ==0.4.0
+  - skylighting ==0.1.1.5
   - slave-thread ==1.0.2
   - slug ==0.1.6
   - smallcaps ==0.6.0.4
   - smallcheck ==1.1.1
   - smoothie ==0.4.2.6
-  - smsaero ==0.6.2
   - smtLib ==1.0.8
   - smtp-mail ==0.1.4.6
   - snap-core ==1.0.1.0
@@ -1596,34 +1755,36 @@ default-package-overrides:
   - soap ==0.2.3.3
   - soap-openssl ==0.1.0.2
   - soap-tls ==0.1.1.2
-  - socket ==0.6.1.0
+  - socket ==0.7.0.0
+  - socket-activation ==0.1.0.2
   - socks ==0.5.5
-  - solga ==0.1.0.1
+  - solga ==0.1.0.2
   - solga-swagger ==0.1.0.2
   - sorted-list ==0.2.0.0
   - sourcemap ==0.1.6
+  - sparkle ==0.4.0.2
+  - sparse-linear-algebra ==0.2.2.0
   - spdx ==0.2.1.0
   - speculation ==1.5.0.3
-  - speedy-slice ==0.1.5
+  - speedy-slice ==0.3.0
   - sphinx ==0.6.0.2
-  - Spintax ==0.1.0.1
+  - Spintax ==0.3.1
   - splice ==0.6.1.1
   - split ==0.2.3.1
-  - Spock ==0.11.0.0
-  - Spock-api ==0.11.0.0
-  - Spock-api-server ==0.11.0.0
-  - Spock-core ==0.11.0.0
+  - Spock ==0.12.0.0
+  - Spock-api ==0.12.0.0
+  - Spock-api-server ==0.12.0.0
+  - Spock-core ==0.12.0.0
   - Spock-lucid ==0.3.0.0
   - Spock-worker ==0.3.1.0
   - spool ==0.1
   - spoon ==0.3.1
   - sql-words ==0.1.4.1
   - sqlite-simple ==0.4.12.1
+  - sqlite-simple-errors ==0.6.0.0
   - srcloc ==0.5.1.0
-  - stache ==0.1.8
-  - stack-run-auto ==0.1.1.4
-  - stackage-curator ==0.14.3
-  - stackage-types ==1.2.0
+  - stache ==0.2.0
+  - stack-type ==0.1.0.0
   - state-plus ==0.1.2
   - stateref ==0.3
   - statestack ==0.2.0.5
@@ -1631,24 +1792,28 @@ default-package-overrides:
   - stateWriter ==0.2.8
   - static-canvas ==0.2.0.3
   - statistics ==0.13.3.0
+  - stb-image-redux ==0.2.1.0
+  - stemmer ==0.5.2
   - stm ==2.4.4.1
   - stm-chans ==3.0.0.4
   - stm-conduit ==3.0.0
   - stm-containers ==0.2.15
   - stm-delay ==0.1.1.1
+  - stm-extras ==0.1.0.1
   - stm-stats ==0.2.0.0
-  - STMonadTrans ==0.3.4
+  - stm-supply ==0.2.0.0
+  - STMonadTrans ==0.4.3
   - stopwatch ==0.1.0.4
   - storable-complex ==0.2.2
   - storable-endian ==0.2.6
   - storable-record ==0.0.3.1
-  - store ==0.2.1.2
-  - store-core ==0.2.0.2
   - Strafunski-StrategyLib ==5.0.0.10
-  - stratosphere ==0.1.6
+  - stratosphere ==0.4.0
   - streaming ==0.1.4.5
   - streaming-bytestring ==0.1.4.6
   - streaming-commons ==0.1.17
+  - streaming-utils ==0.1.4.7
+  - streaming-wai ==0.1.1
   - streamproc ==1.6.2
   - streams ==3.3
   - strict ==0.3.2
@@ -1661,15 +1826,15 @@ default-package-overrides:
   - stringable ==0.1.3
   - stringbuilder ==0.5.0
   - stringsearch ==0.3.6.6
-  - stripe-core ==2.1.0
   - strive ==3.0.2
-  - stylish-haskell ==0.6.1.0
+  - stylish-haskell ==0.7.1.0
   - success ==0.2.6
   - sundown ==0.6
+  - superbuffer ==0.2.0.1
   - svg-builder ==0.1.0.2
-  - svg-tree ==0.5.1.2
-  - SVGFonts ==1.5.0.1
-  - swagger ==0.2.2
+  - svg-tree ==0.6
+  - SVGFonts ==1.6.0.1
+  - swagger ==0.3.0
   - swagger2 ==2.1.3
   - syb ==0.6
   - syb-with-class ==0.6.1.7
@@ -1683,17 +1848,22 @@ default-package-overrides:
   - tabular ==0.2.2.7
   - tagged ==0.8.5
   - tagged-binary ==0.2.0.0
+  - tagged-identity ==0.1.1
   - taggy ==0.2.0
   - taggy-lens ==0.1.2
   - tagshare ==0.0
   - tagsoup ==0.14
   - tagstream-conduit ==0.5.5.3
   - tar ==0.5.0.3
+  - tar-conduit ==0.1.0
   - tardis ==0.4.1.0
   - tasty ==0.11.1
   - tasty-ant-xml ==1.0.4
+  - tasty-auto ==0.1.0.1
   - tasty-dejafu ==0.3.0.2
+  - tasty-discover ==1.1.0
   - tasty-expected-failure ==0.11.0.4
+  - tasty-fail-fast ==0.0.2
   - tasty-golden ==2.3.1.1
   - tasty-hspec ==1.1.3.1
   - tasty-html ==0.4.1.1
@@ -1704,16 +1874,21 @@ default-package-overrides:
   - tasty-rerun ==1.1.6
   - tasty-silver ==3.1.9
   - tasty-smallcheck ==0.8.1
+  - tasty-tap ==0.0.4
   - tasty-th ==0.1.4
+  - Taxonomy ==1.0.2
   - TCache ==0.12.0
-  - tcp-streams ==0.4.0.0
+  - tce-conf ==1.3
+  - tcp-streams ==0.6.0.0
+  - tcp-streams-openssl ==0.6.0.0
+  - telegram-api ==0.6.0.0
   - template ==0.2.0.10
   - temporary ==1.2.0.4
   - temporary-rc ==1.2.0.3
-  - terminal-progress-bar ==0.0.1.4
+  - terminal-progress-bar ==0.1.1
   - terminal-size ==0.3.2.1
   - terminfo ==0.4.0.2
-  - test-fixture ==0.4.2.0
+  - test-fixture ==0.5.0.0
   - test-framework ==0.8.1.1
   - test-framework-hunit ==0.3.0.2
   - test-framework-quickcheck2 ==0.3.0.3
@@ -1721,20 +1896,23 @@ default-package-overrides:
   - test-framework-th ==0.2.4
   - test-simple ==0.1.9
   - testing-feat ==0.4.0.3
-  - texmath ==0.8.6.7
+  - texmath ==0.9.1
   - text ==1.2.2.1
   - text-all ==0.3.0.2
   - text-binary ==0.2.1.1
   - text-conversions ==0.3.0
   - text-format ==0.3.1.1
+  - text-generic-pretty ==1.2.1
   - text-icu ==0.7.0.1
   - text-ldap ==0.1.1.8
   - text-manipulate ==0.2.0.1
-  - text-metrics ==0.1.0
+  - text-metrics ==0.2.0
   - text-postgresql ==0.0.2.2
   - text-region ==0.1.0.1
-  - text-show ==3.4
-  - text-show-instances ==3.4
+  - text-show ==3.4.1.1
+  - text-show-instances ==3.5
+  - text-zipper ==0.10
+  - textlocal ==0.1.0.5
   - tf-random ==0.5
   - th-data-compat ==0.0.2.2
   - th-desugar ==1.6
@@ -1743,13 +1921,13 @@ default-package-overrides:
   - th-lift ==0.7.6
   - th-lift-instances ==0.1.11
   - th-orphans ==0.13.3
-  - th-printf ==0.3.1
   - th-reify-compat ==0.0.1.1
   - th-reify-many ==0.1.6
   - th-to-exp ==0.0.1.0
-  - th-utilities ==0.2.0.1
   - these ==0.7.3
+  - thread-local-storage ==0.1.1
   - threads ==0.5.1.4
+  - threepenny-gui ==0.7.0.1
   - through-text ==0.1.0.0
   - thumbnail-plus ==1.0.5
   - thyme ==0.3.5.5
@@ -1762,14 +1940,17 @@ default-package-overrides:
   - timelens ==0.2.0.2
   - timemap ==0.0.4
   - timerep ==2.0.0.2
+  - timespan ==0.3.0.0
   - timezone-olson ==0.1.7
   - timezone-series ==0.1.6.1
   - tinylog ==0.14.0
   - tinytemplate ==0.1.2.0
+  - titlecase ==0.1.0.3
   - tls ==1.3.9
   - tls-debug ==0.4.4
   - token-bucket ==0.1.0.1
   - tostring ==0.2.1.1
+  - tracy ==0.1.4.0
   - transformers-base ==0.4.4
   - transformers-compat ==0.5.1.4
   - transformers-lift ==0.1.0.1
@@ -1777,30 +1958,30 @@ default-package-overrides:
   - transient-universe ==0.3.5.1
   - traverse-with-class ==0.2.0.4
   - tree-fun ==0.8.1.0
-  - tree-view ==0.4
-  - tries ==0.0.4
   - trifecta ==1.6.2.1
   - true-name ==0.1.0.2
   - ttrie ==0.1.2.1
-  - tttool ==1.6.1.2
+  - tttool ==1.7.0.1
   - tuple ==0.3.0.2
   - tuple-th ==0.2.5
   - tuples-homogenous-h98 ==0.1.1.0
-  - turtle ==1.2.8
+  - turtle ==1.3.1
   - turtle-options ==0.1.0.4
-  - twitter-conduit ==0.2.1
   - twitter-feed ==0.2.0.11
-  - twitter-types ==0.7.2.2
-  - twitter-types-lens ==0.7.2
   - type-aligned ==0.9.6
+  - type-assertions ==0.1.0.0
   - type-eq ==0.5
   - type-fun ==0.1.1
+  - type-level-kv-list ==1.1.0
   - type-level-numbers ==0.1.1.1
   - type-list ==0.5.0.0
-  - type-spec ==0.2.0.0
+  - type-operators ==0.1.0.4
+  - type-spec ==0.3.0.1
+  - TypeCompose ==0.9.12
   - typed-process ==0.1.0.0
   - typelits-witnesses ==0.2.3.0
   - typography-geometry ==1.0.0.1
+  - tz ==0.1.2.1
   - tzdata ==0.1.20161123.0
   - ua-parser ==0.7.3
   - uglymemo ==0.1.0.1
@@ -1809,15 +1990,13 @@ default-package-overrides:
   - unbounded-delays ==0.1.0.9
   - uncertain ==0.3.1.0
   - unexceptionalio ==0.3.0
-  - unfoldable ==0.8.4
-  - unfoldable-restricted ==0.0.2
   - unicode-show ==0.1.0.2
-  - unicode-transforms ==0.1.0.1
+  - unicode-transforms ==0.2.1
   - unification-fd ==0.10.0.1
   - union ==0.1.1.1
   - union-find ==0.2
   - uniplate ==1.6.12
-  - unit-constraint ==0.0.0
+  - Unique ==0.4.6.1
   - units ==2.4
   - units-defs ==2.0.1.1
   - units-parser ==0.1.0.0
@@ -1831,9 +2010,11 @@ default-package-overrides:
   - unix-compat ==0.4.3.1
   - unix-time ==0.3.7
   - Unixutils ==1.54.1
+  - unlit ==0.4.0.0
   - unordered-containers ==0.2.7.2
   - uri-bytestring ==0.2.2.1
   - uri-encode ==1.5.0.5
+  - uri-templater ==0.2.1.0
   - url ==2.1.3
   - urlpath ==5.0.0.1
   - userid ==0.1.2.8
@@ -1850,9 +2031,7 @@ default-package-overrides:
   - uuid-types ==1.0.3
   - vado ==0.0.8
   - validate-input ==0.4.0.0
-  - validation ==0.5.4
-  - validity ==0.3.1.1
-  - varying ==0.5.0.3
+  - varying ==0.7.0.3
   - vault ==0.3.0.6
   - vcswrapper ==0.1.5
   - vector ==0.11.0.0
@@ -1860,29 +2039,33 @@ default-package-overrides:
   - vector-binary-instances ==0.2.3.4
   - vector-buffer ==0.4.1
   - vector-fftw ==0.1.3.7
-  - vector-instances ==3.3.1
+  - vector-instances ==3.4
+  - vector-sized ==0.5.1.0
   - vector-space ==0.10.4
+  - vector-split ==1.0.0.2
   - vector-th-unbox ==0.2.1.6
   - vectortiles ==1.2.0.2
   - versions ==3.0.0
   - vhd ==0.2.2
-  - ViennaRNAParser ==1.2.9
+  - ViennaRNAParser ==1.3.2
+  - viewprof ==0.0.0.1
   - vinyl ==0.5.3
   - vinyl-utils ==0.3.0.0
   - void ==0.7.1
-  - vty ==5.11.3
+  - vty ==5.15
   - wai ==3.2.1.1
   - wai-app-static ==3.1.6.1
   - wai-conduit ==3.0.0.3
   - wai-cors ==0.2.5
   - wai-eventsource ==3.0.0
   - wai-extra ==3.0.19.1
+  - wai-handler-launch ==3.0.2.2
   - wai-logger ==2.3.0
   - wai-middleware-caching ==0.1.0.2
   - wai-middleware-caching-lru ==0.1.0.0
   - wai-middleware-caching-redis ==0.2.0.0
   - wai-middleware-consul ==0.1.0.2
-  - wai-middleware-content-type ==0.4.1
+  - wai-middleware-content-type ==0.5.0.1
   - wai-middleware-crowd ==0.1.4.2
   - wai-middleware-metrics ==0.2.3
   - wai-middleware-prometheus ==0.1.0.1
@@ -1890,7 +2073,9 @@ default-package-overrides:
   - wai-middleware-throttle ==0.2.1.0
   - wai-middleware-verbs ==0.3.2
   - wai-predicates ==0.9.0
-  - wai-request-spec ==0.10.2.4
+  - wai-route ==0.3.1.1
+  - wai-routes ==0.9.10
+  - wai-routing ==0.13.0
   - wai-session ==0.3.2
   - wai-session-postgresql ==0.2.1.0
   - wai-transformers ==0.0.7
@@ -1898,6 +2083,9 @@ default-package-overrides:
   - waitra ==0.0.4.0
   - warp ==3.2.11
   - warp-tls ==3.2.3
+  - wave ==0.1.4
+  - wavefront ==0.7.0.2
+  - wavefront-obj ==0.1.0.1
   - web-plugins ==0.2.9
   - web-routes ==0.27.11
   - web-routes-boomerang ==0.28.4.2
@@ -1911,32 +2099,42 @@ default-package-overrides:
   - webkitgtk3-javascriptcore ==0.14.2.1
   - webpage ==0.0.4
   - webrtc-vad ==0.1.0.3
-  - websockets ==0.9.8.2
+  - websockets ==0.10.0.0
+  - websockets-snap ==0.10.2.0
   - weigh ==0.0.3
-  - werewolf ==1.5.1.1
-  - werewolf-slack ==1.0.2.0
-  - wikicfp-scraper ==0.1.0.7
+  - wikicfp-scraper ==0.1.0.8
+  - wild-bind ==0.1.0.3
+  - wild-bind-indicator ==0.1.0.1
+  - wild-bind-task-x11 ==0.1.0.1
+  - wild-bind-x11 ==0.1.0.6
   - Win32 ==2.3.1.1
   - Win32-extras ==0.2.0.1
   - Win32-notify ==0.3.0.1
+  - wire-streams ==0.1.1.0
   - with-location ==0.1.0
   - withdependencies ==0.2.4
   - witherable ==0.1.3.3
+  - witness ==0.4
   - wizards ==1.0.2
   - wl-pprint ==1.2
+  - wl-pprint-annotated ==0.0.1.4
+  - wl-pprint-console ==0.1.0.1
   - wl-pprint-extras ==3.5.0.5
   - wl-pprint-terminfo ==3.7.1.4
   - wl-pprint-text ==1.1.1.0
   - word-trie ==0.3.0
+  - word24 ==2.0.1
   - word8 ==0.1.2
   - wordpass ==1.0.0.7
   - Workflow ==0.8.3
   - wrap ==0.0.0
-  - wreq ==0.4.1.0
+  - writer-cps-full ==0.1.0.0
+  - writer-cps-lens ==0.1.0.0
+  - writer-cps-morph ==0.1.0.1
   - writer-cps-mtl ==0.1.1.2
   - writer-cps-transformers ==0.1.1.2
   - wuss ==1.1.3
-  - X11 ==1.6.1.2
+  - X11 ==1.8
   - x509 ==1.6.5
   - x509-store ==1.6.2
   - x509-system ==1.6.4
@@ -1947,43 +2145,41 @@ default-package-overrides:
   - xenstore ==0.1.1
   - xhtml ==3000.2.1
   - xlsior ==0.1.0.1
-  - xlsx ==0.2.4
-  - xlsx-tabular ==0.1.0.1
+  - xlsx ==0.4.2
+  - xlsx-tabular ==0.2.2
   - xml ==1.3.14
-  - xml-conduit ==1.3.5
+  - xml-conduit ==1.4.0.3
   - xml-conduit-parse ==0.3.1.0
   - xml-conduit-writer ==0.1.1.1
   - xml-hamlet ==0.4.1
+  - xml-html-qq ==0.1.0.1
   - xml-lens ==0.1.6.3
+  - xml-picklers ==0.3.6
   - xml-to-json-fast ==2.0.0
   - xml-types ==0.3.6
   - xmlgen ==0.6.2.1
   - xmlhtml ==0.2.3.5
-  - xmonad ==0.12
+  - xmonad ==0.13
   - xss-sanitize ==0.3.5.7
   - yackage ==0.8.1
-  - yahoo-finance-api ==0.1.0.0
+  - yahoo-finance-api ==0.2.0.1
   - yaml ==0.8.21.2
   - Yampa ==0.10.5
   - YampaSynth ==0.2
-  - yarr ==1.4.0.2
   - yes-precure5-command ==5.5.3
   - yesod ==1.4.4
   - yesod-auth ==1.4.16
   - yesod-auth-account ==1.4.3
   - yesod-auth-basic ==0.1.0.2
-  - yesod-auth-hashdb ==1.5.1.3
-  - yesod-auth-oauth2 ==0.2.2
+  - yesod-auth-hashdb ==1.6.0.1
   - yesod-bin ==1.5.1
   - yesod-core ==1.4.31
   - yesod-eventsource ==1.4.0.1
   - yesod-fay ==0.8.0
-  - yesod-fb ==0.3.4
   - yesod-form ==1.4.10
   - yesod-form-richtext ==0.1.0.0
   - yesod-gitrepo ==0.2.1.0
   - yesod-gitrev ==0.1.0.0
-  - yesod-job-queue ==0.3.0.1
   - yesod-newsfeed ==1.6
   - yesod-persistent ==1.4.1.1
   - yesod-sitemap ==1.4.0.1
@@ -1992,21 +2188,30 @@ default-package-overrides:
   - yesod-table ==2.0.3
   - yesod-test ==1.5.4.1
   - yesod-websockets ==0.2.5
-  - yi ==0.12.6
-  - yi-fuzzy-open ==0.1.0.1
-  - yi-language ==0.2.1
-  - yi-rope ==0.7.0.2
+  - yi-core ==0.13.5
+  - yi-frontend-vty ==0.13.5
+  - yi-fuzzy-open ==0.13.5
+  - yi-ireader ==0.13.5
+  - yi-keymap-cua ==0.13.5
+  - yi-keymap-emacs ==0.13.5
+  - yi-keymap-vim ==0.13.5
+  - yi-language ==0.13.5
+  - yi-misc-modes ==0.13.5
+  - yi-mode-haskell ==0.13.5
+  - yi-mode-javascript ==0.13.5
+  - yi-rope ==0.8
+  - yi-snippet ==0.13.5
   - yjtools ==0.9.18
   - zero ==0.1.4
   - zeromq4-haskell ==0.6.5
-  - zip ==0.1.5
+  - zip ==0.1.7
   - zip-archive ==0.3.0.5
   - zippers ==0.2.2
   - zlib ==0.6.1.2
   - zlib-bindings ==0.1.1.5
   - zlib-lens ==0.1.2.1
-  - zoom-refs ==0.0.0.1
   - zot ==0.0.3
+  - ztail ==1.2
 
 extra-packages:
   - aeson < 0.8                         # newer versions don't work with GHC 6.12.3
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index cdf68fd0d0d..07e1d55a1ae 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -679,54 +679,6 @@ self: {
      }) {};
 
   "Agda" = callPackage
-    ({ mkDerivation, alex, array, base, binary, boxes, bytestring
-     , containers, cpphs, data-hash, deepseq, directory, EdisonAPI
-     , EdisonCore, edit-distance, emacs, equivalence, filemanip
-     , filepath, geniplate-mirror, happy, hashable, hashtables
-     , haskeline, haskell-src-exts, monadplus, mtl, parallel, pretty
-     , process, QuickCheck, strict, template-haskell, text, time
-     , transformers, transformers-compat, unordered-containers, xhtml
-     , zlib
-     }:
-     mkDerivation {
-       pname = "Agda";
-       version = "2.5.1.1";
-       sha256 = "563b8063fc94349b56ae1867e973f1751db0e9a8997af7ede93d3c3a8c66a6b0";
-       revision = "1";
-       editedCabalFile = "388327fd9b4f98671a05ba6aa873d8161133d71e6234fcdb208882eda9fd161b";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base binary boxes bytestring containers data-hash deepseq
-         directory EdisonAPI EdisonCore edit-distance equivalence filepath
-         geniplate-mirror hashable hashtables haskeline haskell-src-exts
-         monadplus mtl parallel pretty process QuickCheck strict
-         template-haskell text time transformers transformers-compat
-         unordered-containers xhtml zlib
-       ];
-       libraryToolDepends = [ alex cpphs happy ];
-       executableHaskellDepends = [
-         base binary containers directory filemanip filepath
-         haskell-src-exts mtl process
-       ];
-       executableToolDepends = [ emacs ];
-       postInstall = ''
-         files=("$out/share/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda})
-         for f in "''${files[@]}" ; do
-           $out/bin/agda $f
-         done
-         for f in "''${files[@]}" ; do
-           $out/bin/agda -c --no-main $f
-         done
-         $out/bin/agda-mode compile
-       '';
-       homepage = "http://wiki.portal.chalmers.se/agda/";
-       description = "A dependently typed functional programming language and proof assistant";
-       license = "unknown";
-       maintainers = with stdenv.lib.maintainers; [ abbradar ];
-     }) {inherit (pkgs) emacs;};
-
-  "Agda_2_5_2" = callPackage
     ({ mkDerivation, alex, array, base, binary, boxes, bytestring
      , containers, cpphs, data-hash, deepseq, directory, EdisonCore
      , edit-distance, emacs, equivalence, filepath, geniplate-mirror
@@ -767,7 +719,6 @@ self: {
        homepage = "http://wiki.portal.chalmers.se/agda/";
        description = "A dependently typed functional programming language and proof assistant";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ abbradar ];
      }) {inherit (pkgs) emacs;};
 
@@ -2559,6 +2510,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Chart_1_8_2" = callPackage
+    ({ mkDerivation, array, base, colour, data-default-class, lens, mtl
+     , old-locale, operational, time, vector
+     }:
+     mkDerivation {
+       pname = "Chart";
+       version = "1.8.2";
+       sha256 = "8442c16959e2a46355418b82c0c6fc3174d04b41ea6e2e320c56588a563be28d";
+       libraryHaskellDepends = [
+         array base colour data-default-class lens mtl old-locale
+         operational time vector
+       ];
+       homepage = "https://github.com/timbod7/haskell-chart/wiki";
+       description = "A library for generating 2D Charts and Plots";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Chart-cairo" = callPackage
     ({ mkDerivation, array, base, cairo, Chart, colour
      , data-default-class, lens, mtl, old-locale, operational, time
@@ -2576,6 +2545,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Chart-cairo_1_8_2" = callPackage
+    ({ mkDerivation, array, base, cairo, Chart, colour
+     , data-default-class, lens, mtl, old-locale, operational, time
+     }:
+     mkDerivation {
+       pname = "Chart-cairo";
+       version = "1.8.2";
+       sha256 = "7cd8ba9da4c43ff4d6ba468d65e91b7239a0543038996a9a626818dc1a408fc1";
+       libraryHaskellDepends = [
+         array base cairo Chart colour data-default-class lens mtl
+         old-locale operational time
+       ];
+       homepage = "https://github.com/timbod7/haskell-chart/wiki";
+       description = "Cairo backend for Charts";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Chart-diagrams" = callPackage
     ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour
      , containers, data-default-class, diagrams-core, diagrams-lib
@@ -2597,14 +2584,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Chart-diagrams_1_8_2" = callPackage
+    ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour
+     , containers, data-default-class, diagrams-core, diagrams-lib
+     , diagrams-postscript, diagrams-svg, lens, mtl, old-locale
+     , operational, svg-builder, SVGFonts, text, time
+     }:
+     mkDerivation {
+       pname = "Chart-diagrams";
+       version = "1.8.2";
+       sha256 = "ca181dec04bac1029101dd75951f48710ebc42f5333e06c57943e3245bba9f41";
+       libraryHaskellDepends = [
+         base blaze-markup bytestring Chart colour containers
+         data-default-class diagrams-core diagrams-lib diagrams-postscript
+         diagrams-svg lens mtl old-locale operational svg-builder SVGFonts
+         text time
+       ];
+       homepage = "https://github.com/timbod7/haskell-chart/wiki";
+       description = "Diagrams backend for Charts";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Chart-gtk" = callPackage
     ({ mkDerivation, array, base, cairo, Chart, Chart-cairo, colour
      , data-default-class, gtk, mtl, old-locale, time
      }:
      mkDerivation {
        pname = "Chart-gtk";
-       version = "1.8.1";
-       sha256 = "964a8dd5b23d86f4a0d91fde5d1144fba8dd29d2810a05864ce0e795c2f7056a";
+       version = "1.8.2";
+       sha256 = "20c97819a35e0983af3e27e196c593e1bb1262f7dda86f4a874485e6042274c9";
        libraryHaskellDepends = [
          array base cairo Chart Chart-cairo colour data-default-class gtk
          mtl old-locale time
@@ -2771,38 +2780,20 @@ self: {
      }) {};
 
   "ClustalParser" = callPackage
-    ({ mkDerivation, base, cmdargs, either-unwrap, hspec, parsec
-     , vector
-     }:
-     mkDerivation {
-       pname = "ClustalParser";
-       version = "1.1.4";
-       sha256 = "d32db29dd58b9fe305b76dbdde6d0b2b328a526b63872e02177600f6832cc48f";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base parsec vector ];
-       executableHaskellDepends = [ base cmdargs either-unwrap ];
-       testHaskellDepends = [ base hspec parsec ];
-       description = "Libary for parsing Clustal tools output";
-       license = "GPL";
-     }) {};
-
-  "ClustalParser_1_2_0" = callPackage
     ({ mkDerivation, base, cmdargs, either-unwrap, hspec, parsec, text
      , vector
      }:
      mkDerivation {
        pname = "ClustalParser";
-       version = "1.2.0";
-       sha256 = "e444b4780a976d13178ba0d47d34ff1c7e1222077d2ec6c81f4370dce58a8ec8";
+       version = "1.2.1";
+       sha256 = "0034a9fdca3e4bcb70edb961536ee4acb162fec0ab1b2c67108598bfcd75879d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base parsec text vector ];
        executableHaskellDepends = [ base cmdargs either-unwrap ];
-       testHaskellDepends = [ base hspec parsec ];
+       testHaskellDepends = [ base hspec parsec text ];
        description = "Libary for parsing Clustal tools output";
-       license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = stdenv.lib.licenses.gpl3;
      }) {};
 
   "Coadjute" = callPackage
@@ -4420,6 +4411,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Earley_0_12_0_0" = callPackage
+    ({ mkDerivation, base, ListLike, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "Earley";
+       version = "0.12.0.0";
+       sha256 = "98657d247c04f7f37dc3b7e03a9bf6c0ea20e945ddac0aa0406ba7c464723337";
+       libraryHaskellDepends = [ base ListLike ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "Parsing all context-free grammars using Earley's algorithm";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Ebnf2ps" = callPackage
     ({ mkDerivation, array, base, containers, directory, happy
      , old-time, unix
@@ -8254,19 +8262,6 @@ self: {
      }) {};
 
   "HUnit" = callPackage
-    ({ mkDerivation, base, deepseq, filepath }:
-     mkDerivation {
-       pname = "HUnit";
-       version = "1.3.1.2";
-       sha256 = "badebf99ae5a4982cdf2f8932f080e349240dc2b75c40e75ce2518ea086c5381";
-       libraryHaskellDepends = [ base deepseq ];
-       testHaskellDepends = [ base deepseq filepath ];
-       homepage = "https://github.com/hspec/HUnit#readme";
-       description = "A unit testing framework for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "HUnit_1_5_0_0" = callPackage
     ({ mkDerivation, base, call-stack, deepseq, filepath }:
      mkDerivation {
        pname = "HUnit";
@@ -8277,7 +8272,6 @@ self: {
        homepage = "https://github.com/hspec/HUnit#readme";
        description = "A unit testing framework for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HUnit-Diff" = callPackage
@@ -8316,19 +8310,6 @@ self: {
      }) {};
 
   "HUnit-approx" = callPackage
-    ({ mkDerivation, base, HUnit }:
-     mkDerivation {
-       pname = "HUnit-approx";
-       version = "1.0";
-       sha256 = "618f492b3f55d7a2c332d2e3916b2cd79af1229421ad64e12a514babd896736b";
-       libraryHaskellDepends = [ base HUnit ];
-       testHaskellDepends = [ base HUnit ];
-       homepage = "https://github.com/goldfirere/HUnit-approx";
-       description = "Approximate equality for floating point numbers with HUnit";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "HUnit-approx_1_1" = callPackage
     ({ mkDerivation, base, HUnit }:
      mkDerivation {
        pname = "HUnit-approx";
@@ -8339,7 +8320,6 @@ self: {
        homepage = "https://github.com/goldfirere/HUnit-approx";
        description = "Approximate equality for floating point numbers with HUnit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HXMPP" = callPackage
@@ -8389,16 +8369,16 @@ self: {
      }) {};
 
   "HaLeX" = callPackage
-    ({ mkDerivation, base, mtl }:
+    ({ mkDerivation, base, HUnit, mtl, QuickCheck }:
      mkDerivation {
        pname = "HaLeX";
-       version = "1.2.2";
-       sha256 = "8b21e5a3c5ff7f2d195f667ae4892ffcdc626fa32ff3e22c1fb0f5b5676b9c95";
+       version = "1.2.6";
+       sha256 = "5b4e22ecf647362f9d3f1908e9c211f34539c037881701f01b02414130fb7dd7";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base mtl ];
+       libraryHaskellDepends = [ base HUnit mtl QuickCheck ];
        homepage = "http://www.di.uminho.pt/~jas/Research/HaLeX/HaLeX.html";
-       description = "HaLeX enables modelling, manipulation and animation of regular languages";
+       description = "HaLeX enables modelling, manipulation and visualization of regular languages";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
@@ -8429,43 +8409,33 @@ self: {
      }) {};
 
   "HaRe" = callPackage
-    ({ mkDerivation, array, base, Cabal, cabal-helper, containers
-     , deepseq, Diff, directory, filepath, ghc, ghc-exactprint, ghc-mod
-     , ghc-paths, ghc-prim, ghc-syb-utils, gitrev, hslogger, hspec
-     , HUnit, monad-control, monoid-extras, mtl, old-time
-     , optparse-applicative, optparse-simple, parsec, pretty, process
-     , QuickCheck, rosezipper, semigroups, silently
-     , Strafunski-StrategyLib, stringbuilder, syb, syz, time
-     , transformers, transformers-base
+    ({ mkDerivation, attoparsec, base, base-prelude, Cabal
+     , cabal-helper, case-insensitive, containers, conversion
+     , conversion-case-insensitive, conversion-text, Diff, directory
+     , filepath, foldl, ghc, ghc-exactprint, ghc-mod, ghc-syb-utils
+     , gitrev, hslogger, hspec, HUnit, monad-control, mtl
+     , optparse-applicative, optparse-simple, parsec
+     , Strafunski-StrategyLib, syb, syz, turtle
      }:
      mkDerivation {
        pname = "HaRe";
-       version = "0.8.3.0";
-       sha256 = "11e302f5379fe88aa8740a886f321e3e14c29b0b39417ab0621f3a070c1edcd2";
+       version = "0.8.4.0";
+       sha256 = "733272478f0aa195c86a344b548bdfdc453c41eaf5b9bc482e5a8fa8f81615fb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base Cabal cabal-helper containers directory filepath ghc
-         ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils hslogger
-         monad-control monoid-extras mtl old-time pretty rosezipper
-         semigroups Strafunski-StrategyLib syb syz time transformers
-         transformers-base
+         base cabal-helper containers directory filepath ghc ghc-exactprint
+         ghc-mod ghc-syb-utils hslogger monad-control mtl
+         Strafunski-StrategyLib syb syz
        ];
        executableHaskellDepends = [
-         array base Cabal cabal-helper containers directory filepath ghc
-         ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils gitrev
-         hslogger monad-control monoid-extras mtl old-time
-         optparse-applicative optparse-simple parsec pretty rosezipper
-         semigroups Strafunski-StrategyLib syb syz time transformers
-         transformers-base
+         base Cabal ghc-mod gitrev mtl optparse-applicative optparse-simple
        ];
        testHaskellDepends = [
-         base Cabal cabal-helper containers deepseq Diff directory filepath
-         ghc ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils
-         hslogger hspec HUnit monad-control monoid-extras mtl old-time
-         process QuickCheck rosezipper semigroups silently
-         Strafunski-StrategyLib stringbuilder syb syz time transformers
-         transformers-base
+         attoparsec base base-prelude case-insensitive containers conversion
+         conversion-case-insensitive conversion-text Diff directory foldl
+         ghc ghc-exactprint ghc-mod ghc-syb-utils hslogger hspec HUnit mtl
+         parsec turtle
        ];
        homepage = "https://github.com/RefactoringTools/HaRe/wiki";
        description = "the Haskell Refactorer";
@@ -10065,6 +10035,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Jdh" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "Jdh";
+       version = "0.1.0.0";
+       sha256 = "df460a97cde668b6d170ddcbfe547e146de56524108a4e811c6ca7bb26b4e864";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/brunoczim/Json-Data-for-Haskell";
+       description = "A Json implementation for Haskell, with JavaScript Values and Encoding/Decoding";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "JsContracts" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, mtl, parsec
      , pretty, syb, WebBits, WebBits-Html
@@ -11194,8 +11176,8 @@ self: {
     ({ mkDerivation, base, bytestring, hidapi, mtl }:
      mkDerivation {
        pname = "MBot";
-       version = "0.1.1.0";
-       sha256 = "6752fb112e01c02273ef55254b0f9cb16bbff4954592372ba9c152d9cb41dc12";
+       version = "0.1.2.0";
+       sha256 = "5edf898d58cfd9fbe4774993db794967e0af4c4202c8e43c788c05ef90a2f223";
        libraryHaskellDepends = [ base bytestring hidapi mtl ];
        description = "Haskell interface for controlling the mBot educational robot";
        license = stdenv.lib.licenses.gpl3;
@@ -11445,20 +11427,6 @@ self: {
      }) {};
 
   "MemoTrie" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "MemoTrie";
-       version = "0.6.4";
-       sha256 = "4238c8f7ea1ecd2497d0a948493acbdc47728b2528b6e7841ef064b783d68b1c";
-       revision = "1";
-       editedCabalFile = "035cea173a56cf920ebb4c84b4033d2ea270c1ee24d07ad323b9b2701ebc72e7";
-       libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/conal/MemoTrie";
-       description = "Trie-based memo functions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "MemoTrie_0_6_7" = callPackage
     ({ mkDerivation, base, newtype-generics }:
      mkDerivation {
        pname = "MemoTrie";
@@ -11468,7 +11436,6 @@ self: {
        homepage = "https://github.com/conal/MemoTrie";
        description = "Trie-based memo functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MetaHDBC" = callPackage
@@ -11801,34 +11768,18 @@ self: {
      }) {};
 
   "MonadRandom" = callPackage
-    ({ mkDerivation, base, mtl, random, transformers
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "MonadRandom";
-       version = "0.4.2.3";
-       sha256 = "de40b12a70ec6425a9e54b33e2ac652e14d7c005a3b46d701d1e5696b98636c0";
-       libraryHaskellDepends = [
-         base mtl random transformers transformers-compat
-       ];
-       description = "Random-number generation monad";
-       license = "unknown";
-     }) {};
-
-  "MonadRandom_0_5" = callPackage
     ({ mkDerivation, base, fail, mtl, primitive, random, transformers
      , transformers-compat
      }:
      mkDerivation {
        pname = "MonadRandom";
-       version = "0.5";
-       sha256 = "e239800faed1142b348d1125232ee1266209865ff6aa09516d4d516bec88c3dc";
+       version = "0.5.1";
+       sha256 = "9e3f0f92807285302036dc504066ae6d968c8b0b4c25d9360888f31fe1730d87";
        libraryHaskellDepends = [
          base fail mtl primitive random transformers transformers-compat
        ];
        description = "Random-number generation monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MonadRandomLazy" = callPackage
@@ -14083,25 +14034,6 @@ self: {
      }) {};
 
   "QuickCheck" = callPackage
-    ({ mkDerivation, base, containers, random, template-haskell
-     , test-framework, tf-random, transformers
-     }:
-     mkDerivation {
-       pname = "QuickCheck";
-       version = "2.8.2";
-       sha256 = "98c64de1e2dbf801c54dcdcb8ddc33b3569e0da38b39d711ee6ac505769926aa";
-       libraryHaskellDepends = [
-         base containers random template-haskell tf-random transformers
-       ];
-       testHaskellDepends = [
-         base containers template-haskell test-framework
-       ];
-       homepage = "https://github.com/nick8325/quickcheck";
-       description = "Automatic testing of Haskell programs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "QuickCheck_2_9_2" = callPackage
     ({ mkDerivation, base, containers, random, template-haskell
      , test-framework, tf-random, transformers
      }:
@@ -14118,7 +14050,6 @@ self: {
        homepage = "https://github.com/nick8325/quickcheck";
        description = "Automatic testing of Haskell programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "QuickCheck-GenT" = callPackage
@@ -14417,8 +14348,8 @@ self: {
      }:
      mkDerivation {
        pname = "RNAlien";
-       version = "1.3.0";
-       sha256 = "43d4b160cab7a7c39e4c21744637752beb527ebcb9f12ca674c18fb84135dfab";
+       version = "1.3.1";
+       sha256 = "2e928bb739cba57427fc3a24780b8b36c8eaf6a709e72dadfc637aab0a862fb3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -14607,22 +14538,6 @@ self: {
      }) {};
 
   "Rasterific" = callPackage
-    ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
-     , free, JuicyPixels, mtl, primitive, vector, vector-algorithms
-     }:
-     mkDerivation {
-       pname = "Rasterific";
-       version = "0.6.1.1";
-       sha256 = "1887b28b9921dfb2d4d64cb888e5febce17db828103a7e2aed0a978d9fa78665";
-       libraryHaskellDepends = [
-         base bytestring containers dlist FontyFruity free JuicyPixels mtl
-         primitive vector vector-algorithms
-       ];
-       description = "A pure haskell drawing engine";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Rasterific_0_7_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
      , free, JuicyPixels, mtl, primitive, transformers, vector
      , vector-algorithms
@@ -14639,7 +14554,6 @@ self: {
        ];
        description = "A pure haskell drawing engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ReadArgs" = callPackage
@@ -14703,8 +14617,8 @@ self: {
      }:
      mkDerivation {
        pname = "RefSerialize";
-       version = "0.3.1.4";
-       sha256 = "dc38719d34a5e238dc7cda731f49a5367fc5a0bf7d4b1db44be5e2ac5a9781c2";
+       version = "0.4.0";
+       sha256 = "05b25eb1ab943d96119aa2acca678fc8f194c3411af521e3835f4de5c752bbb2";
        libraryHaskellDepends = [
          base binary bytestring containers hashtables stringsearch
        ];
@@ -15183,27 +15097,14 @@ self: {
     ({ mkDerivation, array, base, Cabal, mtl }:
      mkDerivation {
        pname = "STMonadTrans";
-       version = "0.3.4";
-       sha256 = "44935ff710369da1614e00a40dabea6ba3a4dd02959d7b0e5ed17a915c3f0210";
+       version = "0.4.3";
+       sha256 = "574fd56cf74036c20d00a09d815659dbbb0ae51c8103d00c93cd9558ad3322db";
        libraryHaskellDepends = [ array base mtl ];
        testHaskellDepends = [ array base Cabal mtl ];
        description = "A monad transformer version of the ST monad";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "STMonadTrans_0_4" = callPackage
-    ({ mkDerivation, array, base, Cabal, mtl }:
-     mkDerivation {
-       pname = "STMonadTrans";
-       version = "0.4";
-       sha256 = "518667c253184c8c5cf707564d117f67bb0fabf5f6ebe8b25400359d4a8a6200";
-       libraryHaskellDepends = [ array base mtl ];
-       testHaskellDepends = [ array base Cabal mtl ];
-       description = "A monad transformer version of the ST monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "SVG2Q" = callPackage
     ({ mkDerivation, base, haskell98, language-c, pretty, svgutils, syb
      , xml
@@ -15224,24 +15125,6 @@ self: {
      }) {};
 
   "SVGFonts" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg
-     , containers, data-default-class, diagrams-core, diagrams-lib
-     , directory, parsec, split, text, tuple, vector, xml
-     }:
-     mkDerivation {
-       pname = "SVGFonts";
-       version = "1.5.0.1";
-       sha256 = "7b3431a70f94e89e78e1e28c5730060c5af522526ac7a1318b51de2c4d4c4ef4";
-       libraryHaskellDepends = [
-         attoparsec base blaze-markup blaze-svg containers
-         data-default-class diagrams-core diagrams-lib directory parsec
-         split text tuple vector xml
-       ];
-       description = "Fonts from the SVG-Font format";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "SVGFonts_1_6_0_1" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg
      , bytestring, cereal, cereal-vector, containers, data-default-class
      , diagrams-core, diagrams-lib, directory, parsec, split, text
@@ -15258,7 +15141,6 @@ self: {
        ];
        description = "Fonts from the SVG-Font format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SVGPath" = callPackage
@@ -15974,18 +15856,6 @@ self: {
      }) {};
 
   "Spintax" = callPackage
-    ({ mkDerivation, attoparsec, base, extra, mwc-random, text }:
-     mkDerivation {
-       pname = "Spintax";
-       version = "0.1.0.1";
-       sha256 = "bf749b240dcec32068ca1b94f34bfd824722f57c63c0c81473fd8ff88533dfe7";
-       libraryHaskellDepends = [ attoparsec base extra mwc-random text ];
-       homepage = "https://github.com/MichelBoucey/spintax";
-       description = "Random text generation based on spintax";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Spintax_0_3_1" = callPackage
     ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }:
      mkDerivation {
        pname = "Spintax";
@@ -15997,38 +15867,9 @@ self: {
        homepage = "https://github.com/MichelBoucey/spintax";
        description = "Random text generation based on spintax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Spock" = callPackage
-    ({ mkDerivation, base, base64-bytestring, bytestring, containers
-     , cryptonite, focus, hashable, hspec, hspec-wai, http-types, hvect
-     , list-t, monad-control, mtl, reroute, resource-pool, resourcet
-     , Spock-core, stm, stm-containers, text, time, transformers
-     , transformers-base, unordered-containers, vault, wai, wai-extra
-     }:
-     mkDerivation {
-       pname = "Spock";
-       version = "0.11.0.0";
-       sha256 = "9dcc232e83860d28f44bd4f35a8b38e59330ada78a30c661aaddf244f4a5deb3";
-       revision = "1";
-       editedCabalFile = "22e12daad61dfaeefdbad563859bf8efe1ee38cf0be49cb18e954227d7e76eac";
-       libraryHaskellDepends = [
-         base base64-bytestring bytestring containers cryptonite focus
-         hashable http-types hvect list-t monad-control mtl reroute
-         resource-pool resourcet Spock-core stm stm-containers text time
-         transformers transformers-base unordered-containers vault wai
-       ];
-       testHaskellDepends = [
-         base bytestring hspec hspec-wai Spock-core stm text time
-         unordered-containers vault wai wai-extra
-       ];
-       homepage = "https://www.spock.li";
-       description = "Another Haskell web framework for rapid development";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Spock_0_12_0_0" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, containers
      , cryptonite, focus, hashable, hspec, hspec-wai, http-types, hvect
      , list-t, monad-control, mtl, reroute, resource-pool, resourcet
@@ -16052,22 +15893,9 @@ self: {
        homepage = "https://www.spock.li";
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Spock-api" = callPackage
-    ({ mkDerivation, aeson, base, deepseq, hvect, reroute }:
-     mkDerivation {
-       pname = "Spock-api";
-       version = "0.11.0.0";
-       sha256 = "993272b289d95f2e7e704b24d8297b63257b1434ec205faddf8a2ec7bc1aea29";
-       libraryHaskellDepends = [ aeson base deepseq hvect reroute ];
-       homepage = "https://www.spock.li";
-       description = "Another Haskell web framework for rapid development";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Spock-api_0_12_0_0" = callPackage
     ({ mkDerivation, aeson, base, deepseq, hvect, reroute }:
      mkDerivation {
        pname = "Spock-api";
@@ -16077,7 +15905,6 @@ self: {
        homepage = "https://www.spock.li";
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Spock-api-ghcjs" = callPackage
@@ -16098,18 +15925,6 @@ self: {
      }) {};
 
   "Spock-api-server" = callPackage
-    ({ mkDerivation, base, hvect, mtl, Spock-api, Spock-core }:
-     mkDerivation {
-       pname = "Spock-api-server";
-       version = "0.11.0.0";
-       sha256 = "35d0fd72caed2bd4e2cc52d2a39b3af528845ec9bc58cf64dfe4b6ccd956ac3d";
-       libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ];
-       homepage = "https://www.spock.li";
-       description = "Another Haskell web framework for rapid development";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Spock-api-server_0_12_0_0" = callPackage
     ({ mkDerivation, base, hvect, mtl, Spock-api, Spock-core }:
      mkDerivation {
        pname = "Spock-api-server";
@@ -16119,7 +15934,6 @@ self: {
        homepage = "https://www.spock.li";
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Spock-auth" = callPackage
@@ -16136,32 +15950,6 @@ self: {
      }) {};
 
   "Spock-core" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
-     , case-insensitive, containers, cookie, directory, hashable, hspec
-     , hspec-wai, http-types, hvect, mtl, old-locale, path-pieces
-     , reroute, resourcet, stm, text, time, transformers
-     , unordered-containers, vault, wai, wai-extra, warp
-     }:
-     mkDerivation {
-       pname = "Spock-core";
-       version = "0.11.0.0";
-       sha256 = "d6339c4b8e5ac3a98e5545e3f4c64f1ff515c125ae9fb33d2176972e1244aa9a";
-       libraryHaskellDepends = [
-         aeson base base64-bytestring bytestring case-insensitive containers
-         cookie directory hashable http-types hvect mtl old-locale
-         path-pieces reroute resourcet stm text time transformers
-         unordered-containers vault wai wai-extra warp
-       ];
-       testHaskellDepends = [
-         base base64-bytestring bytestring hspec hspec-wai http-types
-         reroute text time transformers unordered-containers wai
-       ];
-       homepage = "https://www.spock.li";
-       description = "Another Haskell web framework for rapid development";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Spock-core_0_12_0_0" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , case-insensitive, containers, cookie, directory, hashable, hspec
      , hspec-wai, http-api-data, http-types, hvect, mtl, old-locale
@@ -16185,7 +15973,6 @@ self: {
        homepage = "https://www.spock.li";
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Spock-digestive" = callPackage
@@ -16600,6 +16387,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "TCache_0_12_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory
+     , hashtables, mtl, old-time, RefSerialize, stm, text
+     }:
+     mkDerivation {
+       pname = "TCache";
+       version = "0.12.1";
+       sha256 = "f134b45fcdd127fa1a4214f01d44dc34e994fed137cec63f4c4ea632363ab7bd";
+       libraryHaskellDepends = [
+         base bytestring containers directory hashtables mtl old-time
+         RefSerialize stm text
+       ];
+       description = "A Transactional cache with user-defined persistence";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "THEff" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -17591,18 +17395,6 @@ self: {
      }) {};
 
   "ViennaRNAParser" = callPackage
-    ({ mkDerivation, base, hspec, parsec, process, transformers }:
-     mkDerivation {
-       pname = "ViennaRNAParser";
-       version = "1.2.9";
-       sha256 = "f4e8964ce0710a0461d49e790784a8b82579f4c6079c5732b7fe1ae09fefb219";
-       libraryHaskellDepends = [ base parsec process transformers ];
-       testHaskellDepends = [ base hspec parsec ];
-       description = "Libary for parsing ViennaRNA package output";
-       license = "GPL";
-     }) {};
-
-  "ViennaRNAParser_1_3_2" = callPackage
     ({ mkDerivation, base, hspec, parsec, ParsecTools, process
      , transformers
      }:
@@ -17616,7 +17408,6 @@ self: {
        testHaskellDepends = [ base hspec parsec ];
        description = "Libary for parsing ViennaRNA package output";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Vulkan" = callPackage
@@ -17942,14 +17733,14 @@ self: {
      }) {advapi32 = null; gdi32 = null; shell32 = null; 
          shfolder = null; user32 = null; winmm = null;};
 
-  "Win32_2_5_0_0" = callPackage
+  "Win32_2_5_1_0" = callPackage
     ({ mkDerivation, advapi32, base, bytestring, filepath, gdi32, imm32
      , msimg32, ntdll, shell32, shfolder, shlwapi, user32, winmm
      }:
      mkDerivation {
        pname = "Win32";
-       version = "2.5.0.0";
-       sha256 = "45d7fd5f251ba418d649100cfea9d924b7ef42a8c35df5bb373fd6dd687d2694";
+       version = "2.5.1.0";
+       sha256 = "84e1b1ee7e435ad4237d2f625114f205141988b964f42259b5e294066f31ca52";
        libraryHaskellDepends = [ base bytestring filepath ];
        librarySystemDepends = [
          advapi32 gdi32 imm32 msimg32 ntdll shell32 shfolder shlwapi user32
@@ -18236,27 +18027,8 @@ self: {
      }:
      mkDerivation {
        pname = "X11";
-       version = "1.6.1.2";
-       sha256 = "5216d485f807bd53bf34fba170896a8930290a6ac28b8e611c28e751ad67f2cf";
-       libraryHaskellDepends = [ base data-default ];
-       librarySystemDepends = [
-         libX11 libXext libXinerama libXrandr libXrender
-       ];
-       homepage = "https://github.com/haskell-pkg-janitors/X11";
-       description = "A binding to the X11 graphics library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXext; 
-         inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; 
-         inherit (pkgs.xorg) libXrender;};
-
-  "X11_1_7" = callPackage
-    ({ mkDerivation, base, data-default, libX11, libXext, libXinerama
-     , libXrandr, libXrender
-     }:
-     mkDerivation {
-       pname = "X11";
-       version = "1.7";
-       sha256 = "9e7a67b9521fc0140b4804928f3821b6c3d3950fdc1d9c55478844dc4f57f5f4";
+       version = "1.8";
+       sha256 = "541b166aab1e05a92dc8f42a511d827e7aad373af12ae283b9df9982ccc09d8e";
        libraryHaskellDepends = [ base data-default ];
        librarySystemDepends = [
          libX11 libXext libXinerama libXrandr libXrender
@@ -18264,7 +18036,6 @@ self: {
        homepage = "https://github.com/xmonad/X11";
        description = "A binding to the X11 graphics library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXext; 
          inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; 
          inherit (pkgs.xorg) libXrender;};
@@ -19940,24 +19711,6 @@ self: {
      }) {};
 
   "active" = callPackage
-    ({ mkDerivation, base, lens, linear, QuickCheck, semigroupoids
-     , semigroups, vector
-     }:
-     mkDerivation {
-       pname = "active";
-       version = "0.2.0.10";
-       sha256 = "0819b0ae7a690bba42f974ba3d1efb1b356919e0f9e278cb30653d022bce78b1";
-       libraryHaskellDepends = [
-         base lens linear semigroupoids semigroups vector
-       ];
-       testHaskellDepends = [
-         base lens linear QuickCheck semigroupoids semigroups vector
-       ];
-       description = "Abstractions for animation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "active_0_2_0_12" = callPackage
     ({ mkDerivation, base, lens, linear, QuickCheck, semigroupoids
      , semigroups, vector
      }:
@@ -19973,7 +19726,6 @@ self: {
        ];
        description = "Abstractions for animation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "activehs" = callPackage
@@ -20301,34 +20053,6 @@ self: {
      }) {};
 
   "aeson" = callPackage
-    ({ mkDerivation, attoparsec, base, base-orphans, bytestring
-     , containers, deepseq, dlist, fail, ghc-prim, hashable, HUnit, mtl
-     , QuickCheck, quickcheck-instances, scientific, syb, tagged
-     , template-haskell, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, time, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "aeson";
-       version = "0.11.3.0";
-       sha256 = "f326fac57881c228d91f610a2c92f083a60e3830d9c7d35dfb0a16925c95ece9";
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers deepseq dlist fail ghc-prim
-         hashable mtl scientific syb tagged template-haskell text time
-         transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         attoparsec base base-orphans bytestring containers ghc-prim
-         hashable HUnit QuickCheck quickcheck-instances tagged
-         template-haskell test-framework test-framework-hunit
-         test-framework-quickcheck2 text time unordered-containers vector
-       ];
-       homepage = "https://github.com/bos/aeson";
-       description = "Fast JSON parsing and encoding";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "aeson_1_0_2_1" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat, base-orphans
      , base16-bytestring, bytestring, containers, deepseq, dlist
      , generic-deriving, ghc-prim, hashable, hashable-time, HUnit
@@ -20357,7 +20081,6 @@ self: {
        homepage = "https://github.com/bos/aeson";
        description = "Fast JSON parsing and encoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson_1_1_0_0" = callPackage
@@ -21262,6 +20985,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "airtable-api" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, hashable, lens, text
+     , unordered-containers, wreq
+     }:
+     mkDerivation {
+       pname = "airtable-api";
+       version = "0.1.0.4";
+       sha256 = "049949b130b19ee06c638494c95ca9b55fe3c071079a490ae10f01430c04b0dd";
+       libraryHaskellDepends = [
+         aeson base bytestring hashable lens text unordered-containers wreq
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/ooblahman/airtable-api";
+       description = "Requesting and introspecting Tables within an Airtable project";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "aivika" = callPackage
     ({ mkDerivation, array, base, containers, mtl, random, vector }:
      mkDerivation {
@@ -21501,26 +21241,6 @@ self: {
      }) {};
 
   "alex" = callPackage
-    ({ mkDerivation, array, base, containers, directory, happy, process
-     , QuickCheck
-     }:
-     mkDerivation {
-       pname = "alex";
-       version = "3.1.7";
-       sha256 = "89a1a13da6ccbeb006488d9574382e891cf7c0567752b330cc8616d748bf28d1";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         array base containers directory QuickCheck
-       ];
-       executableToolDepends = [ happy ];
-       testHaskellDepends = [ base process ];
-       homepage = "http://www.haskell.org/alex/";
-       description = "Alex is a tool for generating lexical analysers in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "alex_3_2_1" = callPackage
     ({ mkDerivation, array, base, containers, directory, happy, process
      , QuickCheck
      }:
@@ -21538,7 +21258,6 @@ self: {
        homepage = "http://www.haskell.org/alex/";
        description = "Alex is a tool for generating lexical analysers in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alex-meta" = callPackage
@@ -22193,27 +21912,6 @@ self: {
      }) {};
 
   "amazonka" = callPackage
-    ({ mkDerivation, amazonka-core, base, bytestring, conduit
-     , conduit-extra, directory, exceptions, http-conduit, ini, mmorph
-     , monad-control, mtl, resourcet, retry, tasty, tasty-hunit, text
-     , time, transformers, transformers-base, transformers-compat
-     }:
-     mkDerivation {
-       pname = "amazonka";
-       version = "1.4.3";
-       sha256 = "18aa7816d755df58a824fc252d34cb1f81c6cba2ca2a7194c3a3f0d630c26686";
-       libraryHaskellDepends = [
-         amazonka-core base bytestring conduit conduit-extra directory
-         exceptions http-conduit ini mmorph monad-control mtl resourcet
-         retry text time transformers transformers-base transformers-compat
-       ];
-       testHaskellDepends = [ base tasty tasty-hunit ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Comprehensive Amazon Web Services SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, base, bytestring, conduit
      , conduit-extra, directory, exceptions, http-conduit, ini, mmorph
      , monad-control, mtl, resourcet, retry, tasty, tasty-hunit, text
@@ -22232,29 +21930,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Comprehensive Amazon Web Services SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-apigateway" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-apigateway";
-       version = "1.4.3";
-       sha256 = "74fe95daa465255ad2a49f3f0b78242c5e1ec33d81d0e9dfffa833324894d948";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon API Gateway SDK";
-       license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "amazonka-apigateway_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22274,24 +21952,6 @@ self: {
      }) {};
 
   "amazonka-application-autoscaling" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-application-autoscaling";
-       version = "1.4.3";
-       sha256 = "5506a59b594355ab0e78f3e1c0f550bd5b2a858c4a0688732a4931e6ac096f6c";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Application Auto Scaling SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-application-autoscaling_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22307,7 +21967,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Application Auto Scaling SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-appstream" = callPackage
@@ -22330,24 +21989,6 @@ self: {
      }) {};
 
   "amazonka-autoscaling" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-autoscaling";
-       version = "1.4.3";
-       sha256 = "4a47502b75b54cae3ab3da1792f5862a1e726e551d25bc0ba54f7854a66fa3df";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Auto Scaling SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-autoscaling_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22363,7 +22004,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Auto Scaling SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-budgets" = callPackage
@@ -22386,24 +22026,6 @@ self: {
      }) {};
 
   "amazonka-certificatemanager" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-certificatemanager";
-       version = "1.4.3";
-       sha256 = "d1228f95581d90f53a29dba53c1d7a1d0eb7439e278c4c5aca70af01f3e30d55";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Certificate Manager SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-certificatemanager_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22419,28 +22041,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Certificate Manager SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudformation" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-cloudformation";
-       version = "1.4.3";
-       sha256 = "3b2069debd35ddfd08af2281902d7c063b267fd2a23b71057321cd2e55cd7690";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon CloudFormation SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-cloudformation_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22456,28 +22059,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFormation SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudfront" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-cloudfront";
-       version = "1.4.3";
-       sha256 = "5241ccb0d39cc055f97eb6496835783a97de0ce0b33c765a1325d01119abecbe";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon CloudFront SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-cloudfront_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22493,28 +22077,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFront SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudhsm" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-cloudhsm";
-       version = "1.4.3";
-       sha256 = "6848989619b58c75fa1d72d122e96c621b881bf4c376b9325eeb54c8c3200c43";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon CloudHSM SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-cloudhsm_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22530,28 +22095,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudHSM SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudsearch" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-cloudsearch";
-       version = "1.4.3";
-       sha256 = "7126175d24355afa678c9dd59400fd1b1a40c18240d96de88bd831b0099c0c26";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon CloudSearch SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-cloudsearch_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22567,28 +22113,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudsearch-domains" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-cloudsearch-domains";
-       version = "1.4.3";
-       sha256 = "4416cb88845bd27c845ecac50029e7721f3d13d26d24ab6c9c571b5c2c543f7d";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon CloudSearch Domain SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-cloudsearch-domains_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22604,28 +22131,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch Domain SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudtrail" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-cloudtrail";
-       version = "1.4.3";
-       sha256 = "04ea4c78e0d73f71e1144eb5a357e1e6bce16109453ab30c31d8e7a9ae77fa6f";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon CloudTrail SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-cloudtrail_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22641,28 +22149,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudTrail SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudwatch" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-cloudwatch";
-       version = "1.4.3";
-       sha256 = "98df67a18bfdf4c00736f6be41576877f8191ac936ab2f5666b160cb80c22d5f";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon CloudWatch SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-cloudwatch_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22678,28 +22167,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudwatch-events" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-cloudwatch-events";
-       version = "1.4.3";
-       sha256 = "fb839e3e4c402151e138b1d69356600f2d378d53631a3616b6228f620713df56";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon CloudWatch Events SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-cloudwatch-events_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22715,28 +22185,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch Events SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudwatch-logs" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-cloudwatch-logs";
-       version = "1.4.3";
-       sha256 = "de201710b2d594519b1c9d8b20fab92e1a0f4e777e5c05ed1bd32c91ae260161";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon CloudWatch Logs SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-cloudwatch-logs_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22752,7 +22203,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch Logs SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-codebuild" = callPackage
@@ -22775,24 +22225,6 @@ self: {
      }) {};
 
   "amazonka-codecommit" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-codecommit";
-       version = "1.4.3";
-       sha256 = "fe8d033203bccb7c8c7242a063a814cdbb8a22fb4a95e5fa4f01b200d547966b";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon CodeCommit SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-codecommit_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22808,28 +22240,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodeCommit SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-codedeploy" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-codedeploy";
-       version = "1.4.3";
-       sha256 = "d216d3af7472428fecab9763e65e2f2ea412dfaaf8debbbe5e37ab158c5392d9";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon CodeDeploy SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-codedeploy_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22845,28 +22258,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodeDeploy SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-codepipeline" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-codepipeline";
-       version = "1.4.3";
-       sha256 = "2422824f998a0808151310c88c780bfa411a0f56966f93f614694f4dd526fdb1";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon CodePipeline SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-codepipeline_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22882,28 +22276,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodePipeline SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cognito-identity" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-cognito-identity";
-       version = "1.4.3";
-       sha256 = "a45aa18f815e75da5e928ec8dfe7ed827394b0b1f4654bf059fe1f3897bfb232";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Cognito Identity SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-cognito-identity_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22919,28 +22294,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Identity SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cognito-idp" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-cognito-idp";
-       version = "1.4.3";
-       sha256 = "a7c23b78acf5ca6701540bd74bb5e20b007acbce0bf97905083e2e5dcab940e2";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Cognito Identity Provider SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-cognito-idp_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22956,28 +22312,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Identity Provider SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cognito-sync" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-cognito-sync";
-       version = "1.4.3";
-       sha256 = "51a484d6dd44e9d6f9506bd8d97f04ccfa48a04e79aadb193b8644e17a696be7";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Cognito Sync SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-cognito-sync_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22993,28 +22330,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Sync SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-config" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-config";
-       version = "1.4.3";
-       sha256 = "d9c105b20e1269c55a59180ef61f040315643f873c0075b8b95e84723508e266";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Config SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-config_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23030,42 +22348,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Config SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-core" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
-     , case-insensitive, conduit, conduit-extra, cryptonite, deepseq
-     , exceptions, hashable, http-conduit, http-types, lens, memory, mtl
-     , QuickCheck, quickcheck-unicode, resourcet, scientific, semigroups
-     , tagged, tasty, tasty-hunit, tasty-quickcheck, template-haskell
-     , text, time, transformers, transformers-compat
-     , unordered-containers, xml-conduit, xml-types
-     }:
-     mkDerivation {
-       pname = "amazonka-core";
-       version = "1.4.3";
-       sha256 = "8270e26104bb0cbc7654d3522dce631c9804b433ec9ff5a2a0c7f844938eead0";
-       revision = "1";
-       editedCabalFile = "c2a93b788f323072f99ab6c120449c605f9249ba5e44d9e56221fa95b5254dba";
-       libraryHaskellDepends = [
-         aeson attoparsec base bifunctors bytestring case-insensitive
-         conduit conduit-extra cryptonite deepseq exceptions hashable
-         http-conduit http-types lens memory mtl resourcet scientific
-         semigroups tagged text time transformers transformers-compat
-         unordered-containers xml-conduit xml-types
-       ];
-       testHaskellDepends = [
-         aeson base bytestring case-insensitive http-types QuickCheck
-         quickcheck-unicode tasty tasty-hunit tasty-quickcheck
-         template-haskell text time
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Core data types and functionality for Amazonka libraries";
-       license = "unknown";
-     }) {};
-
-  "amazonka-core_1_4_5" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
      , case-insensitive, conduit, conduit-extra, cryptonite, deepseq
      , exceptions, hashable, http-conduit, http-types, lens, memory, mtl
@@ -23093,28 +22378,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Core data types and functionality for Amazonka libraries";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-datapipeline" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-datapipeline";
-       version = "1.4.3";
-       sha256 = "04bb3873f247a6fc75b5f0a7822e28c1d212765b7918d490474b6bb0faf3d781";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Data Pipeline SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-datapipeline_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23130,28 +22396,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Data Pipeline SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-devicefarm" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-devicefarm";
-       version = "1.4.3";
-       sha256 = "36ac89a5166ac8bf89d628b43ea7bd88e6624e9fedd6e7de2a7be5501a3d35cd";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Device Farm SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-devicefarm_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23167,28 +22414,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Device Farm SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-directconnect" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-directconnect";
-       version = "1.4.3";
-       sha256 = "96f67da0a8afb2013c84fc5650e700736711105b7924ce8f288f7f61ba133c7d";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Direct Connect SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-directconnect_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23204,28 +22432,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Direct Connect SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-discovery" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-discovery";
-       version = "1.4.3";
-       sha256 = "bfe7c0601d44ca07c28171cb1def3eec5297fa690e6d005edeed4659ec49365f";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Application Discovery Service SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-discovery_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23241,28 +22450,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Application Discovery Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-dms" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-dms";
-       version = "1.4.3";
-       sha256 = "1714e72bc22176cab07ab9932cec4050e816c450afc3bf6a2810f3318066f8ff";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Database Migration Service SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-dms_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23278,28 +22468,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Database Migration Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-ds" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-ds";
-       version = "1.4.3";
-       sha256 = "d3433eb5c52093f2274055595174bda99e32eb3a4c4760811c22f9c0bbcfe700";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Directory Service SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-ds_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23315,28 +22486,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Directory Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-dynamodb" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-dynamodb";
-       version = "1.4.3";
-       sha256 = "309d695e84fcf5fb2234031b5c650ae2d72ee9bb91bee1cc2522b95228e4d652";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon DynamoDB SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-dynamodb_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23352,28 +22504,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon DynamoDB SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-dynamodb-streams" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-dynamodb-streams";
-       version = "1.4.3";
-       sha256 = "61cc56bdbd831438d1daa1149106df1b1f5f0d8f6d8b20cbafcb4ad2869206c5";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon DynamoDB Streams SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-dynamodb-streams_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23389,28 +22522,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon DynamoDB Streams SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-ec2" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-ec2";
-       version = "1.4.3";
-       sha256 = "caeb98e701196d9350d44cd6b1f7b1f5790cc1c4bbbb30dd70824d025c7cc1b7";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Elastic Compute Cloud SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-ec2_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23426,28 +22540,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Compute Cloud SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-ecr" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-ecr";
-       version = "1.4.3";
-       sha256 = "e9c1475c8eb4b89cafc7df8f2e8d6c4cff16b349db5407d014ef49726d7b1861";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon EC2 Container Registry SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-ecr_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23463,28 +22558,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon EC2 Container Registry SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-ecs" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-ecs";
-       version = "1.4.3";
-       sha256 = "4c10a7da68605f7a9656714cb134cf47d920b2aa02f0c38e0c06f8ddf9152471";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon EC2 Container Service SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-ecs_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23500,28 +22576,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon EC2 Container Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-efs" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-efs";
-       version = "1.4.3";
-       sha256 = "c65054594451e774e1e9ad1fbfbf8a724dac86cbd4efa01aa5119d3d9f7a8301";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Elastic File System SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-efs_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23537,28 +22594,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic File System SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-elasticache" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-elasticache";
-       version = "1.4.3";
-       sha256 = "673912e1f5db5762dd00da1312cc09e2265da0ac6a35d92ee2bbb6e88230f879";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon ElastiCache SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-elasticache_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23574,28 +22612,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon ElastiCache SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-elasticbeanstalk" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-elasticbeanstalk";
-       version = "1.4.3";
-       sha256 = "675730e477fcf3926605dc42bf08f3fba48f7272cc63cb5c845bb16c296fbd9b";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Elastic Beanstalk SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-elasticbeanstalk_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23611,28 +22630,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Beanstalk SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-elasticsearch" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-elasticsearch";
-       version = "1.4.3";
-       sha256 = "9e7b1911946ce7a0df8c7ef13277f32a06a26e2a7a6334b3d1514cf089d014d5";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Elasticsearch Service SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-elasticsearch_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23648,28 +22648,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elasticsearch Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-elastictranscoder" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-elastictranscoder";
-       version = "1.4.3";
-       sha256 = "9a5d534e54f5421a37103b4117d07bcf16eb241a0bd153457037f1f83ccb8b2f";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Elastic Transcoder SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-elastictranscoder_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23685,28 +22666,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Transcoder SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-elb" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-elb";
-       version = "1.4.3";
-       sha256 = "81fae99dff50a8feb54150afdb5ef6a06b1be57b6d46957e37c503a730bd2d56";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Elastic Load Balancing SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-elb_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23722,7 +22684,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Load Balancing SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-elbv2" = callPackage
@@ -23745,24 +22706,6 @@ self: {
      }) {};
 
   "amazonka-emr" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-emr";
-       version = "1.4.3";
-       sha256 = "b31ab69a06ea6ba585a89c133a78ed0ea2cb89faa9e2a04b6d12228167fa8e75";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Elastic MapReduce SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-emr_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23778,28 +22721,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic MapReduce SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-gamelift" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-gamelift";
-       version = "1.4.3";
-       sha256 = "c7fa8f5e3d83a6c1b2848676e270534dac9c8084d702abcd2edc79b603766429";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon GameLift SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-gamelift_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23815,28 +22739,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon GameLift SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-glacier" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-glacier";
-       version = "1.4.3";
-       sha256 = "dddfa10e13eceba289a534fa6f7accd2969c8c6cc06b967e5bf35604c6738bec";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Glacier SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-glacier_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23852,7 +22757,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Glacier SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-health" = callPackage
@@ -23875,24 +22779,6 @@ self: {
      }) {};
 
   "amazonka-iam" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-iam";
-       version = "1.4.3";
-       sha256 = "4208dcc7e9f4a5c351246d4c33f7215079dad2325e0e894186284d86c8243734";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Identity and Access Management SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-iam_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23908,28 +22794,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Identity and Access Management SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-importexport" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-importexport";
-       version = "1.4.3";
-       sha256 = "ce555f40f865c0ef4680b6fd2344927f86f44bc04cb4f97d8bdd47c18de3ca64";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Import/Export SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-importexport_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23945,28 +22812,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Import/Export SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-inspector" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-inspector";
-       version = "1.4.3";
-       sha256 = "0f54b9b7c5bf3317390e86e3351806116fc55dce8614f26c79af7bfed1bf28c8";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Inspector SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-inspector_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23982,28 +22830,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Inspector SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-iot" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-iot";
-       version = "1.4.3";
-       sha256 = "4b9f17daddab2f04f60d84109e8c78077bd1feae610f0053fbe7edf0317c3e91";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon IoT SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-iot_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24019,28 +22848,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon IoT SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-iot-dataplane" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-iot-dataplane";
-       version = "1.4.3";
-       sha256 = "2c3ef08bc6a294591f029a7189a35acf5cbd9bc332f1f3f8f94cca0a8e9a5b96";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon IoT Data Plane SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-iot-dataplane_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24056,28 +22866,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon IoT Data Plane SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-kinesis" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-kinesis";
-       version = "1.4.3";
-       sha256 = "6b9f597488893470ef9914857ec3e593aea3a41b2c69794d95065ce3e332e812";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Kinesis SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-kinesis_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24093,7 +22884,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Kinesis SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-kinesis-analytics" = callPackage
@@ -24116,24 +22906,6 @@ self: {
      }) {};
 
   "amazonka-kinesis-firehose" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-kinesis-firehose";
-       version = "1.4.3";
-       sha256 = "2add7d8f8b27cbc339c473244007683d7ceab6caa00258c9030ed8983d16853a";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Kinesis Firehose SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-kinesis-firehose_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24149,28 +22921,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Kinesis Firehose SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-kms" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-kms";
-       version = "1.4.3";
-       sha256 = "933a098970511c03b72698138329350ac722dd84dbd3fc76b49e2eb5504a73ed";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Key Management Service SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-kms_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24186,28 +22939,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Key Management Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-lambda" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-lambda";
-       version = "1.4.3";
-       sha256 = "4ed68d68eaa379b41f0ccf4ef82981687bd029fea84b544a0137ce0408d01787";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Lambda SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-lambda_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24223,7 +22957,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Lambda SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-lightsail" = callPackage
@@ -24246,24 +22979,6 @@ self: {
      }) {};
 
   "amazonka-marketplace-analytics" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-marketplace-analytics";
-       version = "1.4.3";
-       sha256 = "cca9bd6001747c33714601b7b9cc85623e179e99f67e05e04d38be340d80dec7";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Marketplace Commerce Analytics SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-marketplace-analytics_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24279,28 +22994,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Marketplace Commerce Analytics SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-marketplace-metering" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-marketplace-metering";
-       version = "1.4.3";
-       sha256 = "577270b944784ea27d8cc0e911757c5a5fe18657892d2862e5e20e3e64b37a21";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Marketplace Metering SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-marketplace-metering_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24316,28 +23012,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Marketplace Metering SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-ml" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-ml";
-       version = "1.4.3";
-       sha256 = "dd5731a2df42ecb1d07968436ed27c1a72b61a3e1b5a3b7c8c04d38ed9ada4dd";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Machine Learning SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-ml_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24353,28 +23030,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Machine Learning SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-opsworks" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-opsworks";
-       version = "1.4.3";
-       sha256 = "8a3844b702d7d68e7f26b8a886e3c4ca3984b6f2522c13f0e7c5174f2e8ef273";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon OpsWorks SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-opsworks_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24390,7 +23048,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon OpsWorks SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-opsworks-cm" = callPackage
@@ -24451,25 +23108,6 @@ self: {
      }) {};
 
   "amazonka-rds" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-rds";
-       version = "1.4.3";
-       sha256 = "4d58e361bdc88245b71e718edace7f2a360fecb7bf243a61d0eac1424abf2acf";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Relational Database Service SDK";
-       license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "amazonka-rds_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24489,24 +23127,6 @@ self: {
      }) {};
 
   "amazonka-redshift" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-redshift";
-       version = "1.4.3";
-       sha256 = "af9d7957c68c0e66cb1301b611bc196adaead8eb2b88210d369dc01ed377fe68";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Redshift SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-redshift_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24522,7 +23142,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Redshift SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-rekognition" = callPackage
@@ -24545,24 +23164,6 @@ self: {
      }) {};
 
   "amazonka-route53" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-route53";
-       version = "1.4.3";
-       sha256 = "a7fb42486f54b7e1b858edc907a57be656b20a2da8a08c982e3d8bf0c592b0cf";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Route 53 SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-route53_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24578,28 +23179,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-route53-domains" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-route53-domains";
-       version = "1.4.3";
-       sha256 = "1a773fc3c18faa770874fc708ff0cb6b7150a09836c3a9c6332b9d222a4fe18b";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Route 53 Domains SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-route53-domains_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24615,28 +23197,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 Domains SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-s3" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , lens, tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-s3";
-       version = "1.4.3";
-       sha256 = "9ed6c9e7675e99a545a84ac2c979a7542ecd898dd6e4c2fbbbba2c4a40d8fc50";
-       libraryHaskellDepends = [ amazonka-core base lens text ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Simple Storage Service SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-s3_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , lens, tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24652,7 +23215,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Storage Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-s3-streaming" = callPackage
@@ -24680,24 +23242,6 @@ self: {
      }) {};
 
   "amazonka-sdb" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-sdb";
-       version = "1.4.3";
-       sha256 = "7fac8b39c2210e09d1ef15f7c964b64397c1b6165638c92f4069be8002ebf1d3";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon SimpleDB SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-sdb_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24713,7 +23257,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon SimpleDB SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-servicecatalog" = callPackage
@@ -24736,24 +23279,6 @@ self: {
      }) {};
 
   "amazonka-ses" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-ses";
-       version = "1.4.3";
-       sha256 = "2ccab07f3c08d9145c2bc936048e5f973532871f1a366e0111a2bf70973d96a2";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Simple Email Service SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-ses_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24769,7 +23294,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Email Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-shield" = callPackage
@@ -24830,24 +23354,6 @@ self: {
      }) {};
 
   "amazonka-sns" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-sns";
-       version = "1.4.3";
-       sha256 = "681335a9d385af666d5c895b982fb757fa65862a0047d3a498d544f6d136544a";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Simple Notification Service SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-sns_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24863,29 +23369,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Notification Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-sqs" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-sqs";
-       version = "1.4.3";
-       sha256 = "2e94eaab5fc5c9a4471bfe834ccf975c1776b268cb291281740db62148825ece";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Simple Queue Service SDK";
-       license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "amazonka-sqs_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24905,24 +23391,6 @@ self: {
      }) {};
 
   "amazonka-ssm" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-ssm";
-       version = "1.4.3";
-       sha256 = "260a3e4178f48f4df2bb2574809ac7c81c7208fa9d77225c6101844bb21c38c1";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Simple Systems Management Service SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-ssm_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24938,7 +23406,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Systems Manager (SSM) SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-stepfunctions" = callPackage
@@ -24961,24 +23428,6 @@ self: {
      }) {};
 
   "amazonka-storagegateway" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-storagegateway";
-       version = "1.4.3";
-       sha256 = "5522fa5aa0bfed529b5b85385d2000aedf5b1c8fb5400bf280d4b131275b7b47";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Storage Gateway SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-storagegateway_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24994,28 +23443,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Storage Gateway SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-sts" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-sts";
-       version = "1.4.3";
-       sha256 = "d36e38218fe83a696c13dfef9362028cb23f73b96fb468bb9b809ef69598606c";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Security Token Service SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-sts_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -25031,28 +23461,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Security Token Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-support" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-support";
-       version = "1.4.3";
-       sha256 = "d9acfb0d35f3c987dd534c0a59959cef44825facfc4665ba20bf286e4023d70f";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Support SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-support_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -25068,28 +23479,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Support SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-swf" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-swf";
-       version = "1.4.3";
-       sha256 = "0443d02c23d93eca09f6b91ad7aa1e32ab02e6b92e0bb6595ab65ce5f13ab469";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Simple Workflow Service SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-swf_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -25105,32 +23497,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Workflow Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-test" = callPackage
-    ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring
-     , case-insensitive, conduit, conduit-extra, groom, http-client
-     , http-types, process, resourcet, tasty, tasty-hunit
-     , template-haskell, temporary, text, time, unordered-containers
-     , yaml
-     }:
-     mkDerivation {
-       pname = "amazonka-test";
-       version = "1.4.3";
-       sha256 = "10310abf1036afb3f2ea688b300d738700f780a2459a10f306b1bedff9019d9b";
-       libraryHaskellDepends = [
-         aeson amazonka-core base bifunctors bytestring case-insensitive
-         conduit conduit-extra groom http-client http-types process
-         resourcet tasty tasty-hunit template-haskell temporary text time
-         unordered-containers yaml
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Common functionality for Amazonka library test-suites";
-       license = "unknown";
-     }) {};
-
-  "amazonka-test_1_4_5" = callPackage
     ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring
      , case-insensitive, conduit, conduit-extra, groom, http-client
      , http-types, process, resourcet, tasty, tasty-hunit
@@ -25150,28 +23519,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Common functionality for Amazonka library test-suites";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-waf" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-waf";
-       version = "1.4.3";
-       sha256 = "7e9c9d7ca82c8d1e95e7aabf696980040f8644d96c011438e06c51dd41655a85";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon WAF SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-waf_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -25187,28 +23537,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon WAF SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-workspaces" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-workspaces";
-       version = "1.4.3";
-       sha256 = "61828d17aec286062dd453e69b730e180a651f59387c7355872d1cae47805d78";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon WorkSpaces SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-workspaces_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -25224,7 +23555,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon WorkSpaces SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-xray" = callPackage
@@ -25691,18 +24021,6 @@ self: {
      }) {};
 
   "anonymous-sums" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "anonymous-sums";
-       version = "0.4.0.0";
-       sha256 = "116626dd139f7ba57b66d790915ff21cdf09f267da16f873f396ae76aad16749";
-       libraryHaskellDepends = [ base ];
-       homepage = "http://www.github.com/massysett/anonymous-sums";
-       description = "Anonymous sum types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "anonymous-sums_0_6_0_0" = callPackage
     ({ mkDerivation, base, lens, template-haskell }:
      mkDerivation {
        pname = "anonymous-sums";
@@ -25712,7 +24030,6 @@ self: {
        homepage = "http://www.github.com/massysett/anonymous-sums";
        description = "Anonymous sum types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "anonymous-sums-tests" = callPackage
@@ -25773,19 +24090,6 @@ self: {
      }) {};
 
   "ansigraph" = callPackage
-    ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }:
-     mkDerivation {
-       pname = "ansigraph";
-       version = "0.2.0.0";
-       sha256 = "3ded8cb86e659854a051328982c4b3f3527c409c5bbeb37383d717685e76ca43";
-       libraryHaskellDepends = [ ansi-terminal base ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/BlackBrane/ansigraph";
-       description = "Terminal-based graphing via ANSI and Unicode";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ansigraph_0_3_0_2" = callPackage
     ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }:
      mkDerivation {
        pname = "ansigraph";
@@ -25796,7 +24100,6 @@ self: {
        homepage = "https://github.com/BlackBrane/ansigraph";
        description = "Terminal-based graphing via ANSI and Unicode";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "antagonist" = callPackage
@@ -26674,39 +24977,6 @@ self: {
      }) {};
 
   "apply-refact" = callPackage
-    ({ mkDerivation, base, containers, directory, filemanip, filepath
-     , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact
-     , silently, syb, tasty, tasty-expected-failure, tasty-golden
-     , temporary, transformers, unix-compat
-     }:
-     mkDerivation {
-       pname = "apply-refact";
-       version = "0.3.0.0";
-       sha256 = "0d2a8845ed554c4a6742a3d0a130dac3f16d0d710b65b20dfeb8e773409ed70f";
-       revision = "1";
-       editedCabalFile = "372095fc0b1e53e884362d5650486b4c2fb624588271a7b4917903ea977899ea";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers directory filemanip ghc ghc-exactprint mtl process
-         refact syb temporary transformers unix-compat
-       ];
-       executableHaskellDepends = [
-         base containers directory filemanip filepath ghc ghc-exactprint mtl
-         optparse-applicative process refact syb temporary transformers
-         unix-compat
-       ];
-       testHaskellDepends = [
-         base containers directory filemanip filepath ghc ghc-exactprint mtl
-         optparse-applicative process refact silently syb tasty
-         tasty-expected-failure tasty-golden temporary transformers
-         unix-compat
-       ];
-       description = "Perform refactorings specified by the refact library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "apply-refact_0_3_0_1" = callPackage
     ({ mkDerivation, base, containers, directory, filemanip, filepath
      , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact
      , silently, syb, tasty, tasty-expected-failure, tasty-golden
@@ -26735,7 +25005,6 @@ self: {
        ];
        description = "Perform refactorings specified by the refact library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "apportionment" = callPackage
@@ -28229,32 +26498,6 @@ self: {
      }) {};
 
   "atom-conduit" = callPackage
-    ({ mkDerivation, base, conduit, conduit-parse, data-default
-     , exceptions, foldl, hlint, lens-simple, mono-traversable, parsers
-     , quickcheck-instances, resourcet, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, timerep, uri-bytestring
-     , xml-conduit, xml-conduit-parse, xml-types
-     }:
-     mkDerivation {
-       pname = "atom-conduit";
-       version = "0.3.1.2";
-       sha256 = "ab469b789cd81a5dab366c367a5b86a073e7cfc8fbb1a978d3107441795f7a22";
-       libraryHaskellDepends = [
-         base conduit conduit-parse exceptions foldl lens-simple
-         mono-traversable parsers text time timerep uri-bytestring
-         xml-conduit xml-conduit-parse xml-types
-       ];
-       testHaskellDepends = [
-         base conduit conduit-parse data-default exceptions hlint
-         lens-simple mono-traversable parsers quickcheck-instances resourcet
-         tasty tasty-hunit tasty-quickcheck text time uri-bytestring
-         xml-conduit xml-conduit-parse xml-types
-       ];
-       description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287).";
-       license = "unknown";
-     }) {};
-
-  "atom-conduit_0_4_0_1" = callPackage
     ({ mkDerivation, base, blaze-builder, conduit, conduit-combinators
      , data-default, hlint, lens-simple, mono-traversable, parsers
      , quickcheck-instances, resourcet, safe-exceptions, tasty
@@ -28278,7 +26521,6 @@ self: {
        ];
        description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287).";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atom-msp430" = callPackage
@@ -28856,25 +27098,6 @@ self: {
      }) {};
 
   "authenticate-oauth" = callPackage
-    ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
-     , crypto-pubkey-types, data-default, http-client, http-types
-     , random, RSA, SHA, time, transformers
-     }:
-     mkDerivation {
-       pname = "authenticate-oauth";
-       version = "1.5.1.2";
-       sha256 = "294279ff1a4e746eedb5186d8230c34b2ffa770f020d30341424a59fedb76a33";
-       libraryHaskellDepends = [
-         base base64-bytestring blaze-builder bytestring crypto-pubkey-types
-         data-default http-client http-types random RSA SHA time
-         transformers
-       ];
-       homepage = "http://github.com/yesodweb/authenticate";
-       description = "Library to authenticate with OAuth for Haskell web applications";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "authenticate-oauth_1_6" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
      , crypto-pubkey-types, data-default, http-client, http-types
      , random, RSA, SHA, time, transformers, transformers-compat
@@ -28891,7 +27114,6 @@ self: {
        homepage = "http://github.com/yesodweb/authenticate";
        description = "Library to authenticate with OAuth for Haskell web applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "authinfo-hs" = callPackage
@@ -28957,21 +27179,6 @@ self: {
      }) {};
 
   "autoexporter" = callPackage
-    ({ mkDerivation, base, Cabal, directory, filepath }:
-     mkDerivation {
-       pname = "autoexporter";
-       version = "0.2.3";
-       sha256 = "b3b9bfb44a5942ee83b45b4c9bcf3a61335362c507a98acddaf47889e394ab8a";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base Cabal directory filepath ];
-       executableHaskellDepends = [ base ];
-       homepage = "https://github.com/tfausak/autoexporter#readme";
-       description = "Automatically re-export modules";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "autoexporter_1_0_0" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath }:
      mkDerivation {
        pname = "autoexporter";
@@ -28984,7 +27191,6 @@ self: {
        homepage = "https://github.com/tfausak/autoexporter#readme";
        description = "Automatically re-export modules";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "autom" = callPackage
@@ -29362,41 +27568,6 @@ self: {
      }) {awesomium = null;};
 
   "aws" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
-     , base64-bytestring, blaze-builder, byteable, bytestring
-     , case-insensitive, cereal, conduit, conduit-extra, containers
-     , cryptohash, data-default, directory, errors, filepath
-     , http-client, http-client-tls, http-conduit, http-types
-     , lifted-base, monad-control, mtl, network, old-locale, QuickCheck
-     , quickcheck-instances, resourcet, safe, scientific, tagged, tasty
-     , tasty-hunit, tasty-quickcheck, text, time, transformers
-     , transformers-base, unordered-containers, utf8-string, vector
-     , xml-conduit
-     }:
-     mkDerivation {
-       pname = "aws";
-       version = "0.14.1";
-       sha256 = "6a2079853ddc781b46fe3ddce31e88c0b6b2441f458141bca3cd1c7216cbe579";
-       libraryHaskellDepends = [
-         aeson attoparsec base base16-bytestring base64-bytestring
-         blaze-builder byteable bytestring case-insensitive cereal conduit
-         conduit-extra containers cryptohash data-default directory filepath
-         http-conduit http-types lifted-base monad-control mtl network
-         old-locale resourcet safe scientific tagged text time transformers
-         unordered-containers utf8-string vector xml-conduit
-       ];
-       testHaskellDepends = [
-         aeson base bytestring errors http-client http-client-tls http-types
-         lifted-base monad-control mtl QuickCheck quickcheck-instances
-         resourcet tagged tasty tasty-hunit tasty-quickcheck text time
-         transformers transformers-base
-       ];
-       homepage = "http://github.com/aristidb/aws";
-       description = "Amazon Web Services (AWS) for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "aws_0_16" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , base64-bytestring, blaze-builder, byteable, bytestring
      , case-insensitive, cereal, conduit, conduit-combinators
@@ -29429,7 +27600,6 @@ self: {
        homepage = "http://github.com/aristidb/aws";
        description = "Amazon Web Services (AWS) for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-cloudfront-signer" = callPackage
@@ -30171,36 +28341,6 @@ self: {
      }) {};
 
   "bake" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cmdargs, containers
-     , deepseq, direct-sqlite, directory, disk-free-space, extra
-     , filepath, hashable, HTTP, http-types, old-locale, process, random
-     , safe, shake, smtp-mail, sqlite-simple, text, time, transformers
-     , unordered-containers, wai, warp
-     }:
-     mkDerivation {
-       pname = "bake";
-       version = "0.4";
-       sha256 = "ff0b6eb38e68f2542713074da3c64368e3a56c029dadb9c1e011262c223abbf7";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring cmdargs containers deepseq direct-sqlite
-         directory disk-free-space extra filepath hashable HTTP http-types
-         old-locale random safe shake smtp-mail sqlite-simple text time
-         transformers unordered-containers wai warp
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring cmdargs containers deepseq direct-sqlite
-         directory disk-free-space extra filepath hashable HTTP http-types
-         old-locale process random safe shake smtp-mail sqlite-simple text
-         time transformers unordered-containers wai warp
-       ];
-       homepage = "https://github.com/ndmitchell/bake#readme";
-       description = "Continuous integration system";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bake_0_5" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cmdargs, containers
      , deepseq, direct-sqlite, directory, disk-free-space, extra
      , filepath, hashable, HTTP, http-client, http-conduit, http-types
@@ -30231,7 +28371,6 @@ self: {
        homepage = "https://github.com/ndmitchell/bake#readme";
        description = "Continuous integration system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bamboo" = callPackage
@@ -30592,19 +28731,6 @@ self: {
      }) {};
 
   "base-noprelude" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "base-noprelude";
-       version = "4.9.0.0";
-       sha256 = "1c5509c33366d7d0810c12d3e00579709f1b940733fda0f5f38079eba8f2fe5d";
-       libraryHaskellDepends = [ base ];
-       doHaddock = false;
-       homepage = "https://github.com/hvr/base-noprelude";
-       description = "\"base\" package sans \"Prelude\" module";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "base-noprelude_4_9_1_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "base-noprelude";
@@ -30615,7 +28741,6 @@ self: {
        homepage = "https://github.com/hvr/base-noprelude";
        description = "\"base\" package sans \"Prelude\" module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-orphans" = callPackage
@@ -32852,6 +30977,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bindings-monetdb-mapi" = callPackage
+    ({ mkDerivation, base, monetdb-mapi }:
+     mkDerivation {
+       pname = "bindings-monetdb-mapi";
+       version = "0.1.0.0";
+       sha256 = "63efa91e5c3224666cdda44762e830339ed311148392d14c651b54048ad5218a";
+       libraryHaskellDepends = [ base ];
+       libraryPkgconfigDepends = [ monetdb-mapi ];
+       description = "Low-level bindings for the MonetDB API (mapi)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {monetdb-mapi = null;};
+
   "bindings-mpdecimal" = callPackage
     ({ mkDerivation, base, bindings-DSL }:
      mkDerivation {
@@ -33514,31 +31651,6 @@ self: {
      }) {};
 
   "bitcoin-payment-channel" = callPackage
-    ({ mkDerivation, aeson, base, base16-bytestring, base58string
-     , base64-bytestring, bytestring, cereal, errors, haskoin-core
-     , hexstring, QuickCheck, scientific, text, time
-     }:
-     mkDerivation {
-       pname = "bitcoin-payment-channel";
-       version = "0.3.0.1";
-       sha256 = "97bc6dc75c72735f28c84ef90734f2e31bde8693f9c88e216f8a66d3f95ae8c8";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base base16-bytestring base64-bytestring bytestring cereal
-         errors haskoin-core hexstring scientific text time
-       ];
-       executableHaskellDepends = [
-         aeson base base16-bytestring base58string base64-bytestring
-         bytestring cereal haskoin-core hexstring QuickCheck text time
-       ];
-       homepage = "https://github.com/runeksvendsen/bitcoin-payment-channel";
-       description = "Library for working with Bitcoin payment channels";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "bitcoin-payment-channel_1_0_1_0" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring
      , bytestring, cereal, deepseq, errors, haskoin-core, hexstring
      , hspec, monad-time, mtl, QuickCheck, random, rbpcp-api, scientific
@@ -33916,30 +32028,6 @@ self: {
      }) {};
 
   "bitx-bitcoin" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, directory, doctest
-     , exceptions, hspec, http-client, http-client-tls, http-types
-     , microlens, microlens-th, network, QuickCheck, safe, scientific
-     , split, text, time
-     }:
-     mkDerivation {
-       pname = "bitx-bitcoin";
-       version = "0.10.0.0";
-       sha256 = "a55e13de9eadffe78a0fc3edf4055a98c70a6f9738c98db4f055df8aa9fc509c";
-       libraryHaskellDepends = [
-         aeson base bytestring exceptions http-client http-client-tls
-         http-types microlens microlens-th network QuickCheck scientific
-         split text time
-       ];
-       testHaskellDepends = [
-         aeson base bytestring directory doctest hspec http-client
-         http-types microlens safe text time
-       ];
-       homepage = "https://github.com/tebello-thejane/bitx-haskell";
-       description = "A Haskell library for working with the BitX bitcoin exchange";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bitx-bitcoin_0_11_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, directory
      , doctest, exceptions, hspec, http-client, http-client-tls
      , http-types, microlens, microlens-th, network, QuickCheck, safe
@@ -33961,7 +32049,6 @@ self: {
        homepage = "https://github.com/tebello-thejane/bitx.hs";
        description = "A Haskell library for working with the BitX bitcoin exchange";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bk-tree" = callPackage
@@ -34282,6 +32369,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "blaze-colonnade" = callPackage
+    ({ mkDerivation, base, blaze-html, blaze-markup, colonnade, doctest
+     , text
+     }:
+     mkDerivation {
+       pname = "blaze-colonnade";
+       version = "0.1";
+       sha256 = "cee73ec0777ecc268958699ead67b527b2b99cfbad38532b4687628bf70138e8";
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup colonnade text
+       ];
+       testHaskellDepends = [ base colonnade doctest ];
+       homepage = "https://github.com/andrewthad/colonnade#readme";
+       description = "Helper functions for using blaze-html with colonnade";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "blaze-from-html" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, tagsoup }:
      mkDerivation {
@@ -34688,35 +32792,6 @@ self: {
      }) {};
 
   "bloodhound" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers
-     , data-default-class, derive, directory, doctest, doctest-prop
-     , errors, exceptions, filepath, hashable, hspec, http-client
-     , http-types, mtl, mtl-compat, network-uri, QuickCheck
-     , quickcheck-properties, scientific, semigroups, text, time
-     , transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "bloodhound";
-       version = "0.11.0.0";
-       sha256 = "df3c708675ad1e113aa31f6d1492bcf55dbef6c7e86e6202b118670a6fcbb939";
-       libraryHaskellDepends = [
-         aeson base blaze-builder bytestring containers data-default-class
-         exceptions hashable http-client http-types mtl mtl-compat
-         network-uri scientific semigroups text time transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers derive directory doctest
-         doctest-prop errors filepath hspec http-client http-types mtl
-         QuickCheck quickcheck-properties semigroups text time
-         unordered-containers vector
-       ];
-       homepage = "https://github.com/bitemyapp/bloodhound";
-       description = "ElasticSearch client library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bloodhound_0_12_1_0" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers
      , data-default-class, directory, doctest, errors, exceptions
      , filepath, generics-sop, hashable, hspec, http-client, http-types
@@ -34743,7 +32818,6 @@ self: {
        homepage = "https://github.com/bitemyapp/bloodhound";
        description = "ElasticSearch client library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bloodhound-amazonka-auth" = callPackage
@@ -34809,29 +32883,6 @@ self: {
      }) {};
 
   "blosum" = callPackage
-    ({ mkDerivation, base, containers, fasta, lens
-     , optparse-applicative, pipes, pipes-text, split, text, text-show
-     }:
-     mkDerivation {
-       pname = "blosum";
-       version = "0.1.1.2";
-       sha256 = "acfbca000b0f7da3e20c5ae0b124ff029d4777a056f74546828fe6a9eee29d55";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers fasta lens text text-show
-       ];
-       executableHaskellDepends = [
-         base containers fasta optparse-applicative pipes pipes-text split
-         text
-       ];
-       homepage = "http://github.com/GregorySchwartz/blosum#readme";
-       description = "BLOSUM generator";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "blosum_0_1_1_4" = callPackage
     ({ mkDerivation, base, containers, fasta, lens
      , optparse-applicative, pipes, pipes-text, split, text, text-show
      }:
@@ -35077,8 +33128,8 @@ self: {
      }:
      mkDerivation {
        pname = "bond";
-       version = "0.7.0.0";
-       sha256 = "b55acc5eb137f8dc9a85a7eedc8dc2f26c22d91b8593b856b155c6cd2597a7d3";
+       version = "0.8.0.0";
+       sha256 = "9ba0c8b618d342575d480488783117ea99dc19b0b5485192e3757cdbe267ccf7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -35391,12 +33442,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "boring-game" = callPackage
+    ({ mkDerivation, base, gloss }:
+     mkDerivation {
+       pname = "boring-game";
+       version = "0.1.0.1";
+       sha256 = "51cc6d7b7cdda9ca35021c7005d75773119bdb3331f5fb40c750c9e231392b81";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base gloss ];
+       executableHaskellDepends = [ base gloss ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/checkraiser/boring-game#readme";
+       description = "An educational game";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "boring-window-switcher" = callPackage
     ({ mkDerivation, base, gtk, transformers, X11 }:
      mkDerivation {
        pname = "boring-window-switcher";
-       version = "0.1.0.3";
-       sha256 = "ac8273d978973b9424ce195ab48b6f599d06bb1af1af6abf94305b35ffed2748";
+       version = "0.1.0.4";
+       sha256 = "4f9f7dbe3ad1e3f5ad40a79e59e03e3598c9be7a91afe9d3ffb7148fd3063196";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base gtk transformers X11 ];
@@ -35505,27 +33572,6 @@ self: {
      }) {};
 
   "bower-json" = callPackage
-    ({ mkDerivation, aeson, aeson-better-errors, base, bytestring
-     , deepseq, mtl, scientific, tasty, tasty-hunit, text, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "bower-json";
-       version = "0.8.1";
-       sha256 = "3fb3cdecc55a0997a9d4d9c3443bcf39b7feed09feb8629fc89b48b1ca7b713f";
-       libraryHaskellDepends = [
-         aeson aeson-better-errors base bytestring deepseq 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;
-     }) {};
-
-  "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
@@ -35544,7 +33590,6 @@ self: {
        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
@@ -35958,18 +34003,6 @@ self: {
      }) {};
 
   "btrfs" = callPackage
-    ({ mkDerivation, base, bytestring, time, unix }:
-     mkDerivation {
-       pname = "btrfs";
-       version = "0.1.2.0";
-       sha256 = "a1e7bdb44c587686299e3e9e3910fb7a271bcd7462ee6fac0ffccd8c7a60fe0c";
-       libraryHaskellDepends = [ base bytestring time unix ];
-       homepage = "https://github.com/redneb/hs-btrfs";
-       description = "Bindings to the btrfs API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "btrfs_0_1_2_3" = callPackage
     ({ mkDerivation, base, bytestring, time, unix }:
      mkDerivation {
        pname = "btrfs";
@@ -35979,7 +34012,6 @@ self: {
        homepage = "https://github.com/redneb/hs-btrfs";
        description = "Bindings to the btrfs API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "buchhaltung" = callPackage
@@ -37013,6 +35045,19 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "c2hs-extra" = callPackage
+    ({ mkDerivation, base, c2hs }:
+     mkDerivation {
+       pname = "c2hs-extra";
+       version = "0.1.0.0";
+       sha256 = "f22faa55babb95ac1acb29c775ebf9cf0fd1673985c802bd5b6037d6db558b3d";
+       libraryHaskellDepends = [ base ];
+       libraryToolDepends = [ c2hs ];
+       homepage = "http://github.com/sighingnow/mxnet-haskell#readme";
+       description = "Convenient marshallers for complicate C types";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "c2hsc" = callPackage
     ({ mkDerivation, base, cmdargs, containers, directory, filepath
      , HStringTemplate, language-c, mtl, pretty, split, transformers
@@ -37201,22 +35246,6 @@ self: {
      }) {};
 
   "cabal-dependency-licenses" = callPackage
-    ({ mkDerivation, base, Cabal, containers, directory, filepath }:
-     mkDerivation {
-       pname = "cabal-dependency-licenses";
-       version = "0.1.2.0";
-       sha256 = "436a3d8745d6645cac1b51f54974f38811fbc37a3784ac0bdba3c3ddb22f2494";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base Cabal containers directory filepath
-       ];
-       homepage = "http://github.com/jaspervdj/cabal-dependency-licenses";
-       description = "Compose a list of a project's transitive dependencies with their licenses";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cabal-dependency-licenses_0_2_0_0" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, filepath }:
      mkDerivation {
        pname = "cabal-dependency-licenses";
@@ -37230,7 +35259,6 @@ self: {
        homepage = "http://github.com/jaspervdj/cabal-dependency-licenses";
        description = "Compose a list of a project's transitive dependencies with their licenses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-dev" = callPackage
@@ -37637,24 +35665,6 @@ self: {
      }) {};
 
   "cabal-rpm" = callPackage
-    ({ mkDerivation, base, Cabal, directory, filepath, old-locale
-     , process, time, unix
-     }:
-     mkDerivation {
-       pname = "cabal-rpm";
-       version = "0.10.1";
-       sha256 = "46aae9f3b5734ceb9c35d9a5dbe7603bd26235169f16a10035078de33140cde9";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base Cabal directory filepath old-locale process time unix
-       ];
-       homepage = "https://github.com/juhp/cabal-rpm";
-       description = "RPM packaging tool for Haskell Cabal-based packages";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "cabal-rpm_0_11" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath, old-locale
      , process, time, unix
      }:
@@ -37670,7 +35680,6 @@ self: {
        homepage = "https://github.com/juhp/cabal-rpm";
        description = "RPM packaging tool for Haskell Cabal-based packages";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-scripts" = callPackage
@@ -38144,29 +36153,6 @@ self: {
      }) {};
 
   "cacophony" = callPackage
-    ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring
-     , cryptonite, deepseq, directory, exceptions, free, hlint, lens
-     , memory, monad-coroutine, mtl, safe-exceptions, text, transformers
-     }:
-     mkDerivation {
-       pname = "cacophony";
-       version = "0.8.0";
-       sha256 = "063069adea7ae07f3ec458b76194edca2acb96871acc0fd437cc6b0c68739c01";
-       libraryHaskellDepends = [
-         base bytestring cryptonite deepseq exceptions free lens memory
-         monad-coroutine mtl safe-exceptions transformers
-       ];
-       testHaskellDepends = [
-         aeson async base base16-bytestring bytestring directory free hlint
-         lens mtl text
-       ];
-       homepage = "https://github.com/centromere/cacophony";
-       description = "A library implementing the Noise protocol";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "cacophony_0_9_1" = callPackage
     ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring
      , cryptonite, directory, exceptions, free, hlint, lens, memory
      , monad-coroutine, mtl, safe-exceptions, text, transformers
@@ -38527,37 +36513,6 @@ self: {
      }) {};
 
   "camfort" = callPackage
-    ({ mkDerivation, alex, array, base, bytestring, containers
-     , directory, fgl, filepath, fortran-src, GenericPretty, ghc-prim
-     , happy, hmatrix, hspec, matrix, mtl, QuickCheck, syb, syz, text
-     , transformers, uniplate, vector
-     }:
-     mkDerivation {
-       pname = "camfort";
-       version = "0.900";
-       sha256 = "fc92d5a5d5ecf42470d4f7aea2848eb785e44ba925949df86599e7b96f4a4427";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base bytestring containers directory fgl filepath fortran-src
-         GenericPretty ghc-prim hmatrix matrix mtl syb syz text transformers
-         uniplate vector
-       ];
-       libraryToolDepends = [ alex happy ];
-       executableHaskellDepends = [
-         array base bytestring containers directory fgl filepath fortran-src
-         GenericPretty ghc-prim hmatrix matrix mtl QuickCheck syb syz text
-         transformers uniplate vector
-       ];
-       testHaskellDepends = [
-         array base bytestring containers directory filepath fortran-src
-         hmatrix hspec mtl QuickCheck uniplate
-       ];
-       description = "CamFort - Cambridge Fortran infrastructure";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "camfort_0_901" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, containers
      , directory, fgl, filepath, fortran-src, GenericPretty, ghc-prim
      , happy, hmatrix, hspec, matrix, mtl, QuickCheck, syb, syz, text
@@ -38586,7 +36541,6 @@ self: {
        ];
        description = "CamFort - Cambridge Fortran infrastructure";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "camh" = callPackage
@@ -38993,8 +36947,8 @@ self: {
      }:
      mkDerivation {
        pname = "casadi-bindings";
-       version = "3.1.0.2";
-       sha256 = "c137dece9554219a980a74f0aaa3d44c13f83b6312c8802f4766702250514a95";
+       version = "3.1.0.3";
+       sha256 = "c9a2e3b246b344f48a771c419db3cdddda7f71c1995d184340d91817bebf6439";
        libraryHaskellDepends = [
          base binary casadi-bindings-core casadi-bindings-internal cereal
          containers linear spatial-math vector vector-binary-instances
@@ -39177,8 +37131,8 @@ self: {
      }:
      mkDerivation {
        pname = "cases";
-       version = "0.1.3.1";
-       sha256 = "472bd45f1e9361b250e1b48aeaa92494fce5283f4154856cb13d1a8376897987";
+       version = "0.1.3.2";
+       sha256 = "9ecf632f7751aac2ed7ec93407f9499237316f2eb50f331bb4969abf3359a8a9";
        libraryHaskellDepends = [ attoparsec base-prelude loch-th text ];
        testHaskellDepends = [
          base HTF HUnit loch-th placeholders QuickCheck text
@@ -39462,24 +37416,6 @@ self: {
      }) {};
 
   "cassava-conduit" = callPackage
-    ({ mkDerivation, array, base, bifunctors, bytestring, cassava
-     , conduit, conduit-extra, containers, mtl, QuickCheck, text
-     }:
-     mkDerivation {
-       pname = "cassava-conduit";
-       version = "0.3.2";
-       sha256 = "e6ac1e3da4e43540ea0d31ecfa31a30c4ec401878aff10f1a1f6126e4462ffd2";
-       libraryHaskellDepends = [
-         array base bifunctors bytestring cassava conduit conduit-extra
-         containers mtl text
-       ];
-       testHaskellDepends = [ base QuickCheck ];
-       homepage = "https://github.com/domdere/cassava-conduit";
-       description = "Conduit interface for cassava package";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cassava-conduit_0_3_5_1" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, cassava
      , conduit, conduit-extra, containers, mtl, QuickCheck, text
      }:
@@ -39497,7 +37433,6 @@ self: {
        homepage = "https://github.com/domdere/cassava-conduit";
        description = "Conduit interface for cassava package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cassava-megaparsec" = callPackage
@@ -39735,27 +37670,6 @@ self: {
      }) {};
 
   "cayley-client" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
-     , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
-     , mtl, text, transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "cayley-client";
-       version = "0.2.1.1";
-       sha256 = "04547226bf0e504d41527de6e2d81ba66d6c59d4460e2ce37f34a6d9aca747cf";
-       libraryHaskellDepends = [
-         aeson attoparsec base binary bytestring exceptions http-client
-         http-conduit lens lens-aeson mtl text transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [ aeson base hspec unordered-containers ];
-       homepage = "https://github.com/MichelBoucey/cayley-client";
-       description = "A Haskell client for the Cayley graph database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "cayley-client_0_4_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
      , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
      , mtl, text, transformers, unordered-containers, vector
@@ -41720,32 +39634,6 @@ self: {
      }) {};
 
   "clash-lib" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude
-     , concurrent-supply, containers, deepseq, directory, errors, fgl
-     , filepath, ghc, hashable, integer-gmp, lens, mtl, pretty, process
-     , template-haskell, text, time, transformers, unbound-generics
-     , unordered-containers, uu-parsinglib, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "clash-lib";
-       version = "0.6.21";
-       sha256 = "2b0135d15e5e3b66a59ccdb40a3bf38bb8895bf67c49eb9b54a80082752b98ad";
-       revision = "1";
-       editedCabalFile = "4dc5af7e94897c9afc254661bb7e19a09acd0467be034c8d82bbe5b2582bd262";
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring clash-prelude concurrent-supply
-         containers deepseq directory errors fgl filepath ghc hashable
-         integer-gmp lens mtl pretty process template-haskell text time
-         transformers unbound-generics unordered-containers uu-parsinglib
-         wl-pprint-text
-       ];
-       homepage = "http://www.clash-lang.org/";
-       description = "CAES Language for Synchronous Hardware - As a Library";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "clash-lib_0_7" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude
      , concurrent-supply, containers, data-binary-ieee754, deepseq
      , directory, errors, fgl, filepath, ghc, hashable, integer-gmp
@@ -41783,30 +39671,6 @@ self: {
      }) {};
 
   "clash-prelude" = callPackage
-    ({ mkDerivation, array, base, data-default, deepseq, doctest
-     , ghc-prim, ghc-typelits-extra, ghc-typelits-natnormalise
-     , integer-gmp, lens, QuickCheck, reflection, singletons
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "clash-prelude";
-       version = "0.10.14";
-       sha256 = "bf99eabf5a0ac6a86523c95a122242d3f5631d1b1870ba83d8e7319f245ef7f2";
-       revision = "1";
-       editedCabalFile = "badae6cf81fc1997c660b45485f9779eeeda298e676b2df6c07b060919b63f19";
-       libraryHaskellDepends = [
-         array base data-default deepseq ghc-prim ghc-typelits-extra
-         ghc-typelits-natnormalise integer-gmp lens QuickCheck reflection
-         singletons template-haskell
-       ];
-       testHaskellDepends = [ base doctest ];
-       homepage = "http://www.clash-lang.org/";
-       description = "CAES Language for Synchronous Hardware - Prelude library";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "clash-prelude_0_11" = callPackage
     ({ mkDerivation, array, base, constraints, data-binary-ieee754
      , data-default, deepseq, doctest, ghc-prim, ghc-typelits-extra
      , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp
@@ -41842,24 +39706,6 @@ self: {
      }) {};
 
   "clash-systemverilog" = callPackage
-    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
-     , text, unordered-containers, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "clash-systemverilog";
-       version = "0.6.10";
-       sha256 = "20c33d2966648ecf383793308b0292437cccd06c4bd5535c1f280689180a2d6b";
-       libraryHaskellDepends = [
-         base clash-lib clash-prelude fgl lens mtl text unordered-containers
-         wl-pprint-text
-       ];
-       homepage = "http://www.clash-lang.org/";
-       description = "CAES Language for Synchronous Hardware - SystemVerilog backend";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "clash-systemverilog_0_7" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, hashable
      , lens, mtl, text, unordered-containers, wl-pprint-text
      }:
@@ -41878,24 +39724,6 @@ self: {
      }) {};
 
   "clash-verilog" = callPackage
-    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
-     , text, unordered-containers, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "clash-verilog";
-       version = "0.6.10";
-       sha256 = "943c2c8752a3b44badce60595ffc5bbea2c87316681cd69460d75053e00fb26c";
-       libraryHaskellDepends = [
-         base clash-lib clash-prelude fgl lens mtl text unordered-containers
-         wl-pprint-text
-       ];
-       homepage = "http://www.clash-lang.org/";
-       description = "CAES Language for Synchronous Hardware - Verilog backend";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "clash-verilog_0_7" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, hashable
      , lens, mtl, text, unordered-containers, wl-pprint-text
      }:
@@ -41914,26 +39742,6 @@ self: {
      }) {};
 
   "clash-vhdl" = callPackage
-    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
-     , text, unordered-containers, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "clash-vhdl";
-       version = "0.6.16";
-       sha256 = "42f4be26a545144c0e950c2a0b3d59516e93e73ed2c6d32d3c449e233d32b0c8";
-       revision = "1";
-       editedCabalFile = "b2816898222a54367e8426adb2f3359fd32b1ec8e00d546f32ff3f2839c01b3c";
-       libraryHaskellDepends = [
-         base clash-lib clash-prelude fgl lens mtl text unordered-containers
-         wl-pprint-text
-       ];
-       homepage = "http://www.clash-lang.org/";
-       description = "CAES Language for Synchronous Hardware - VHDL backend";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "clash-vhdl_0_7" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, hashable
      , lens, mtl, text, unordered-containers, wl-pprint-text
      }:
@@ -41979,38 +39787,6 @@ self: {
      }) {};
 
   "classy-prelude" = callPackage
-    ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring
-     , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim
-     , hashable, hspec, lifted-async, lifted-base, monad-unlift
-     , mono-traversable, mono-traversable-instances, mtl
-     , mutable-containers, primitive, QuickCheck, safe-exceptions, say
-     , semigroups, stm, stm-chans, text, time, time-locale-compat
-     , transformers, transformers-base, unordered-containers, vector
-     , vector-instances
-     }:
-     mkDerivation {
-       pname = "classy-prelude";
-       version = "1.0.2";
-       sha256 = "4e5facf997758af2f15387349f373997abeee3edf3a3953e412490d4a9f5a467";
-       libraryHaskellDepends = [
-         async base basic-prelude bifunctors bytestring chunked-data
-         containers deepseq dlist exceptions ghc-prim hashable lifted-async
-         lifted-base monad-unlift mono-traversable
-         mono-traversable-instances mtl mutable-containers primitive
-         safe-exceptions say semigroups stm stm-chans text time
-         time-locale-compat transformers transformers-base
-         unordered-containers vector vector-instances
-       ];
-       testHaskellDepends = [
-         base containers hspec QuickCheck transformers unordered-containers
-       ];
-       homepage = "https://github.com/snoyberg/mono-traversable";
-       description = "A typeclass-based Prelude";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "classy-prelude_1_2_0" = callPackage
     ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring
      , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim
      , hashable, hspec, lifted-async, lifted-base, monad-unlift
@@ -42043,28 +39819,6 @@ self: {
      }) {};
 
   "classy-prelude-conduit" = callPackage
-    ({ mkDerivation, base, bytestring, classy-prelude, conduit
-     , conduit-combinators, hspec, monad-control, QuickCheck, resourcet
-     , transformers, void
-     }:
-     mkDerivation {
-       pname = "classy-prelude-conduit";
-       version = "1.0.2";
-       sha256 = "ab8f17db80cf1058013e00a16078275681faa93f91894263cf6a608c03843f19";
-       libraryHaskellDepends = [
-         base bytestring classy-prelude conduit conduit-combinators
-         monad-control resourcet transformers void
-       ];
-       testHaskellDepends = [
-         base bytestring conduit hspec QuickCheck transformers
-       ];
-       homepage = "https://github.com/snoyberg/mono-traversable";
-       description = "classy-prelude together with conduit functions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "classy-prelude-conduit_1_2_0" = callPackage
     ({ mkDerivation, base, bytestring, classy-prelude, conduit
      , conduit-combinators, hspec, monad-control, QuickCheck, resourcet
      , transformers, void
@@ -42087,26 +39841,6 @@ self: {
      }) {};
 
   "classy-prelude-yesod" = callPackage
-    ({ mkDerivation, aeson, base, classy-prelude
-     , classy-prelude-conduit, data-default, http-conduit, http-types
-     , persistent, yesod, yesod-newsfeed, yesod-static
-     }:
-     mkDerivation {
-       pname = "classy-prelude-yesod";
-       version = "1.0.2";
-       sha256 = "3183921a292159e8deb0ed63130defa239510beb1692f505438edebd2ca19406";
-       libraryHaskellDepends = [
-         aeson base classy-prelude classy-prelude-conduit data-default
-         http-conduit http-types persistent yesod yesod-newsfeed
-         yesod-static
-       ];
-       homepage = "https://github.com/snoyberg/mono-traversable";
-       description = "Provide a classy prelude including common Yesod functionality";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "classy-prelude-yesod_1_2_0" = callPackage
     ({ mkDerivation, aeson, base, classy-prelude
      , classy-prelude-conduit, data-default, http-conduit, http-types
      , persistent, yesod, yesod-newsfeed, yesod-static
@@ -42138,19 +39872,6 @@ self: {
      }) {};
 
   "clay" = callPackage
-    ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }:
-     mkDerivation {
-       pname = "clay";
-       version = "0.11";
-       sha256 = "c3172361b21508ec0634cf43a3cd018323bd0e24ce936f554b0f16ca4329b3c1";
-       libraryHaskellDepends = [ base mtl text ];
-       testHaskellDepends = [ base hspec hspec-expectations mtl text ];
-       homepage = "http://fvisser.nl/clay";
-       description = "CSS preprocessor as embedded Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "clay_0_12_1" = callPackage
     ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }:
      mkDerivation {
        pname = "clay";
@@ -42161,7 +39882,6 @@ self: {
        homepage = "http://fvisser.nl/clay";
        description = "CSS preprocessor as embedded Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clckwrks" = callPackage
@@ -42178,42 +39898,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks";
-       version = "0.23.19.2";
-       sha256 = "1453a56daccb669931ef6c1a1e6311abc6fef28341c9c75de0fcc34e03e4fb84";
-       libraryHaskellDepends = [
-         acid-state aeson aeson-qq attoparsec base blaze-html bytestring
-         cereal containers directory filepath happstack-authenticate
-         happstack-hsp happstack-jmacro happstack-server
-         happstack-server-tls hsp hsx-jmacro hsx2hs ixset jmacro lens mtl
-         network network-uri old-locale process random reform
-         reform-happstack reform-hsp safecopy stm text time
-         time-locale-compat unordered-containers userid utf8-string
-         uuid-orphans uuid-types vector web-plugins web-routes
-         web-routes-happstack web-routes-hsp web-routes-th xss-sanitize
-       ];
-       librarySystemDepends = [ openssl ];
-       homepage = "http://www.clckwrks.com/";
-       description = "A secure, reliable content management system (CMS) and blogging platform";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) openssl;};
-
-  "clckwrks_0_24_0_2" = callPackage
-    ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base
-     , blaze-html, bytestring, cereal, containers, directory, filepath
-     , happstack-authenticate, happstack-hsp, happstack-jmacro
-     , happstack-server, happstack-server-tls, hsp, hsx-jmacro, hsx2hs
-     , ixset, jmacro, lens, mtl, network, network-uri, old-locale
-     , openssl, process, random, reform, reform-happstack, reform-hsp
-     , safecopy, stm, text, time, time-locale-compat
-     , unordered-containers, userid, utf8-string, uuid-orphans
-     , uuid-types, vector, web-plugins, web-routes, web-routes-happstack
-     , web-routes-hsp, web-routes-th, xss-sanitize
-     }:
-     mkDerivation {
-       pname = "clckwrks";
-       version = "0.24.0.2";
-       sha256 = "2b1ec612cfb2071de5bdfc166be7d392cc7a00df5e95c53b9b7a3a407e5563d5";
+       version = "0.24.0.3";
+       sha256 = "aeeaf7c0275295ae45d21721fe9a454ab9fa67991495849eff076344b84a1eb0";
        libraryHaskellDepends = [
          acid-state aeson aeson-qq attoparsec base blaze-html bytestring
          cereal containers directory filepath happstack-authenticate
@@ -42333,8 +40019,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks-plugin-media";
-       version = "0.6.16.2";
-       sha256 = "bcd36e122d0ab4b791f738d6accb8a98488b73842cef3c4721f6fb89dc62d986";
+       version = "0.6.16.3";
+       sha256 = "26f77337fa1e9c429462f49616432b2bace533cced64961f32761abe7d9054cf";
        libraryHaskellDepends = [
          acid-state attoparsec base blaze-html cereal clckwrks containers
          directory filepath gd happstack-server hsp ixset magic mtl reform
@@ -42349,32 +40035,6 @@ self: {
      }) {};
 
   "clckwrks-plugin-page" = callPackage
-    ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks
-     , containers, directory, filepath, happstack-hsp, happstack-server
-     , hsp, hsx2hs, ixset, mtl, old-locale, random, reform
-     , reform-happstack, reform-hsp, safecopy, tagsoup, template-haskell
-     , text, time, time-locale-compat, uuid, uuid-orphans, web-plugins
-     , web-routes, web-routes-happstack, web-routes-th
-     }:
-     mkDerivation {
-       pname = "clckwrks-plugin-page";
-       version = "0.4.3.5";
-       sha256 = "fb52a13751c322fde387786e93fdd41e4bb5a6019136fd8daa9d622d15e5d498";
-       libraryHaskellDepends = [
-         acid-state aeson attoparsec base clckwrks containers directory
-         filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl
-         old-locale random reform reform-happstack reform-hsp safecopy
-         tagsoup template-haskell text time time-locale-compat uuid
-         uuid-orphans web-plugins web-routes web-routes-happstack
-         web-routes-th
-       ];
-       homepage = "http://www.clckwrks.com/";
-       description = "support for CMS/Blogging in clckwrks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "clckwrks-plugin-page_0_4_3_9" = callPackage
     ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks
      , containers, directory, filepath, happstack-hsp, happstack-server
      , hsp, hsx2hs, ixset, mtl, old-locale, random, reform
@@ -42728,8 +40388,8 @@ self: {
      }:
      mkDerivation {
        pname = "clit";
-       version = "0.2.2.4";
-       sha256 = "0642761a2e3a3426e0ca676503b0c00f7434f3b1d807e799005382e18680109d";
+       version = "0.2.2.5";
+       sha256 = "e45c77e70996765c2d9f4e803add4e88c3a3701766ee1777eb067e49dff5c21f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42976,28 +40636,6 @@ self: {
      }) {};
 
   "clustering" = callPackage
-    ({ mkDerivation, base, binary, containers, hierarchical-clustering
-     , matrices, mwc-random, parallel, primitive, Rlang-QQ, split, tasty
-     , tasty-hunit, tasty-quickcheck, vector
-     }:
-     mkDerivation {
-       pname = "clustering";
-       version = "0.2.1";
-       sha256 = "5078c28e185fd26770726cb2632ff043d99b6918d7a5d135c30bd53fc27ab9cb";
-       libraryHaskellDepends = [
-         base binary containers matrices mwc-random parallel primitive
-         vector
-       ];
-       testHaskellDepends = [
-         base binary hierarchical-clustering matrices mwc-random Rlang-QQ
-         split tasty tasty-hunit tasty-quickcheck vector
-       ];
-       description = "High performance clustering algorithms";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "clustering_0_3_1" = callPackage
     ({ mkDerivation, base, binary, containers, hierarchical-clustering
      , matrices, mwc-random, parallel, primitive, Rlang-QQ, split, tasty
      , tasty-hunit, tasty-quickcheck, unordered-containers, vector
@@ -43824,8 +41462,8 @@ self: {
      }:
      mkDerivation {
        pname = "colonnade";
-       version = "0.5";
-       sha256 = "ed16c4510b89ec592fe3f96eef3a3725173aa6184fb89efef604b19aef1d6fb3";
+       version = "1.0.0";
+       sha256 = "47280e7dc733a66d0e507492e2b5499115027911d6ab859e29c602308f7bdf08";
        libraryHaskellDepends = [
          base bytestring contravariant text vector
        ];
@@ -44110,8 +41748,8 @@ self: {
     ({ mkDerivation, attoparsec, base, QuickCheck, text }:
      mkDerivation {
        pname = "comma";
-       version = "1.0.1";
-       sha256 = "c038511aeb2c5651b853cfd64c0251103a3ae4ba4b722b752e070a8e6029df72";
+       version = "1.1.0";
+       sha256 = "fec0b23d79c39f3d19660dd2c7652c868de64590f8a9efe0115ab4b08b33befb";
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ base QuickCheck text ];
        homepage = "https://github.com/lovasko/comma";
@@ -45232,20 +42870,20 @@ self: {
 
   "conduit" = callPackage
     ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
-     , mmorph, monad-control, mtl, QuickCheck, resourcet, safe
+     , mmorph, monad-control, mtl, QuickCheck, resourcet, safe, split
      , transformers, transformers-base
      }:
      mkDerivation {
        pname = "conduit";
-       version = "1.2.8";
-       sha256 = "80d5df4c70adf2b7e87138c55fba25e05be30eaef0c9a7926d97ae0c0cdb17fb";
+       version = "1.2.9";
+       sha256 = "8adf9d8916dcb7abf86c4c82cc1c92e99dea8d0a9a5835302a824142d214cf06";
        libraryHaskellDepends = [
          base exceptions lifted-base mmorph monad-control mtl resourcet
          transformers transformers-base
        ];
        testHaskellDepends = [
          base containers exceptions hspec mtl QuickCheck resourcet safe
-         transformers
+         split transformers
        ];
        homepage = "http://github.com/snoyberg/conduit";
        description = "Streaming data processing library";
@@ -45328,34 +42966,6 @@ self: {
      }) {};
 
   "conduit-combinators" = callPackage
-    ({ mkDerivation, base, base16-bytestring, base64-bytestring
-     , bytestring, chunked-data, conduit, conduit-extra, containers
-     , directory, filepath, hspec, monad-control, mono-traversable, mtl
-     , mwc-random, primitive, QuickCheck, resourcet, safe, silently
-     , text, transformers, transformers-base, unix, unix-compat, vector
-     , void
-     }:
-     mkDerivation {
-       pname = "conduit-combinators";
-       version = "1.0.8.3";
-       sha256 = "3b81e379c4dcb1cb6212bcbad1d0714e46f400ebf9ae2abe23621db500406dbe";
-       libraryHaskellDepends = [
-         base base16-bytestring base64-bytestring bytestring chunked-data
-         conduit conduit-extra filepath monad-control mono-traversable
-         mwc-random primitive resourcet text transformers transformers-base
-         unix unix-compat vector void
-       ];
-       testHaskellDepends = [
-         base base16-bytestring base64-bytestring bytestring chunked-data
-         conduit containers directory filepath hspec mono-traversable mtl
-         mwc-random QuickCheck safe silently text transformers vector
-       ];
-       homepage = "https://github.com/snoyberg/mono-traversable";
-       description = "Commonly used conduit functions, for both chunked and unchunked data";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "conduit-combinators_1_1_0" = callPackage
     ({ mkDerivation, base, base16-bytestring, base64-bytestring
      , bytestring, chunked-data, conduit, conduit-extra, containers
      , directory, filepath, hspec, monad-control, mono-traversable, mtl
@@ -45381,7 +42991,6 @@ self: {
        homepage = "https://github.com/snoyberg/mono-traversable";
        description = "Commonly used conduit functions, for both chunked and unchunked data";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-connection" = callPackage
@@ -45985,8 +43594,8 @@ self: {
      }:
      mkDerivation {
        pname = "console-program";
-       version = "0.4.2.0";
-       sha256 = "a5476673bb36c25d7103aacffb9748dacf03f4cbafe94e3f16bc8950eececb7a";
+       version = "0.4.2.1";
+       sha256 = "fe8af591d5adcc26c3c8d7cb8830c8e162e8b7cfd3fd53fd36d17a90c1685bc1";
        libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint base containers directory haskeline
          parsec parsec-extra split transformers unix utility-ht
@@ -46072,23 +43681,6 @@ self: {
      }) {};
 
   "constraints" = callPackage
-    ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl
-     , transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "constraints";
-       version = "0.8";
-       sha256 = "4cd08765345a151f21a0a4c5ef0a85661f4e53ffe807a623d5502d9ed3ae1588";
-       libraryHaskellDepends = [
-         base binary deepseq ghc-prim hashable mtl transformers
-         transformers-compat
-       ];
-       homepage = "http://github.com/ekmett/constraints/";
-       description = "Constraint manipulation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "constraints_0_9" = callPackage
     ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl
      , transformers, transformers-compat
      }:
@@ -46103,7 +43695,6 @@ self: {
        homepage = "http://github.com/ekmett/constraints/";
        description = "Constraint manipulation";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "constructible" = callPackage
@@ -46134,30 +43725,6 @@ self: {
      }) {};
 
   "consul-haskell" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
-     , connection, either, http-client, http-client-tls, http-types
-     , HUnit, lifted-async, lifted-base, monad-control, network, stm
-     , tasty, tasty-hunit, text, transformers
-     }:
-     mkDerivation {
-       pname = "consul-haskell";
-       version = "0.3";
-       sha256 = "073efdcba614f92e3add447e21e5df032a1f46ec987aa3e12de2353e38121634";
-       libraryHaskellDepends = [
-         aeson base base64-bytestring bytestring connection either
-         http-client http-client-tls http-types lifted-async lifted-base
-         monad-control network stm text transformers
-       ];
-       testHaskellDepends = [
-         base http-client HUnit network tasty tasty-hunit text transformers
-       ];
-       homepage = "https://github.com/alphaHeavy/consul-haskell";
-       description = "A consul client for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "consul-haskell_0_4_2" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , connection, either, exceptions, http-client, http-client-tls
      , http-types, HUnit, lifted-async, lifted-base, monad-control
@@ -46262,15 +43829,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "containers_0_5_9_1" = callPackage
+  "containers_0_5_10_1" = callPackage
     ({ mkDerivation, array, base, ChasingBottoms, deepseq, ghc-prim
      , HUnit, QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2, transformers
      }:
      mkDerivation {
        pname = "containers";
-       version = "0.5.9.1";
-       sha256 = "132d2ab0d56a631fc883bc843c5661380135e19992f724897d24cf6ead450a23";
+       version = "0.5.10.1";
+       sha256 = "fa74241147e58084fe2520a376349df114b8280ddcd9062ae351fed20946d347";
        libraryHaskellDepends = [ array base deepseq ghc-prim ];
        testHaskellDepends = [
          array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck
@@ -47485,8 +45052,8 @@ self: {
      }:
      mkDerivation {
        pname = "cpphs";
-       version = "1.20.2";
-       sha256 = "dcb1d712a0f867c8a4fdd6e4ce7cbd33ce7912c76ac2db3a6157933fad8629db";
+       version = "1.20.3";
+       sha256 = "c63f0edb351f0977c2af6ad17c7164c44dc7c7499c0effe91d839fc7973dad91";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -47853,22 +45420,6 @@ self: {
      }) {crack = null;};
 
   "crackNum" = callPackage
-    ({ mkDerivation, base, data-binary-ieee754, ieee754 }:
-     mkDerivation {
-       pname = "crackNum";
-       version = "1.5";
-       sha256 = "ef41fe4afa6866a578b17f84ee231ed70493696fdca9fe54341e124215c1e205";
-       revision = "1";
-       editedCabalFile = "a8b9973ada5a3b5afbebd90991cf8913dc3f4c0f795ce8ebe61a0d4ff2802e13";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base data-binary-ieee754 ieee754 ];
-       executableHaskellDepends = [ base data-binary-ieee754 ieee754 ];
-       description = "Crack various integer, floating-point data formats";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "crackNum_1_9" = callPackage
     ({ mkDerivation, base, data-binary-ieee754, FloatingHex, ieee754 }:
      mkDerivation {
        pname = "crackNum";
@@ -47884,7 +45435,6 @@ self: {
        ];
        description = "Crack various integer, floating-point data formats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "craft" = callPackage
@@ -48081,6 +45631,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "credential-store" = callPackage
+    ({ mkDerivation, base, bytestring, containers, cryptonite, dbus
+     , memory, safe-exceptions, tasty, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "credential-store";
+       version = "0.1.0.0";
+       sha256 = "568ba9a4d8a40a1ae074e08da76a0ad48c6507047e6cf89999cc3c0ebafd0f29";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers cryptonite dbus memory safe-exceptions
+       ];
+       executableHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base bytestring tasty tasty-hunit ];
+       homepage = "https://github.com/rblaze/credential-store#readme";
+       description = "Library to access secure credential storage providers";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "credentials" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb
      , amazonka-kms, base, bytestring, conduit, cryptonite, exceptions
@@ -48229,38 +45799,6 @@ self: {
      }) {};
 
   "criterion" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring
-     , cassava, containers, deepseq, directory, filepath, Glob, hastache
-     , HUnit, mtl, mwc-random, optparse-applicative, parsec, QuickCheck
-     , statistics, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, time, transformers
-     , transformers-compat, vector, vector-algorithms
-     }:
-     mkDerivation {
-       pname = "criterion";
-       version = "1.1.1.0";
-       sha256 = "e71855a7a9cd946044b2137f31603e0578f6e517a2ed667a2b479990cc0949dd";
-       revision = "3";
-       editedCabalFile = "0e89cf15205fea2b90e95198774fba60839aab36fc67a695baa482d55013978e";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-wl-pprint base binary bytestring cassava containers
-         deepseq directory filepath Glob hastache mtl mwc-random
-         optparse-applicative parsec statistics text time transformers
-         transformers-compat vector vector-algorithms
-       ];
-       executableHaskellDepends = [ base optparse-applicative ];
-       testHaskellDepends = [
-         base bytestring HUnit QuickCheck statistics test-framework
-         test-framework-hunit test-framework-quickcheck2 vector
-       ];
-       homepage = "http://www.serpentine.com/criterion";
-       description = "Robust, reliable performance measurement and analysis";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "criterion_1_1_4_0" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring
      , cassava, code-page, containers, deepseq, directory, filepath
      , Glob, hastache, HUnit, js-flot, js-jquery, mtl, mwc-random
@@ -48287,7 +45825,6 @@ self: {
        homepage = "http://www.serpentine.com/criterion";
        description = "Robust, reliable performance measurement and analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "criterion-plus" = callPackage
@@ -48338,6 +45875,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "criu-rpc" = callPackage
+    ({ mkDerivation, base, criu-rpc-types, lens-family, network
+     , process, proto-lens, text, unix
+     }:
+     mkDerivation {
+       pname = "criu-rpc";
+       version = "0.0.2";
+       sha256 = "9c9e267eea934021575c15acadb3642292a78a9ebad136563cec43d65d0160ce";
+       libraryHaskellDepends = [
+         base criu-rpc-types lens-family network process proto-lens text
+         unix
+       ];
+       description = "CRIU RPC client";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "criu-rpc-types" = callPackage
     ({ mkDerivation, base, proto-lens, proto-lens-protoc, protobuf }:
      mkDerivation {
@@ -48384,29 +45937,6 @@ self: {
      }) {};
 
   "cron" = callPackage
-    ({ mkDerivation, attoparsec, base, generics-sop, mtl, mtl-compat
-     , old-locale, quickcheck-instances, semigroups, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, transformers-compat
-     }:
-     mkDerivation {
-       pname = "cron";
-       version = "0.4.2";
-       sha256 = "31f186b9237c802260a7c1468e9b81006c086df1d6ad3d0d6ef51d9d2e8d07d3";
-       revision = "1";
-       editedCabalFile = "5f6737e07b84d324ea03dc18096622a49b649c5eb372ef64e504695d442b0bde";
-       libraryHaskellDepends = [
-         attoparsec base mtl mtl-compat old-locale semigroups text time
-       ];
-       testHaskellDepends = [
-         attoparsec base generics-sop quickcheck-instances semigroups tasty
-         tasty-hunit tasty-quickcheck text time transformers-compat
-       ];
-       homepage = "http://github.com/michaelxavier/cron";
-       description = "Cron datatypes and Attoparsec parser";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "cron_0_5_0" = callPackage
     ({ mkDerivation, attoparsec, base, data-default-class, generics-sop
      , mtl, mtl-compat, old-locale, quickcheck-instances, semigroups
      , tasty, tasty-hunit, tasty-quickcheck, text, time
@@ -48427,7 +45957,6 @@ self: {
        homepage = "http://github.com/michaelxavier/cron";
        description = "Cron datatypes and Attoparsec parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cron-compat" = callPackage
@@ -49029,23 +46558,6 @@ self: {
      }) {};
 
   "cryptonite-conduit" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, conduit-extra
-     , cryptonite, resourcet, transformers
-     }:
-     mkDerivation {
-       pname = "cryptonite-conduit";
-       version = "0.1";
-       sha256 = "a79cd5bc2f86093bbc45290889ca5a9c502804a3c19188874bc2ff3f2a97aac0";
-       libraryHaskellDepends = [
-         base bytestring conduit conduit-extra cryptonite resourcet
-         transformers
-       ];
-       homepage = "https://github.com/haskell-crypto/cryptonite-conduit";
-       description = "cryptonite conduit";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cryptonite-conduit_0_2_0" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-combinators
      , conduit-extra, cryptonite, memory, resourcet, tasty, tasty-hunit
      , transformers
@@ -49065,7 +46577,6 @@ self: {
        homepage = "https://github.com/haskell-crypto/cryptonite-conduit";
        description = "cryptonite conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cryptonite-openssl" = callPackage
@@ -52156,6 +49667,24 @@ self: {
      }) {};
 
   "datasets" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cassava, directory
+     , file-embed, filepath, hashable, HTTP, stringsearch, text, time
+     , vector
+     }:
+     mkDerivation {
+       pname = "datasets";
+       version = "0.2.1";
+       sha256 = "af3d9e9093358b9b1a320645a0411c750e9b7ed723f3d29088b5addaeeeb1277";
+       libraryHaskellDepends = [
+         aeson base bytestring cassava directory file-embed filepath
+         hashable HTTP stringsearch text time vector
+       ];
+       homepage = "https://github.com/glutamate/datasets";
+       description = "Classical data sets for statistics and machine learning";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "datasets_0_2_3" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cassava, directory
      , file-embed, filepath, hashable, microlens, stringsearch, text
      , time, vector, wreq
@@ -52171,6 +49700,7 @@ self: {
        homepage = "https://github.com/glutamate/datasets";
        description = "Classical data sets for statistics and machine learning";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dataurl" = callPackage
@@ -52203,6 +49733,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "date-conversions" = callPackage
+    ({ mkDerivation, base, dates, hspec, QuickCheck, time }:
+     mkDerivation {
+       pname = "date-conversions";
+       version = "0.1.0.0";
+       sha256 = "16b3c0ab70c86b25af6202f5a4a9df442d3cdc095b18fd61082659524eac880c";
+       libraryHaskellDepends = [ base dates time ];
+       testHaskellDepends = [ base dates hspec QuickCheck time ];
+       homepage = "https://github.com/thoughtbot/date-conversions#readme";
+       description = "Date conversions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "dates" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, parsec, syb, time }:
      mkDerivation {
@@ -53087,25 +50630,6 @@ self: {
      }) {};
 
   "declarative" = callPackage
-    ({ mkDerivation, base, hasty-hamiltonian, lens, mcmc-types
-     , mighty-metropolis, mwc-probability, pipes, primitive
-     , speedy-slice, transformers
-     }:
-     mkDerivation {
-       pname = "declarative";
-       version = "0.2.3";
-       sha256 = "f6b0a65295f59d9c696257d667fa9995d9ebefc38b6d98a354fdc428d65d65aa";
-       libraryHaskellDepends = [
-         base hasty-hamiltonian lens mcmc-types mighty-metropolis
-         mwc-probability pipes primitive speedy-slice transformers
-       ];
-       testHaskellDepends = [ base mwc-probability ];
-       homepage = "http://github.com/jtobin/declarative";
-       description = "DIY Markov Chains";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "declarative_0_5_1" = callPackage
     ({ mkDerivation, base, hasty-hamiltonian, kan-extensions, lens
      , mcmc-types, mighty-metropolis, mwc-probability, pipes, primitive
      , speedy-slice, transformers
@@ -53123,7 +50647,6 @@ self: {
        homepage = "http://github.com/jtobin/declarative";
        description = "DIY Markov Chains";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "decode-utf8" = callPackage
@@ -53755,18 +51278,6 @@ self: {
      }) {};
 
   "dependent-sum" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "dependent-sum";
-       version = "0.3.2.2";
-       sha256 = "34fbe4675fa3a6ea7ca34913954657a3defee785bd39d55cffcf375f4a3cf864";
-       libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/mokus0/dependent-sum";
-       description = "Dependent sum type";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "dependent-sum_0_4" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "dependent-sum";
@@ -53776,7 +51287,6 @@ self: {
        homepage = "https://github.com/mokus0/dependent-sum";
        description = "Dependent sum type";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dependent-sum-template" = callPackage
@@ -54369,23 +51879,6 @@ self: {
      }) {};
 
   "diagrams" = callPackage
-    ({ mkDerivation, diagrams-contrib, diagrams-core, diagrams-lib
-     , diagrams-svg
-     }:
-     mkDerivation {
-       pname = "diagrams";
-       version = "1.3.0.1";
-       sha256 = "ee8abf5c262955a6a535ddc297bdf829ccd17bc179f61faf953371118ec4e4a7";
-       libraryHaskellDepends = [
-         diagrams-contrib diagrams-core diagrams-lib diagrams-svg
-       ];
-       doHaddock = false;
-       homepage = "http://projects.haskell.org/diagrams";
-       description = "Embedded domain-specific language for declarative vector graphics";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diagrams_1_4" = callPackage
     ({ mkDerivation, diagrams-contrib, diagrams-core, diagrams-lib
      , diagrams-svg
      }:
@@ -54400,7 +51893,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Embedded domain-specific language for declarative vector graphics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-boolean" = callPackage
@@ -54448,27 +51940,6 @@ self: {
      }) {};
 
   "diagrams-cairo" = callPackage
-    ({ mkDerivation, array, base, bytestring, cairo, colour, containers
-     , data-default-class, diagrams-core, diagrams-lib, filepath
-     , hashable, JuicyPixels, lens, mtl, optparse-applicative, pango
-     , split, statestack, transformers, unix, vector
-     }:
-     mkDerivation {
-       pname = "diagrams-cairo";
-       version = "1.3.1.1";
-       sha256 = "00c635a58a480033a2fc1240b703a4afab721f990e1412f57b8fa6becd6878b8";
-       libraryHaskellDepends = [
-         array base bytestring cairo colour containers data-default-class
-         diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl
-         optparse-applicative pango split statestack transformers unix
-         vector
-       ];
-       homepage = "http://projects.haskell.org/diagrams";
-       description = "Cairo backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diagrams-cairo_1_4" = callPackage
     ({ mkDerivation, array, base, bytestring, cairo, colour, containers
      , data-default-class, diagrams-core, diagrams-lib, filepath
      , hashable, JuicyPixels, lens, mtl, optparse-applicative, pango
@@ -54487,30 +51958,9 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Cairo backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-canvas" = callPackage
-    ({ mkDerivation, base, blank-canvas, cmdargs, containers
-     , data-default-class, diagrams-core, diagrams-lib, lens, mtl
-     , NumInstances, optparse-applicative, statestack, text
-     }:
-     mkDerivation {
-       pname = "diagrams-canvas";
-       version = "1.3.0.6";
-       sha256 = "20e905738a7a78061690fc55209041b2c3cdd6f6b6a534b6fdb75728a595a0ff";
-       libraryHaskellDepends = [
-         base blank-canvas cmdargs containers data-default-class
-         diagrams-core diagrams-lib lens mtl NumInstances
-         optparse-applicative statestack text
-       ];
-       homepage = "http://projects.haskell.org/diagrams/";
-       description = "HTML5 canvas backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "diagrams-canvas_1_4" = callPackage
     ({ mkDerivation, base, blank-canvas, cmdargs, containers
      , data-default-class, diagrams-core, diagrams-lib, lens, mtl
      , NumInstances, optparse-applicative, statestack, text
@@ -54531,33 +51981,6 @@ self: {
      }) {};
 
   "diagrams-contrib" = callPackage
-    ({ mkDerivation, base, circle-packing, colour, containers
-     , data-default, data-default-class, diagrams-core, diagrams-lib
-     , diagrams-solve, force-layout, HUnit, lens, linear, MonadRandom
-     , mtl, parsec, QuickCheck, random, semigroups, split
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text
-     }:
-     mkDerivation {
-       pname = "diagrams-contrib";
-       version = "1.3.0.12";
-       sha256 = "a576a63fc9f216558415303ace621e42778d5db08286b838dd850e9640279620";
-       libraryHaskellDepends = [
-         base circle-packing colour containers data-default
-         data-default-class diagrams-core diagrams-lib diagrams-solve
-         force-layout lens linear MonadRandom mtl parsec random semigroups
-         split text
-       ];
-       testHaskellDepends = [
-         base containers diagrams-lib HUnit QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2
-       ];
-       homepage = "http://projects.haskell.org/diagrams/";
-       description = "Collection of user contributions to diagrams EDSL";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diagrams-contrib_1_4_0_1" = callPackage
     ({ mkDerivation, base, circle-packing, colour, containers
      , cubicbezier, data-default, data-default-class, diagrams-core
      , diagrams-lib, diagrams-solve, force-layout, hashable, HUnit, lens
@@ -54584,28 +52007,9 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Collection of user contributions to diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-core" = callPackage
-    ({ mkDerivation, adjunctions, base, containers, distributive
-     , dual-tree, lens, linear, monoid-extras, mtl, semigroups
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "diagrams-core";
-       version = "1.3.0.8";
-       sha256 = "356f5fd77916422616e77fcdcde44aa76c0ff74c9ec9d56c20a54abd96459c73";
-       libraryHaskellDepends = [
-         adjunctions base containers distributive dual-tree lens linear
-         monoid-extras mtl semigroups unordered-containers
-       ];
-       homepage = "http://projects.haskell.org/diagrams";
-       description = "Core libraries for diagrams EDSL";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diagrams-core_1_4" = callPackage
     ({ mkDerivation, adjunctions, base, containers, distributive
      , dual-tree, lens, linear, monoid-extras, mtl, profunctors
      , semigroups, unordered-containers
@@ -54621,7 +52025,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Core libraries for diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-graphviz" = callPackage
@@ -54641,20 +52044,6 @@ self: {
      }) {};
 
   "diagrams-gtk" = callPackage
-    ({ mkDerivation, base, cairo, diagrams-cairo, diagrams-lib, gtk }:
-     mkDerivation {
-       pname = "diagrams-gtk";
-       version = "1.3.0.2";
-       sha256 = "ef4751e30f9b51ddb78f5310c5fd890ab9f26dd7cf409e3dbf39a96e73884c29";
-       libraryHaskellDepends = [
-         base cairo diagrams-cairo diagrams-lib gtk
-       ];
-       homepage = "http://projects.haskell.org/diagrams/";
-       description = "Backend for rendering diagrams directly to GTK windows";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diagrams-gtk_1_4" = callPackage
     ({ mkDerivation, base, cairo, diagrams-cairo, diagrams-lib, gtk }:
      mkDerivation {
        pname = "diagrams-gtk";
@@ -54666,7 +52055,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Backend for rendering diagrams directly to GTK windows";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-haddock" = callPackage
@@ -54720,25 +52108,6 @@ self: {
      }) {};
 
   "diagrams-html5" = callPackage
-    ({ mkDerivation, base, cmdargs, containers, data-default-class
-     , diagrams-core, diagrams-lib, lens, mtl, NumInstances
-     , optparse-applicative, split, statestack, static-canvas, text
-     }:
-     mkDerivation {
-       pname = "diagrams-html5";
-       version = "1.3.0.7";
-       sha256 = "8bddc55b95b6e0616552d09e59ae74ae315d296ef816552c5d7649035d49f7a4";
-       libraryHaskellDepends = [
-         base cmdargs containers data-default-class diagrams-core
-         diagrams-lib lens mtl NumInstances optparse-applicative split
-         statestack static-canvas text
-       ];
-       homepage = "http://projects.haskell.org/diagrams/";
-       description = "HTML5 canvas backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diagrams-html5_1_4" = callPackage
     ({ mkDerivation, base, cmdargs, containers, data-default-class
      , diagrams-core, diagrams-lib, lens, mtl, NumInstances
      , optparse-applicative, split, statestack, static-canvas, text
@@ -54755,36 +52124,9 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-lib" = callPackage
-    ({ mkDerivation, active, adjunctions, array, base, colour
-     , containers, data-default-class, diagrams-core, diagrams-solve
-     , directory, distributive, dual-tree, exceptions, filepath
-     , fingertree, fsnotify, hashable, intervals, JuicyPixels, lens
-     , linear, monoid-extras, mtl, optparse-applicative, process
-     , semigroups, tagged, tasty, tasty-hunit, text, transformers
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "diagrams-lib";
-       version = "1.3.1.4";
-       sha256 = "0ed2c2b81a872abc747dffcce74a7b19714f81a78dc44426d9d2baa999009617";
-       libraryHaskellDepends = [
-         active adjunctions array base colour containers data-default-class
-         diagrams-core diagrams-solve directory distributive dual-tree
-         exceptions filepath fingertree fsnotify hashable intervals
-         JuicyPixels lens linear monoid-extras mtl optparse-applicative
-         process semigroups tagged text transformers unordered-containers
-       ];
-       testHaskellDepends = [ base tasty tasty-hunit ];
-       homepage = "http://projects.haskell.org/diagrams";
-       description = "Embedded domain-specific language for declarative graphics";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diagrams-lib_1_4_0_1" = callPackage
     ({ mkDerivation, active, adjunctions, array, base, cereal, colour
      , containers, data-default-class, deepseq, diagrams-core
      , diagrams-solve, directory, distributive, dual-tree, exceptions
@@ -54815,7 +52157,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Embedded domain-specific language for declarative graphics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-pandoc" = callPackage
@@ -54885,25 +52226,6 @@ self: {
      }) {};
 
   "diagrams-postscript" = callPackage
-    ({ mkDerivation, base, containers, data-default-class
-     , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens
-     , monoid-extras, mtl, semigroups, split, statestack
-     }:
-     mkDerivation {
-       pname = "diagrams-postscript";
-       version = "1.3.0.7";
-       sha256 = "f045ad88def2ce2d8ebb641a7c48eacfe6d1eccf2baf42f50935ad2a21def751";
-       libraryHaskellDepends = [
-         base containers data-default-class diagrams-core diagrams-lib dlist
-         filepath hashable lens monoid-extras mtl semigroups split
-         statestack
-       ];
-       homepage = "http://projects.haskell.org/diagrams/";
-       description = "Postscript backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diagrams-postscript_1_4" = callPackage
     ({ mkDerivation, base, containers, data-default-class
      , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens
      , monoid-extras, mtl, semigroups, split, statestack
@@ -54920,7 +52242,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Postscript backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-qrcode" = callPackage
@@ -54940,28 +52261,6 @@ self: {
      }) {};
 
   "diagrams-rasterific" = callPackage
-    ({ mkDerivation, base, bytestring, containers, data-default-class
-     , diagrams-core, diagrams-lib, filepath, FontyFruity, hashable
-     , JuicyPixels, lens, mtl, optparse-applicative, Rasterific, split
-     , unix
-     }:
-     mkDerivation {
-       pname = "diagrams-rasterific";
-       version = "1.3.1.8";
-       sha256 = "b76001105055563e2a51f6dbff2e1c12547644014f748e7564f1ded42b75cb99";
-       revision = "1";
-       editedCabalFile = "9a5004b0563415202937cd437518f75c9910ff25c605630eed77456ce2238041";
-       libraryHaskellDepends = [
-         base bytestring containers data-default-class diagrams-core
-         diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl
-         optparse-applicative Rasterific split unix
-       ];
-       homepage = "http://projects.haskell.org/diagrams/";
-       description = "Rasterific backend for diagrams";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diagrams-rasterific_1_4" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default-class
      , diagrams-core, diagrams-lib, file-embed, filepath, FontyFruity
      , hashable, JuicyPixels, lens, mtl, optparse-applicative
@@ -54979,7 +52278,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Rasterific backend for diagrams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-reflex" = callPackage
@@ -55031,28 +52329,6 @@ self: {
      }) {};
 
   "diagrams-svg" = callPackage
-    ({ mkDerivation, base, base64-bytestring, bytestring, colour
-     , containers, diagrams-core, diagrams-lib, directory, filepath
-     , hashable, JuicyPixels, lens, monoid-extras, mtl, old-time
-     , optparse-applicative, process, semigroups, split, svg-builder
-     , text, time
-     }:
-     mkDerivation {
-       pname = "diagrams-svg";
-       version = "1.4.0.3";
-       sha256 = "1ed1579ea601d2061373e636f558765179981b3d70e62cf18adf0617c4bf59e5";
-       libraryHaskellDepends = [
-         base base64-bytestring bytestring colour containers diagrams-core
-         diagrams-lib directory filepath hashable JuicyPixels lens
-         monoid-extras mtl old-time optparse-applicative process semigroups
-         split svg-builder text time
-       ];
-       homepage = "http://projects.haskell.org/diagrams/";
-       description = "SVG backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diagrams-svg_1_4_1" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, colour
      , containers, diagrams-core, diagrams-lib, filepath, hashable
      , JuicyPixels, lens, monoid-extras, mtl, optparse-applicative
@@ -55070,7 +52346,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "SVG backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-tikz" = callPackage
@@ -55291,23 +52566,6 @@ self: {
      }) {};
 
   "diff3" = callPackage
-    ({ mkDerivation, base, Diff, QuickCheck, test-framework
-     , test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "diff3";
-       version = "0.2.0.3";
-       sha256 = "e84c84f03bd100c2ae950b218397fb6af1f838ca1fce8b876817610d65b0ae7d";
-       libraryHaskellDepends = [ base Diff ];
-       testHaskellDepends = [
-         base QuickCheck test-framework test-framework-quickcheck2
-       ];
-       homepage = "http://github.com/ocharles/diff3.git";
-       description = "Perform a 3-way difference of documents";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diff3_0_3_0" = callPackage
     ({ mkDerivation, base, Diff, QuickCheck, test-framework
      , test-framework-quickcheck2
      }:
@@ -55322,7 +52580,6 @@ self: {
        homepage = "http://github.com/ocharles/diff3.git";
        description = "Perform a 3-way difference of documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diffarray" = callPackage
@@ -55502,8 +52759,8 @@ self: {
      }:
      mkDerivation {
        pname = "digestive-functors-aeson";
-       version = "1.1.20";
-       sha256 = "017594d7489f33a2d162eb83f4f64bc110b3bd0cfb54982e3220ac3abc440bcc";
+       version = "1.1.21";
+       sha256 = "1f294cf79bd20f872545b84cf88acc3745304d342ff0253c52e948e53d304e78";
        libraryHaskellDepends = [
          aeson base containers digestive-functors lens lens-aeson safe text
          vector
@@ -56768,8 +54025,8 @@ self: {
     ({ mkDerivation, array, base, containers, MonadRandom, random }:
      mkDerivation {
        pname = "distribution";
-       version = "1.0.1.0";
-       sha256 = "c5777b37b0b200966f73c69d3586dd694fe13ab7e587c5d8fd23efad9cdc1f0e";
+       version = "1.1.0.0";
+       sha256 = "dbe2682b5fdf93c3e0d98f950926774a8c7bd9b443a41016e8f86e86e254810e";
        libraryHaskellDepends = [
          array base containers MonadRandom random
        ];
@@ -56840,29 +54097,6 @@ self: {
      }) {};
 
   "diversity" = callPackage
-    ({ mkDerivation, base, containers, data-ordlist, fasta
-     , math-functions, MonadRandom, optparse-applicative, parsec, pipes
-     , random-shuffle, scientific, split
-     }:
-     mkDerivation {
-       pname = "diversity";
-       version = "0.8.0.1";
-       sha256 = "06ee80a100424346e725777467173198a574d1df354cfd0051b0ee2983c1feba";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers data-ordlist fasta math-functions MonadRandom
-         parsec random-shuffle scientific split
-       ];
-       executableHaskellDepends = [
-         base containers fasta optparse-applicative pipes
-       ];
-       homepage = "https://github.com/GregorySchwartz/diversity";
-       description = "Quantify the diversity of a population";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "diversity_0_8_0_2" = callPackage
     ({ mkDerivation, base, containers, data-ordlist, fasta
      , math-functions, MonadRandom, optparse-applicative, parsec, pipes
      , random-shuffle, scientific, semigroups, split
@@ -56883,7 +54117,6 @@ self: {
        homepage = "https://github.com/GregorySchwartz/diversity";
        description = "Quantify the diversity of a population";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dixi" = callPackage
@@ -58193,28 +55426,6 @@ self: {
      }) {};
 
   "drifter-postgresql" = callPackage
-    ({ mkDerivation, base, drifter, either, mtl, postgresql-simple
-     , tasty, tasty-hunit, text, time
-     }:
-     mkDerivation {
-       pname = "drifter-postgresql";
-       version = "0.0.2";
-       sha256 = "07fbd1e08b517d2fde939657237c7a05f2b1d1abe276681ab7254b1ab8415190";
-       revision = "1";
-       editedCabalFile = "577c35da613b6dface440995d0428e846dc4014764a635b61aa3f4bd83fa2f6b";
-       libraryHaskellDepends = [
-         base drifter either mtl postgresql-simple time
-       ];
-       testHaskellDepends = [
-         base drifter either postgresql-simple tasty tasty-hunit text
-       ];
-       homepage = "http://github.com/michaelxavier/drifter-postgresql";
-       description = "PostgreSQL support for the drifter schema migration tool";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "drifter-postgresql_0_1_0" = callPackage
     ({ mkDerivation, base, containers, drifter, either, mtl
      , postgresql-simple, tasty, tasty-hunit, text, time
      }:
@@ -59081,6 +56292,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "earclipper" = callPackage
+    ({ mkDerivation, base, filepath, hspec }:
+     mkDerivation {
+       pname = "earclipper";
+       version = "0.0.0.1";
+       sha256 = "9f0adbe9e9520657a1af71f45b7b0476447ab8466664ddfcb83e0e31394e6615";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base filepath hspec ];
+       homepage = "https://github.com/zaidan/earclipper#readme";
+       description = "Ear Clipping Triangulation";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "easy-api" = callPackage
     ({ mkDerivation, aeson, base, bytestring, either, http-conduit, mtl
      , resourcet, text
@@ -59950,8 +57177,8 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-bosun";
-       version = "1.0.6";
-       sha256 = "1083f3fac91439ccd32d1d0fcdf0fd6a1885ef78c688f02082e6369dcbb5364f";
+       version = "1.0.7";
+       sha256 = "2266b9bd5f43108d9f386efd0c8fa1976e59ec2baa12ecefb815387a3a4be927";
        libraryHaskellDepends = [
          aeson base ekg-core http-client lens network network-uri old-locale
          text time unordered-containers vector wreq
@@ -59967,8 +57194,8 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-carbon";
-       version = "1.0.5";
-       sha256 = "a2617140efc624787954f73700a05a79aa466742ae054c50c415ddbb418ad661";
+       version = "1.0.6";
+       sha256 = "730398bdc04966332584439346e242554b5f0e03c38ff00243eee54c451225b5";
        libraryHaskellDepends = [
          base ekg-core network network-carbon text time unordered-containers
          vector
@@ -60233,23 +57460,6 @@ self: {
      }) {};
 
   "elm-bridge" = callPackage
-    ({ mkDerivation, aeson, base, containers, hspec, QuickCheck
-     , template-haskell, text
-     }:
-     mkDerivation {
-       pname = "elm-bridge";
-       version = "0.3.0.2";
-       sha256 = "d83389362bfdc0c526bc574b413136b578cc01b61a694eaf45325531e850192f";
-       libraryHaskellDepends = [ aeson base template-haskell ];
-       testHaskellDepends = [
-         aeson base containers hspec QuickCheck text
-       ];
-       homepage = "https://github.com/agrafix/elm-bridge";
-       description = "Derive Elm types from Haskell types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "elm-bridge_0_4_0" = callPackage
     ({ mkDerivation, aeson, base, containers, hspec, QuickCheck
      , template-haskell, text
      }:
@@ -60264,7 +57474,6 @@ self: {
        homepage = "https://github.com/agrafix/elm-bridge";
        description = "Derive Elm types from Haskell types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elm-build-lib" = callPackage
@@ -60367,8 +57576,8 @@ self: {
      }:
      mkDerivation {
        pname = "elm-export-persistent";
-       version = "0.1.1";
-       sha256 = "a1866db56266261df0d8e99acc0534c32db75c1314b0578c089f02e34cad7ca2";
+       version = "0.1.2";
+       sha256 = "bc45ef54b7538b0c8223a1b966cbd10a69dac3879897d2a75b148dcdc7d8de9d";
        libraryHaskellDepends = [
          aeson base elm-export persistent scientific text
          unordered-containers
@@ -60742,27 +57951,6 @@ self: {
      }) {};
 
   "emailaddress" = callPackage
-    ({ mkDerivation, aeson, base, bifunctors, bytestring, doctest
-     , email-validate, Glob, http-api-data, opaleye, path-pieces
-     , persistent, postgresql-simple, product-profunctors, profunctors
-     , text
-     }:
-     mkDerivation {
-       pname = "emailaddress";
-       version = "0.1.6.0";
-       sha256 = "5b81ba46a7228bad005cf0370a4762fac06729277355dc02085c4d81697c689d";
-       libraryHaskellDepends = [
-         aeson base bifunctors bytestring email-validate http-api-data
-         opaleye path-pieces persistent postgresql-simple
-         product-profunctors profunctors text
-       ];
-       testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/cdepillabout/emailaddress#readme";
-       description = "Wrapper around email-validate library adding instances for common type classes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "emailaddress_0_2_0_0" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, bytestring, doctest
      , email-validate, Glob, http-api-data, opaleye, path-pieces
      , persistent, postgresql-simple, product-profunctors, profunctors
@@ -60781,7 +57969,6 @@ self: {
        homepage = "https://github.com/cdepillabout/emailaddress#readme";
        description = "Wrapper around email-validate library adding instances for common type classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "emailparse" = callPackage
@@ -60991,8 +58178,8 @@ self: {
      }:
      mkDerivation {
        pname = "engine-io";
-       version = "1.2.14";
-       sha256 = "f321e826d56d7f14b4e027ddb57be59b2efa34a714e566e23a6bcee192ab6f33";
+       version = "1.2.15";
+       sha256 = "fb9430bec86f82463b7314c9d699441bd96a1681d6b1fac0bfd2cb4be7b9f9df";
        libraryHaskellDepends = [
          aeson async attoparsec base base64-bytestring bytestring either
          free monad-loops mwc-random stm stm-delay text transformers
@@ -61025,18 +58212,17 @@ self: {
      }) {};
 
   "engine-io-snap" = callPackage
-    ({ mkDerivation, attoparsec-enumerator, base, bytestring
-     , containers, engine-io, MonadCatchIO-transformers, snap-core
-     , unordered-containers, websockets, websockets-snap
+    ({ mkDerivation, base, bytestring, containers, engine-io
+     , io-streams, lifted-base, snap-core, unordered-containers
+     , websockets, websockets-snap
      }:
      mkDerivation {
        pname = "engine-io-snap";
-       version = "1.0.3";
-       sha256 = "6f411258df83db0466096a70f3b3eb78aee8de6e24ba68be9d7fe746564a4044";
+       version = "1.0.4";
+       sha256 = "687323f00aecb1196c5790aaac1361c055ffa3a1d4658a6ad963469e034779f0";
        libraryHaskellDepends = [
-         attoparsec-enumerator base bytestring containers engine-io
-         MonadCatchIO-transformers snap-core unordered-containers websockets
-         websockets-snap
+         base bytestring containers engine-io io-streams lifted-base
+         snap-core unordered-containers websockets websockets-snap
        ];
        homepage = "http://github.com/ocharles/engine.io";
        license = stdenv.lib.licenses.bsd3;
@@ -61315,19 +58501,6 @@ self: {
      }) {};
 
   "envelope" = callPackage
-    ({ mkDerivation, aeson, base, doctest, Glob, mtl, text }:
-     mkDerivation {
-       pname = "envelope";
-       version = "0.1.0.0";
-       sha256 = "9116ceda5b6e103219361bcd5cdaa699a1365a43df06e5752c61dfb6419b316e";
-       libraryHaskellDepends = [ aeson base mtl text ];
-       testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/cdepillabout/envelope#readme";
-       description = "Defines generic 'Envelope' type to wrap reponses from a JSON API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "envelope_0_2_1_0" = callPackage
     ({ mkDerivation, aeson, base, doctest, Glob, http-api-data, mtl
      , text
      }:
@@ -61340,7 +58513,6 @@ self: {
        homepage = "https://github.com/cdepillabout/envelope#readme";
        description = "Defines generic 'Envelope' type to wrap reponses from a JSON API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "envparse" = callPackage
@@ -61362,8 +58534,8 @@ self: {
      }:
      mkDerivation {
        pname = "envy";
-       version = "1.3.0.0";
-       sha256 = "ed2906c08163045e8b2ba22d591d79954e2b070b7643632e4e860ad09a7968bd";
+       version = "1.3.0.1";
+       sha256 = "ac630e03e9f4c8c99c39e622b9638c3bdc3b71300ef92597d60acac7ace8e85c";
        libraryHaskellDepends = [
          base bytestring containers mtl text time transformers
        ];
@@ -61582,8 +58754,8 @@ self: {
      }:
      mkDerivation {
        pname = "equivalence";
-       version = "0.3.1";
-       sha256 = "7a0539546e4fc1a00fb190109be45b0cb4af7047d8c2abaf65b8e401e828207e";
+       version = "0.3.2";
+       sha256 = "7da21ed5f980caa18c995190dd527c69822050390e4237c92f1acbed7d5b0529";
        libraryHaskellDepends = [
          base containers mtl STMonadTrans transformers transformers-compat
        ];
@@ -61592,7 +58764,7 @@ self: {
          test-framework test-framework-quickcheck2 transformers
          transformers-compat
        ];
-       homepage = "https://bitbucket.org/paba/equivalence/";
+       homepage = "https://github.com/pa-ba/equivalence";
        description = "Maintaining an equivalence relation implemented as union-find using STT";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -62508,32 +59680,6 @@ self: {
      }) {};
 
   "eventstore" = callPackage
-    ({ mkDerivation, aeson, array, async, base, bytestring, cereal
-     , connection, containers, dns, dotnet-timespan, http-client
-     , protobuf, random, semigroups, stm, tasty, tasty-hunit, text, time
-     , unordered-containers, uuid
-     }:
-     mkDerivation {
-       pname = "eventstore";
-       version = "0.13.1.2";
-       sha256 = "b519ae59c56c345cc2abe2bc6a779627d35c5553e9c0cfd51cb4aea4db9538fc";
-       libraryHaskellDepends = [
-         aeson array async base bytestring cereal connection containers dns
-         dotnet-timespan http-client protobuf random semigroups stm text
-         time unordered-containers uuid
-       ];
-       testHaskellDepends = [
-         aeson base connection dotnet-timespan stm tasty tasty-hunit text
-         time
-       ];
-       homepage = "http://github.com/YoEight/eventstore";
-       description = "EventStore TCP Client";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "x86_64-darwin" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "eventstore_0_14_0_1" = callPackage
     ({ mkDerivation, aeson, array, base, cereal, classy-prelude
      , connection, containers, dns, dotnet-timespan, http-client, mtl
      , protobuf, random, semigroups, stm, tasty, tasty-hunit, text, time
@@ -62849,21 +59995,22 @@ self: {
 
   "exherbo-cabal" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, Cabal
-     , containers, data-default, doctest, haddock-library, http-client
-     , http-types, optparse-applicative, pcre-light, pretty
+     , containers, data-default, deepseq, directory, doctest, filepath
+     , haddock-library, http-client, http-types, optparse-applicative
+     , pcre-light, pretty
      }:
      mkDerivation {
        pname = "exherbo-cabal";
-       version = "0.2.0.0";
-       sha256 = "f052683dc1c0ecd91dfae4c3c3200e6601615590b51549e756e8ccb5260a7d5f";
+       version = "0.2.1.1";
+       sha256 = "30b744eced087cbffc9b631e0e4cdd150bf78c13db2363411ddf3330a6c6da3d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base Cabal containers data-default haddock-library pretty
        ];
        executableHaskellDepends = [
-         ansi-wl-pprint base bytestring Cabal data-default http-client
-         http-types optparse-applicative pcre-light
+         ansi-wl-pprint base bytestring Cabal data-default deepseq directory
+         filepath http-client http-types optparse-applicative pcre-light
        ];
        testHaskellDepends = [ base doctest ];
        description = "Exheres generator for cabal packages";
@@ -63018,27 +60165,6 @@ self: {
      }) {};
 
   "exp-pairs" = callPackage
-    ({ mkDerivation, base, containers, deepseq, ghc-prim, matrix
-     , QuickCheck, random, smallcheck, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, wl-pprint
-     }:
-     mkDerivation {
-       pname = "exp-pairs";
-       version = "0.1.5.1";
-       sha256 = "cb83312447031547092d9eef5ee092494d624d8e0c6a314ea66b8ec006f3aa2f";
-       libraryHaskellDepends = [
-         base containers deepseq ghc-prim wl-pprint
-       ];
-       testHaskellDepends = [
-         base matrix QuickCheck random smallcheck tasty tasty-hunit
-         tasty-quickcheck tasty-smallcheck
-       ];
-       homepage = "https://github.com/Bodigrim/exp-pairs";
-       description = "Linear programming over exponent pairs";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "exp-pairs_0_1_5_2" = callPackage
     ({ mkDerivation, base, containers, deepseq, ghc-prim, matrix
      , QuickCheck, random, smallcheck, tasty, tasty-hunit
      , tasty-quickcheck, tasty-smallcheck, wl-pprint
@@ -63057,7 +60183,6 @@ self: {
        homepage = "https://github.com/Bodigrim/exp-pairs";
        description = "Linear programming over exponent pairs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "expand" = callPackage
@@ -63419,25 +60544,6 @@ self: {
      }) {};
 
   "extra" = callPackage
-    ({ mkDerivation, base, directory, filepath, process, QuickCheck
-     , time, unix
-     }:
-     mkDerivation {
-       pname = "extra";
-       version = "1.4.10";
-       sha256 = "b40b3f74c02e40697f4ba5242a764c2846921e8aafdd92e79a30a7afd9e56759";
-       libraryHaskellDepends = [
-         base directory filepath process time unix
-       ];
-       testHaskellDepends = [
-         base directory filepath QuickCheck time unix
-       ];
-       homepage = "https://github.com/ndmitchell/extra#readme";
-       description = "Extra functions I use";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "extra_1_5_1" = callPackage
     ({ mkDerivation, base, clock, directory, filepath, process
      , QuickCheck, time, unix
      }:
@@ -63454,7 +60560,6 @@ self: {
        homepage = "https://github.com/ndmitchell/extra#readme";
        description = "Extra functions I use";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extract-dependencies" = callPackage
@@ -63924,8 +61029,8 @@ self: {
      }:
      mkDerivation {
        pname = "fasta";
-       version = "0.10.4.0";
-       sha256 = "d37616f6107834ce47cc57163e9dddda055ef13b0400d74d6e77cbdd249f69da";
+       version = "0.10.4.1";
+       sha256 = "0a282adecb22764cd99c056cc0a871e29adac3568ba92b37eabf8f064ad6d482";
        libraryHaskellDepends = [
          attoparsec base bytestring containers foldl lens parsec pipes
          pipes-attoparsec pipes-bytestring pipes-group pipes-text split text
@@ -64049,37 +61154,6 @@ self: {
      }) {};
 
   "fay" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, bytestring, containers
-     , data-default, data-lens-light, directory, filepath, ghc-paths
-     , haskell-src-exts, language-ecmascript, mtl, mtl-compat
-     , optparse-applicative, process, safe, sourcemap, split, spoon, syb
-     , text, time, transformers, transformers-compat
-     , traverse-with-class, type-eq, uniplate, unordered-containers
-     , utf8-string, vector
-     }:
-     mkDerivation {
-       pname = "fay";
-       version = "0.23.1.12";
-       sha256 = "3d9c0a64f6d30923e2e45f27c043a7fa4f451c676466c8ca5b69a4121462f727";
-       revision = "6";
-       editedCabalFile = "4dd008fc4b03b8fc6e67eff2fb1c42b4f5552529bdd4f63f4290ef25a5327e0b";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base base-compat bytestring containers data-default
-         data-lens-light directory filepath ghc-paths haskell-src-exts
-         language-ecmascript mtl mtl-compat process safe sourcemap split
-         spoon syb text time transformers transformers-compat
-         traverse-with-class type-eq uniplate unordered-containers
-         utf8-string vector
-       ];
-       executableHaskellDepends = [ base mtl optparse-applicative split ];
-       homepage = "https://github.com/faylang/fay/wiki";
-       description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fay_0_23_1_16" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring, containers
      , data-default, data-lens-light, directory, filepath, ghc-paths
      , haskell-src-exts, language-ecmascript, mtl, mtl-compat
@@ -64108,7 +61182,6 @@ self: {
        homepage = "https://github.com/faylang/fay/wiki";
        description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay-base" = callPackage
@@ -65809,18 +62882,6 @@ self: {
      }) {};
 
   "fixed-vector" = callPackage
-    ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }:
-     mkDerivation {
-       pname = "fixed-vector";
-       version = "0.8.1.0";
-       sha256 = "3c3c29c7248c08061949843727e83ad234584ca77f8076ecd9537a185ebe3a93";
-       libraryHaskellDepends = [ base deepseq primitive ];
-       testHaskellDepends = [ base doctest filemanip primitive ];
-       description = "Generic vectors with statically known size";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fixed-vector_0_9_0_0" = callPackage
     ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }:
      mkDerivation {
        pname = "fixed-vector";
@@ -65830,7 +62891,6 @@ self: {
        testHaskellDepends = [ base doctest filemanip primitive ];
        description = "Generic vectors with statically known size";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fixed-vector-binary" = callPackage
@@ -66162,24 +63222,6 @@ self: {
      }) {};
 
   "flat-mcmc" = callPackage
-    ({ mkDerivation, base, mcmc-types, monad-par, monad-par-extras
-     , mwc-probability, pipes, primitive, transformers, vector
-     }:
-     mkDerivation {
-       pname = "flat-mcmc";
-       version = "1.0.1";
-       sha256 = "a2852f0b020b086fa9e28e63b502a7bbdcbc4151080ce01baa366d53362de774";
-       libraryHaskellDepends = [
-         base mcmc-types monad-par monad-par-extras mwc-probability pipes
-         primitive transformers vector
-       ];
-       testHaskellDepends = [ base vector ];
-       homepage = "http://jtobin.github.com/flat-mcmc";
-       description = "Painless general-purpose sampling";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "flat-mcmc_1_5_0" = callPackage
     ({ mkDerivation, base, formatting, mcmc-types, monad-par
      , monad-par-extras, mwc-probability, pipes, primitive, text
      , transformers, vector
@@ -66196,7 +63238,6 @@ self: {
        homepage = "https://github.com/jtobin/flat-mcmc";
        description = "Painless general-purpose sampling";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flat-tex" = callPackage
@@ -66603,8 +63644,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.0.6";
-       sha256 = "aef86dd12b001265c4e3ab15edea6cdae8f795baafc8a32764740179c2159fdd";
+       version = "0.5.0.7";
+       sha256 = "428add7568eea3e7b813b7ae89d824d7a97e8810662aa5371357b17f630dccde";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal ];
@@ -67007,6 +64048,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "folgerhs" = callPackage
+    ({ mkDerivation, base, xml }:
+     mkDerivation {
+       pname = "folgerhs";
+       version = "0.1.0.0";
+       sha256 = "fbaf6da3ce10a7bf33ab696b807e475613257080679a36933cb3097b82df7abf";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base xml ];
+       executableHaskellDepends = [ base xml ];
+       homepage = "https://github.com/SU-LOSP/tools#readme";
+       description = "Toolset for Folger Shakespeare Library's XML annotated plays";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "follower" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, cmdargs, directory, filepath
      , hs-twitter, old-locale, strict, time
@@ -68644,15 +65700,16 @@ self: {
      }) {};
 
   "ftp-client" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, connection, network
-     , transformers
+    ({ mkDerivation, attoparsec, base, bytestring, connection
+     , exceptions, network, transformers
      }:
      mkDerivation {
        pname = "ftp-client";
-       version = "0.3.0.0";
-       sha256 = "f21e6669f32eb088b51a1770cd8eaf66f6af97cb27ae5254ab9ed971325da3da";
+       version = "0.4.0.0";
+       sha256 = "6742576a894fbebe30a4f4b55d78baf03ae0e0d068d9704d7d41c33077bd93c7";
        libraryHaskellDepends = [
-         attoparsec base bytestring connection network transformers
+         attoparsec base bytestring connection exceptions network
+         transformers
        ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/mr/ftp-client";
@@ -68661,15 +65718,15 @@ self: {
      }) {};
 
   "ftp-client-conduit" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, connection, ftp-client
-     , ftp-clientconduit, resourcet
+    ({ mkDerivation, base, bytestring, conduit, connection, exceptions
+     , ftp-client, ftp-clientconduit, resourcet
      }:
      mkDerivation {
        pname = "ftp-client-conduit";
-       version = "0.3.0.0";
-       sha256 = "dc5fd4556567f3d902b4d2a8511dc4732de2a26b0206f7af1e5c9e602ec00c52";
+       version = "0.4.0.0";
+       sha256 = "cdfea17aa55aaceba29f627b24bc6f0d6c350578e0675e3ec8161bafbe76004f";
        libraryHaskellDepends = [
-         base bytestring conduit connection ftp-client resourcet
+         base bytestring conduit connection exceptions ftp-client resourcet
        ];
        testHaskellDepends = [ base ftp-clientconduit ];
        homepage = "https://github.com/mr/ftp-client";
@@ -70360,21 +67417,6 @@ self: {
      }) {};
 
   "genvalidity" = callPackage
-    ({ mkDerivation, base, hspec, QuickCheck, validity }:
-     mkDerivation {
-       pname = "genvalidity";
-       version = "0.2.0.4";
-       sha256 = "dca8c978f6bedb08199042fa7001dc94143cc69bb3bfc0d4dc90346a19ca8e57";
-       revision = "2";
-       editedCabalFile = "6865bde6373f043b1411042b9837392bcc3662c1ed78fa1b53f905af3fbb3461";
-       libraryHaskellDepends = [ base QuickCheck validity ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
-       description = "Testing utilities for the validity library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "genvalidity_0_3_0_0" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck, validity }:
      mkDerivation {
        pname = "genvalidity";
@@ -70387,7 +67429,6 @@ self: {
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Testing utilities for the validity library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-containers" = callPackage
@@ -70411,25 +67452,6 @@ self: {
      }) {};
 
   "genvalidity-hspec" = callPackage
-    ({ mkDerivation, base, doctest, genvalidity, hspec, QuickCheck
-     , validity
-     }:
-     mkDerivation {
-       pname = "genvalidity-hspec";
-       version = "0.2.0.5";
-       sha256 = "af4b3a7db29bc9cfe9f10de84256350de91a67d6d3676c8fb269dddf32bce62b";
-       revision = "1";
-       editedCabalFile = "34c42da21c1b3a5120be73a5b01f005d3c9278c8b45bce87b8d10b25d185db46";
-       libraryHaskellDepends = [
-         base genvalidity hspec QuickCheck validity
-       ];
-       testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
-       description = "Standard spec's for GenValidity instances";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "genvalidity-hspec_0_3_0_0" = callPackage
     ({ mkDerivation, base, doctest, genvalidity, hspec, QuickCheck
      , validity
      }:
@@ -70446,7 +67468,6 @@ self: {
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Standard spec's for GenValidity instances";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-hspec-aeson" = callPackage
@@ -71037,21 +68058,21 @@ self: {
      }) {};
 
   "ghc-exactprint" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, filemanip
-     , filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl, silently
-     , syb
+    ({ mkDerivation, base, bytestring, containers, Diff, directory
+     , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
+     , silently, syb
      }:
      mkDerivation {
        pname = "ghc-exactprint";
-       version = "0.5.2.1";
-       sha256 = "756d6d0a706321a3ccd0b3c11c6cee65b5ecce95a988dda540e4f6743a602f08";
+       version = "0.5.3.0";
+       sha256 = "90e088b04a5b72d7c502049a201180bd593912d831d48b605582882dc9bc332d";
        libraryHaskellDepends = [
          base bytestring containers directory filepath free ghc ghc-boot
          ghc-paths mtl syb
        ];
        testHaskellDepends = [
-         base containers directory filemanip filepath ghc ghc-boot ghc-paths
-         HUnit mtl silently syb
+         base bytestring containers Diff directory filemanip filepath ghc
+         ghc-boot ghc-paths HUnit mtl silently syb
        ];
        description = "ExactPrint for GHC";
        license = stdenv.lib.licenses.bsd3;
@@ -71168,45 +68189,6 @@ self: {
      }) {};
 
   "ghc-mod" = callPackage
-    ({ mkDerivation, base, binary, bytestring, Cabal, cabal-helper
-     , containers, deepseq, directory, djinn-ghc, doctest, extra
-     , fclabels, filepath, ghc, ghc-boot, ghc-paths, ghc-syb-utils
-     , haskell-src-exts, hlint, hspec, monad-control, monad-journal, mtl
-     , old-time, optparse-applicative, pipes, pretty, process, safe
-     , split, syb, template-haskell, temporary, text, time, transformers
-     , transformers-base
-     }:
-     mkDerivation {
-       pname = "ghc-mod";
-       version = "5.6.0.0";
-       sha256 = "69b880410c028e9b7bf60c67120eeb567927fc6fba4df5400b057eba9efaa20e";
-       revision = "4";
-       editedCabalFile = "c432e3b9ee808551fe785d6c61b9daa8370add1a6a9b7ec1a25869e2122cd3e4";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [
-         base Cabal containers filepath process template-haskell
-         transformers
-       ];
-       libraryHaskellDepends = [
-         base binary bytestring cabal-helper containers deepseq directory
-         djinn-ghc extra fclabels filepath ghc ghc-boot ghc-paths
-         ghc-syb-utils haskell-src-exts hlint monad-control monad-journal
-         mtl old-time optparse-applicative pipes pretty process safe split
-         syb template-haskell temporary text time transformers
-         transformers-base
-       ];
-       executableHaskellDepends = [
-         base binary deepseq directory fclabels filepath ghc monad-control
-         mtl old-time optparse-applicative pretty process split time
-       ];
-       testHaskellDepends = [ base doctest hspec ];
-       homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
-       description = "Happy Haskell Programming";
-       license = stdenv.lib.licenses.agpl3;
-     }) {};
-
-  "ghc-mod_5_7_0_0" = callPackage
     ({ mkDerivation, base, binary, bytestring, Cabal, cabal-helper
      , containers, deepseq, directory, djinn-ghc, doctest, extra
      , fclabels, filepath, ghc, ghc-boot, ghc-paths, ghc-syb-utils
@@ -71244,7 +68226,6 @@ self: {
        homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
        description = "Happy Haskell Programming";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-mtl" = callPackage
@@ -71884,17 +68865,6 @@ self: {
      }) {};
 
   "ghcjs-perch" = callPackage
-    ({ mkDerivation, base, transformers }:
-     mkDerivation {
-       pname = "ghcjs-perch";
-       version = "0.3.3";
-       sha256 = "89691df04bf1c056df7f66969a25a15c8ab7edeaaa36afdd01d15b7f21049416";
-       libraryHaskellDepends = [ base transformers ];
-       description = "GHCJS version of Perch library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ghcjs-perch_0_3_3_1" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "ghcjs-perch";
@@ -71903,7 +68873,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "GHCJS version of Perch library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghcjs-promise" = callPackage
@@ -72034,25 +69003,6 @@ self: {
      }) {};
 
   "gi-atk" = callPackage
-    ({ mkDerivation, atk, base, bytestring, containers, gi-glib
-     , gi-gobject, haskell-gi, haskell-gi-base, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-atk";
-       version = "2.0.3";
-       sha256 = "3470813961cc6223c02b29cceaede04966b4e5ed497748bd0a61c023d7142620";
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject haskell-gi
-         haskell-gi-base text transformers
-       ];
-       libraryPkgconfigDepends = [ atk ];
-       doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Atk bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) atk;};
-
-  "gi-atk_2_0_11" = callPackage
     ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, haskell-gi, haskell-gi-base, text, transformers
      }:
@@ -72070,35 +69020,9 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Atk bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) atk;};
 
   "gi-cairo" = callPackage
-    ({ mkDerivation, base, bytestring, cairo, containers
-     , gobjectIntrospection, haskell-gi, haskell-gi-base, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "gi-cairo";
-       version = "1.0.3";
-       sha256 = "0b54aff46b1998285a79a7356c5a74699112d6b09f1952bb30622ee6b53afe8b";
-       libraryHaskellDepends = [
-         base bytestring containers haskell-gi haskell-gi-base text
-         transformers
-       ];
-       libraryPkgconfigDepends = [ cairo gobjectIntrospection ];
-       doHaddock = false;
-       preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0'';
-       preCompileBuildDriver = ''
-         PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
-         setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
-       '';
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Cairo bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection;};
-
-  "gi-cairo_1_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
      , gobjectIntrospection, haskell-gi, haskell-gi-base, text
      , transformers
@@ -72122,32 +69046,9 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Cairo bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection;};
 
   "gi-gdk" = callPackage
-    ({ mkDerivation, base, bytestring, 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.3";
-       sha256 = "12bd380233f41a43479891a3f731391b7ecd1d74712f263f835089cb8090be4b";
-       libraryHaskellDepends = [
-         base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib
-         gi-gobject gi-pango haskell-gi haskell-gi-base text transformers
-       ];
-       libraryPkgconfigDepends = [ gtk3 ];
-       doHaddock = false;
-       preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gtk3.dev}/share/gir-1.0'';
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Gdk bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {gtk3 = pkgs.gnome3.gtk;};
-
-  "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
@@ -72171,31 +69072,6 @@ self: {
      }) {gtk3 = pkgs.gnome3.gtk;};
 
   "gi-gdkpixbuf" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gdk_pixbuf, gi-gio
-     , gi-glib, gi-gobject, gobjectIntrospection, haskell-gi
-     , haskell-gi-base, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-gdkpixbuf";
-       version = "2.0.3";
-       sha256 = "5c1dcc322ad42839c74e5be2fb715f29bfa1f06d285ea4e90d2f3a19a6f545c9";
-       libraryHaskellDepends = [
-         base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
-         haskell-gi-base text transformers
-       ];
-       libraryPkgconfigDepends = [ gdk_pixbuf gobjectIntrospection ];
-       doHaddock = false;
-       preConfigure = ''
-         export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0:${gdk_pixbuf.dev}/share/gir-1.0
-         export GI_TYPELIB_PATH=${gdk_pixbuf.out}/lib/girepository-1.0
-       '';
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "GdkPixbuf bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) gdk_pixbuf; 
-         inherit (pkgs) gobjectIntrospection;};
-
-  "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
@@ -72218,32 +69094,10 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GdkPixbuf bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gdk_pixbuf; 
          inherit (pkgs) gobjectIntrospection;};
 
   "gi-gio" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gi-glib, gi-gobject
-     , glib, gobjectIntrospection, haskell-gi, haskell-gi-base, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "gi-gio";
-       version = "2.0.3";
-       sha256 = "1b2cc15f3cb60b72a7256ec8b5d0a07644b850055ae45fab5b0be9633d96f09c";
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject haskell-gi
-         haskell-gi-base text transformers
-       ];
-       libraryPkgconfigDepends = [ glib gobjectIntrospection ];
-       doHaddock = false;
-       preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0'';
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Gio bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
-
-  "gi-gio_2_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, glib, gobjectIntrospection, haskell-gi
      , haskell-gi-base, text, transformers
@@ -72263,7 +69117,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Gio bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
 
   "gi-girepository" = callPackage
@@ -72289,27 +69142,6 @@ self: {
      }) {inherit (pkgs) gobjectIntrospection;};
 
   "gi-glib" = callPackage
-    ({ mkDerivation, base, bytestring, containers, glib
-     , gobjectIntrospection, haskell-gi, haskell-gi-base, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "gi-glib";
-       version = "2.0.3";
-       sha256 = "2a961091547deaf8509ef3213353ec7b6ea458a584a81eef7d2685f8312b1170";
-       libraryHaskellDepends = [
-         base bytestring containers haskell-gi haskell-gi-base text
-         transformers
-       ];
-       libraryPkgconfigDepends = [ glib gobjectIntrospection ];
-       doHaddock = false;
-       preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0'';
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "GLib bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
-
-  "gi-glib_2_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, glib
      , gobjectIntrospection, haskell-gi, haskell-gi-base, text
      , transformers
@@ -72329,31 +69161,9 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GLib bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
 
   "gi-gobject" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gi-glib, glib
-     , gobjectIntrospection, haskell-gi, haskell-gi-base, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "gi-gobject";
-       version = "2.0.3";
-       sha256 = "9cd5c2c8a2c1599334f705ea15fc3e7e63f012c60a46669ad108a2965d73973b";
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib haskell-gi haskell-gi-base text
-         transformers
-       ];
-       libraryPkgconfigDepends = [ glib gobjectIntrospection ];
-       doHaddock = false;
-       preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0'';
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "GObject bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
-
-  "gi-gobject_2_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
      , gobjectIntrospection, haskell-gi, haskell-gi-base, text
      , transformers
@@ -72373,7 +69183,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GObject bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
 
   "gi-gst" = callPackage
@@ -72471,29 +69280,6 @@ self: {
          gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;};
 
   "gi-gtk" = callPackage
-    ({ mkDerivation, base, bytestring, 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.3";
-       sha256 = "490acc92f75b231e9770b5bba2e041c2e3cd163c5e6483a153f072b0b6987c31";
-       libraryHaskellDepends = [
-         base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
-         gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base text
-         transformers
-       ];
-       libraryPkgconfigDepends = [ gtk3 ];
-       doHaddock = false;
-       preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gtk3.dev}/share/gir-1.0'';
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Gtk bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {gtk3 = pkgs.gnome3.gtk;};
-
-  "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
@@ -72583,13 +69369,14 @@ self: {
      }) {inherit (pkgs.gnome2) gtksourceview;};
 
   "gi-javascriptcore" = callPackage
-    ({ mkDerivation, base, bytestring, containers, haskell-gi
+    ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
      , haskell-gi-base, javascriptcoregtk, text, transformers, webkitgtk
      }:
      mkDerivation {
        pname = "gi-javascriptcore";
-       version = "3.0.3";
-       sha256 = "b2d01c9b72c4da8b2ebe28cc515a6ecbf0f1eed23519b5cabe3f7381872df974";
+       version = "3.0.11";
+       sha256 = "88f288c8e70dace97422b7385f77a4d7f856e4a2f5940abc4d41947ec76bb250";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers haskell-gi haskell-gi-base text
          transformers
@@ -72648,33 +69435,6 @@ self: {
      }) {inherit (pkgs) libnotify;};
 
   "gi-pango" = callPackage
-    ({ mkDerivation, base, bytestring, cairo, containers, gi-glib
-     , gi-gobject, gobjectIntrospection, haskell-gi, haskell-gi-base
-     , pango, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-pango";
-       version = "1.0.3";
-       sha256 = "d1a5f97c17038967573576e2eba05207e1d6d8c89a704d87767681e858fb0257";
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject haskell-gi
-         haskell-gi-base text transformers
-       ];
-       libraryPkgconfigDepends = [ cairo gobjectIntrospection pango ];
-       doHaddock = false;
-       preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0'';
-       preCompileBuildDriver = ''
-         PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
-         setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
-       '';
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Pango bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection; 
-         inherit (pkgs.gnome2) pango;};
-
-  "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
@@ -72757,26 +69517,6 @@ self: {
      }) {inherit (pkgs) poppler;};
 
   "gi-soup" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gi-gio, gi-glib
-     , gi-gobject, haskell-gi, haskell-gi-base, libsoup, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "gi-soup";
-       version = "2.4.3";
-       sha256 = "ee786ad3b35b6468f53f3962611e5316a020bdf98d9b4050a598f7b45a575a4b";
-       libraryHaskellDepends = [
-         base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
-         haskell-gi-base text transformers
-       ];
-       libraryPkgconfigDepends = [ libsoup ];
-       doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Libsoup bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs.gnome2) libsoup;};
-
-  "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
@@ -72795,7 +69535,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Libsoup bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome2) libsoup;};
 
   "gi-vte" = callPackage
@@ -72821,29 +69560,6 @@ self: {
      }) {inherit (pkgs.gnome2) vte;};
 
   "gi-webkit" = callPackage
-    ({ mkDerivation, 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, haskell-gi-base, text
-     , transformers, webkit
-     }:
-     mkDerivation {
-       pname = "gi-webkit";
-       version = "3.0.3";
-       sha256 = "8652475bdd3bd713a2eb6ceb55c4ab81bf0939824d707dfe888e007c782fd216";
-       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 haskell-gi-base text transformers
-       ];
-       libraryPkgconfigDepends = [ webkit ];
-       doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "WebKit bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {webkit = null;};
-
-  "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
@@ -73045,33 +69761,6 @@ self: {
      }) {};
 
   "giphy-api" = callPackage
-    ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
-     , directory, hspec, http-api-data, http-client, http-client-tls
-     , lens, microlens, microlens-th, mtl, network-uri, servant
-     , servant-client, text, transformers
-     }:
-     mkDerivation {
-       pname = "giphy-api";
-       version = "0.4.0.0";
-       sha256 = "bb2952f54232cead3e66350b514ca31aac511bf172be45115b98dd8777859876";
-       revision = "2";
-       editedCabalFile = "bf615e33d6be695e26434f8cb6747bb91be136093e0181eb85efe415c689d9f5";
-       libraryHaskellDepends = [
-         aeson base containers http-api-data http-client http-client-tls
-         microlens microlens-th mtl network-uri servant servant-client text
-         transformers
-       ];
-       testHaskellDepends = [
-         aeson base basic-prelude bytestring containers directory hspec lens
-         network-uri text
-       ];
-       homepage = "http://github.com/passy/giphy-api#readme";
-       description = "Giphy HTTP API wrapper and CLI search tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "giphy-api_0_5_2_0" = callPackage
     ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
      , directory, hspec, http-api-data, http-client, http-client-tls
      , lens, microlens, microlens-th, mtl, network-uri, servant
@@ -73515,8 +70204,8 @@ self: {
      }:
      mkDerivation {
        pname = "gitHUD";
-       version = "1.3.5";
-       sha256 = "7956019a42632f8658ba9a6508943fd212e9796657252eedec53f48850a07009";
+       version = "1.3.6";
+       sha256 = "a522924926b65d19601726fb5fde020c0523f0b30c95d6bb1e0ba0d751da8a49";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec process text unix ];
@@ -74066,6 +70755,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "gjk" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "gjk";
+       version = "0.0.0.1";
+       sha256 = "8a1dc10dffd485632bb519db13abbfd6a6f9c3cbdc12f33a8c8c6a0359dc104f";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/zaidan/gjk#readme";
+       description = "Gilbert-Johnson-Keerthi (GJK) collision detection algorithm";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "gl" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, fixed, half
      , hxt, mesa, split, transformers
@@ -74095,27 +70797,6 @@ self: {
      }) {};
 
   "glabrous" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
-     , cereal, cereal-text, directory, either, hspec, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "glabrous";
-       version = "0.1.3.0";
-       sha256 = "a9afb52cb80e5a9a1ef6bd77897229e7aa29d8fb2b863019d346357792600576";
-       libraryHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring cereal cereal-text
-         either text unordered-containers
-       ];
-       testHaskellDepends = [
-         base directory either hspec text unordered-containers
-       ];
-       homepage = "https://github.com/MichelBoucey/glabrous";
-       description = "A template DSL library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "glabrous_0_3_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , cereal, cereal-text, directory, either, hspec, text
      , unordered-containers
@@ -74134,7 +70815,6 @@ self: {
        homepage = "https://github.com/MichelBoucey/glabrous";
        description = "A template DSL library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glade" = callPackage
@@ -74250,6 +70930,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "glazier-pipes" = callPackage
+    ({ mkDerivation, base, glazier, lens, mmorph, mtl, pipes
+     , pipes-concurrency, pipes-misc, stm, stm-extras, transformers
+     }:
+     mkDerivation {
+       pname = "glazier-pipes";
+       version = "0.1.4.0";
+       sha256 = "351c8002e893ad8cbb6a8eeb2b54c79b3b13665f110180a52d297f85d0a086cc";
+       libraryHaskellDepends = [
+         base glazier lens mmorph mtl pipes pipes-concurrency pipes-misc stm
+         stm-extras transformers
+       ];
+       homepage = "https://github.com/louispan/glazier-pipes#readme";
+       description = "Converts Glazier widgets into a Pipe";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gli" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , friendly-time, http-client, http-client-tls, http-conduit
@@ -74372,8 +71069,8 @@ self: {
      }:
      mkDerivation {
        pname = "gll";
-       version = "0.4.0.2";
-       sha256 = "89ee909a9120d6fa34f718079fca0e07f18ce20be93573caafa506ee72ec7818";
+       version = "0.4.0.3";
+       sha256 = "9be9e20690fa8e54e6068eaa89c676a704438efa40c2ccfd8e7d8f9a7b5d418f";
        libraryHaskellDepends = [
          array base containers pretty regex-applicative text TypeCompose
        ];
@@ -75172,30 +71869,6 @@ self: {
      }) {};
 
   "gogol" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit
-     , conduit-extra, cryptonite, data-default-class, directory
-     , exceptions, filepath, gogol-core, http-client, http-conduit
-     , http-media, http-types, lens, memory, mime-types, monad-control
-     , mtl, resourcet, text, time, transformers, transformers-base
-     , unordered-containers, x509, x509-store
-     }:
-     mkDerivation {
-       pname = "gogol";
-       version = "0.1.0";
-       sha256 = "3bf4a133da2f9e5343025a272d04290a2d229d3429d748b2a49b9b29b85e398e";
-       libraryHaskellDepends = [
-         aeson base bytestring case-insensitive conduit conduit-extra
-         cryptonite data-default-class directory exceptions filepath
-         gogol-core http-client http-conduit http-media http-types lens
-         memory mime-types monad-control mtl resourcet text time
-         transformers transformers-base unordered-containers x509 x509-store
-       ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Comprehensive Google Services SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol_0_1_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit
      , conduit-extra, cryptonite, directory, exceptions, filepath
      , gogol-core, http-client, http-conduit, http-media, http-types
@@ -75217,22 +71890,34 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Comprehensive Google Services SDK";
        license = "unknown";
+     }) {};
+
+  "gogol_0_2_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit
+     , conduit-extra, cryptonite, directory, exceptions, filepath
+     , gogol-core, http-client, http-conduit, http-media, http-types
+     , lens, memory, mime-types, monad-control, mtl, resourcet, text
+     , time, transformers, transformers-base, unordered-containers, x509
+     , x509-store
+     }:
+     mkDerivation {
+       pname = "gogol";
+       version = "0.2.0";
+       sha256 = "5ccc62171ca67889d5e55263627c775b3242bdfa6489b509ae03ceb3d6886c8f";
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive conduit conduit-extra
+         cryptonite directory exceptions filepath gogol-core http-client
+         http-conduit http-media http-types lens memory mime-types
+         monad-control mtl resourcet text time transformers
+         transformers-base unordered-containers x509 x509-store
+       ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Comprehensive Google Services SDK";
+       license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-adexchange-buyer" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-adexchange-buyer";
-       version = "0.1.0";
-       sha256 = "63a778a15a3bdb595e2c0ff46bbe35616891dfda687a8af520dbba219ff09d83";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Ad Exchange Buyer SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-adexchange-buyer_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-adexchange-buyer";
@@ -75242,22 +71927,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Ad Exchange Buyer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-adexchange-seller" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-adexchange-seller";
-       version = "0.1.0";
-       sha256 = "28c81ea7cc984534c445d3fa2278e1306370464e00194e844dc76b8e33a798cc";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Ad Exchange Seller SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-adexchange-seller_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-adexchange-seller";
@@ -75267,27 +71939,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Ad Exchange Seller SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-admin-datatransfer" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-admin-datatransfer";
-       version = "0.1.0";
-       sha256 = "195ab5e18d789959e559d9f7af4db757b5779cdb4b8e61f96bcb14b3fa4ad97b";
+       version = "0.1.1";
+       sha256 = "4c90607116ed177c84c4980c0f14f50873fff2dcae611e3b620457608f1537a9";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Admin Data Transfer SDK";
        license = "unknown";
      }) {};
 
-  "gogol-admin-datatransfer_0_1_1" = callPackage
+  "gogol-admin-datatransfer_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-admin-datatransfer";
-       version = "0.1.1";
-       sha256 = "4c90607116ed177c84c4980c0f14f50873fff2dcae611e3b620457608f1537a9";
+       version = "0.2.0";
+       sha256 = "50960b0cd3048d7a3b9860d97f2fd02affea4dd735bc28b4603b3656dba7ef2a";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Admin Data Transfer SDK";
@@ -75296,18 +71967,6 @@ self: {
      }) {};
 
   "gogol-admin-directory" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-admin-directory";
-       version = "0.1.0";
-       sha256 = "ce8882d955c7646cb9f2ece2a2827f4db0e44cc0d1af6a968e25ce9cf7cf4622";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Admin Directory SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-admin-directory_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-admin-directory";
@@ -75317,22 +71976,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Admin Directory SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-admin-emailmigration" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-admin-emailmigration";
-       version = "0.1.0";
-       sha256 = "15b3cea41e4ba648e952adeea91467981e61d8a01b48b5231e78773d89c0da77";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Email Migration API v2 SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-admin-emailmigration_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-admin-emailmigration";
@@ -75342,22 +71988,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Email Migration API v2 SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-admin-reports" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-admin-reports";
-       version = "0.1.0";
-       sha256 = "ce4986e756a1f6d9b5bdf30c1775d32634455ed30c59dd914cc9615be68b785d";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Admin Reports SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-admin-reports_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-admin-reports";
@@ -75367,22 +72000,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Admin Reports SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-adsense" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-adsense";
-       version = "0.1.0";
-       sha256 = "2ff7819e65e4378a6e8f875b0dbfe2bc0e839794c738fd3e004957e7a6ac7bde";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google AdSense Management SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-adsense_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-adsense";
@@ -75392,27 +72012,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google AdSense Management SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-adsense-host" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-adsense-host";
-       version = "0.1.0";
-       sha256 = "64ff681bd7da5da1fff056678137c82811b3b91dfd6077722f30e5d531b32440";
+       version = "0.1.1";
+       sha256 = "305e3f7df6b3bcca19810ebbf954178f066fb227c7dbf68c16a49ad691578112";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google AdSense Host SDK";
        license = "unknown";
      }) {};
 
-  "gogol-adsense-host_0_1_1" = callPackage
+  "gogol-adsense-host_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-adsense-host";
-       version = "0.1.1";
-       sha256 = "305e3f7df6b3bcca19810ebbf954178f066fb227c7dbf68c16a49ad691578112";
+       version = "0.2.0";
+       sha256 = "f52fc7f8b5e07bfd193a428476e7c255e9910505d151ef96848519c44e0c73b3";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google AdSense Host SDK";
@@ -75424,20 +72043,20 @@ self: {
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-affiliates";
-       version = "0.1.0";
-       sha256 = "d0800cf733018b75665bbbb382e23f07a033474de438a4064771a541e39e200e";
+       version = "0.1.1";
+       sha256 = "b90d360660ecd0ac990fa387575a9c32232a885a7b3ecc8fd3c3cf677e469a1c";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Affiliate Network SDK";
        license = "unknown";
      }) {};
 
-  "gogol-affiliates_0_1_1" = callPackage
+  "gogol-affiliates_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-affiliates";
-       version = "0.1.1";
-       sha256 = "b90d360660ecd0ac990fa387575a9c32232a885a7b3ecc8fd3c3cf677e469a1c";
+       version = "0.2.0";
+       sha256 = "83b7d65c19295f276e31fd798eff9a01268dea90419315304be7a6abced94387";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Affiliate Network SDK";
@@ -75446,18 +72065,6 @@ self: {
      }) {};
 
   "gogol-analytics" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-analytics";
-       version = "0.1.0";
-       sha256 = "e88b9c6b13566cb2d2e1eee62c24b5ec14c0cb96577bbfd690a17f9810b24548";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Analytics SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-analytics_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-analytics";
@@ -75467,22 +72074,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Analytics SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-android-enterprise" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-android-enterprise";
-       version = "0.1.0";
-       sha256 = "b71ee2b74419f575c5c5142dd35a23e3762172f664f489f1fa27143e9b8deb9a";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Play EMM SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-android-enterprise_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-android-enterprise";
@@ -75492,22 +72086,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play EMM SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-android-publisher" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-android-publisher";
-       version = "0.1.0";
-       sha256 = "0dbcf500379366d09e434a4f17790d53bf91a6214e2ff31d52216cd6be17437e";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Play Developer SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-android-publisher_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-android-publisher";
@@ -75517,22 +72098,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Developer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-appengine" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-appengine";
-       version = "0.1.0";
-       sha256 = "3aabc08737482e8f0ef9aa0bec136e827540a8de6f66fbf67a1d8e8167a7d523";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google App Engine Admin SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-appengine_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-appengine";
@@ -75542,22 +72110,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google App Engine Admin SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-apps-activity" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-apps-activity";
-       version = "0.1.0";
-       sha256 = "f0cbd5847f751d7ed5e448d9d610986d390161ae37899d368107b0fb7c7a5704";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Apps Activity SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-apps-activity_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-apps-activity";
@@ -75567,27 +72122,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Apps Activity SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-apps-calendar" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-apps-calendar";
-       version = "0.1.0";
-       sha256 = "4f7d33f1d43d4f9e63d6b1d2077b07280f68a260652fc2d9ed9e5653efa24886";
+       version = "0.1.1";
+       sha256 = "cbebf7557345799436351e27485f8b4add43e2c449eb0fccb727d921ca16bc67";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Calendar SDK";
        license = "unknown";
      }) {};
 
-  "gogol-apps-calendar_0_1_1" = callPackage
+  "gogol-apps-calendar_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-apps-calendar";
-       version = "0.1.1";
-       sha256 = "cbebf7557345799436351e27485f8b4add43e2c449eb0fccb727d921ca16bc67";
+       version = "0.2.0";
+       sha256 = "1b1772c5c1084ffd1aef4f3c71afba297823362ef7c674cdf53cf86bfe4ffcae";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Calendar SDK";
@@ -75596,18 +72150,6 @@ self: {
      }) {};
 
   "gogol-apps-licensing" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-apps-licensing";
-       version = "0.1.0";
-       sha256 = "a037cc3f62f65826e948113f24013349b71b561c97f0d06cd01f8448d136e481";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Enterprise License Manager SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-apps-licensing_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-apps-licensing";
@@ -75617,22 +72159,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Enterprise License Manager SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-apps-reseller" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-apps-reseller";
-       version = "0.1.0";
-       sha256 = "8abc6ee6aad16c27d7d7b37c53e9fcc5343d1d6cf50f4fe732fd436c429a71b5";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Enterprise Apps Reseller SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-apps-reseller_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-apps-reseller";
@@ -75642,22 +72171,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Enterprise Apps Reseller SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-apps-tasks" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-apps-tasks";
-       version = "0.1.0";
-       sha256 = "222060457d7c5b790cea90a74317f4a760ec7381f2561db9da0715e639e53b92";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Tasks SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-apps-tasks_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-apps-tasks";
@@ -75667,22 +72183,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Tasks SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-appstate" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-appstate";
-       version = "0.1.0";
-       sha256 = "63961d638f4716ea2f7a619aa21a5ca528159a514aa72d52c0a3ae54b9bd519a";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google App State SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-appstate_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-appstate";
@@ -75692,22 +72195,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google App State SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-autoscaler" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-autoscaler";
-       version = "0.1.0";
-       sha256 = "dd7e75cff814b08190add708a014790ab58b1ef8f9456a314e6ce732045f658f";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Compute Engine Autoscaler SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-autoscaler_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-autoscaler";
@@ -75717,22 +72207,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine Autoscaler SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-bigquery" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-bigquery";
-       version = "0.1.0";
-       sha256 = "b38065d1d83722b6d39124dc87856343ab11af936e9abb9db4efe55fbf5cf1c3";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google BigQuery SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-bigquery_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-bigquery";
@@ -75742,27 +72219,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google BigQuery SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-billing" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-billing";
-       version = "0.1.0";
-       sha256 = "b8da90f45e13fc4fc3d6b717d15805ad9a2431364c9f66be77f22635e76629dd";
+       version = "0.1.1";
+       sha256 = "09903877b7e6c3a87e345a26fca0fb7e1da8751f5b19aeb940479dd3f289a9e8";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Billing SDK";
        license = "unknown";
      }) {};
 
-  "gogol-billing_0_1_1" = callPackage
+  "gogol-billing_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-billing";
-       version = "0.1.1";
-       sha256 = "09903877b7e6c3a87e345a26fca0fb7e1da8751f5b19aeb940479dd3f289a9e8";
+       version = "0.2.0";
+       sha256 = "52d867cda0d2acbd9fe4381379ab80a9821709b02ef358423d60dc83ba1bf3e9";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Billing SDK";
@@ -75771,18 +72247,6 @@ self: {
      }) {};
 
   "gogol-blogger" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-blogger";
-       version = "0.1.0";
-       sha256 = "ef7105faf8560416fb417b462fb81a21ace2b54983a6c43095f7859a2705277a";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Blogger SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-blogger_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-blogger";
@@ -75792,22 +72256,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Blogger SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-books" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-books";
-       version = "0.1.0";
-       sha256 = "f3bcdfcf2b5daf79effc5b6b137468af37e8640d63f65ba24929b414b4b1dc22";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Books SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-books_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-books";
@@ -75817,27 +72268,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Books SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-civicinfo" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-civicinfo";
-       version = "0.1.0";
-       sha256 = "0553bf55ec3e453e63e6050528614d6dfe5030413b19c27cdeebf273bae58be7";
+       version = "0.1.1";
+       sha256 = "53c354c9219c87c2864f9da2883657773c4e13aa635d51164bf89fc5e6d5d442";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Civic Information SDK";
        license = "unknown";
      }) {};
 
-  "gogol-civicinfo_0_1_1" = callPackage
+  "gogol-civicinfo_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-civicinfo";
-       version = "0.1.1";
-       sha256 = "53c354c9219c87c2864f9da2883657773c4e13aa635d51164bf89fc5e6d5d442";
+       version = "0.2.0";
+       sha256 = "6c33f17eaf8eda636b54c6f6e863d73a3ebbd8edf9ed5b0c22cd548ff9f653c3";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Civic Information SDK";
@@ -75849,20 +72299,20 @@ self: {
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-classroom";
-       version = "0.1.0";
-       sha256 = "5b5715d5403614b588053a6341a24546eec8f9f9269c4e7fb08f3ec36da71134";
+       version = "0.1.1";
+       sha256 = "7e61a1725d1864df86e00eaadc9c94d885015c5d1310a1374b7cc8e4b2c9769a";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Classroom SDK";
        license = "unknown";
      }) {};
 
-  "gogol-classroom_0_1_1" = callPackage
+  "gogol-classroom_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-classroom";
-       version = "0.1.1";
-       sha256 = "7e61a1725d1864df86e00eaadc9c94d885015c5d1310a1374b7cc8e4b2c9769a";
+       version = "0.2.0";
+       sha256 = "b7b101543bcb5e1316dc41d48bcb49f6b516cd38727e5bc052e44198c1f7b230";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Classroom SDK";
@@ -75871,18 +72321,6 @@ self: {
      }) {};
 
   "gogol-cloudmonitoring" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-cloudmonitoring";
-       version = "0.1.0";
-       sha256 = "c822932fd8ec45eb690ba197e4dfd08734d2288fe0ac55562649509d2d66f32b";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Monitoring SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-cloudmonitoring_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-cloudmonitoring";
@@ -75892,22 +72330,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Monitoring SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-cloudtrace" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-cloudtrace";
-       version = "0.1.0";
-       sha256 = "98c84fc8086cc7defd131a5c99cf1cd307a15343e8ef3d8c038b3e752ceee2b2";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Trace SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-cloudtrace_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-cloudtrace";
@@ -75917,22 +72342,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Trace SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-compute" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-compute";
-       version = "0.1.0";
-       sha256 = "176bf2c9ae0701bba60f8a9f19d886125a983cd46c05241c4d98778f26926f3b";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Compute Engine SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-compute_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-compute";
@@ -75942,27 +72354,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-container" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-container";
-       version = "0.1.0";
-       sha256 = "e2030647c09d58c90a1770c7841d6a0dd2f9f36b19ed12ee2514c34ba9eb79ec";
+       version = "0.1.1";
+       sha256 = "9b0eaa239338f3a1c23ef6e7fd1587284060419e91cd13dccf7be088d81923b1";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Container Engine SDK";
        license = "unknown";
      }) {};
 
-  "gogol-container_0_1_1" = callPackage
+  "gogol-container_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-container";
-       version = "0.1.1";
-       sha256 = "9b0eaa239338f3a1c23ef6e7fd1587284060419e91cd13dccf7be088d81923b1";
+       version = "0.2.0";
+       sha256 = "3db448086fc5cd9c2ba967096ebadb44497b00305285cb51a21fd92002f3bcbb";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Container Engine SDK";
@@ -75974,8 +72385,8 @@ self: {
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-containerbuilder";
-       version = "0.1.1";
-       sha256 = "7362d60cf98c8856351669c0c27fb6945098f598f6de55dd17aed817a7547df8";
+       version = "0.2.0";
+       sha256 = "5566c8f5ffd62882234b98470e2affe5e0df720aca2b2e097519b7576ffbd1f7";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Container Builder SDK";
@@ -75984,31 +72395,6 @@ self: {
      }) {};
 
   "gogol-core" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
-     , case-insensitive, conduit, dlist, exceptions, hashable
-     , http-api-data, http-client, http-media, http-types, lens, memory
-     , resourcet, scientific, servant, tasty, text, time
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "gogol-core";
-       version = "0.1.0";
-       sha256 = "2284f49106b41cc0ea81c848a5b5c31f0a7bcb2fc5c604519451238cbc3c01b0";
-       revision = "1";
-       editedCabalFile = "11dbfa4b8778e6b446b60ad1add04d9049169936f6f762d45a3e727e92d5a0b6";
-       libraryHaskellDepends = [
-         aeson attoparsec base bifunctors bytestring case-insensitive
-         conduit dlist exceptions hashable http-api-data http-client
-         http-media http-types lens memory resourcet scientific servant text
-         time unordered-containers
-       ];
-       testHaskellDepends = [ base tasty ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Core data types and functionality for Gogol libraries";
-       license = "unknown";
-     }) {};
-
-  "gogol-core_0_1_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
      , case-insensitive, conduit, dlist, exceptions, hashable
      , http-api-data, http-client, http-media, http-types, lens, memory
@@ -76031,22 +72417,33 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Core data types and functionality for Gogol libraries";
        license = "unknown";
+     }) {};
+
+  "gogol-core_0_2_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
+     , case-insensitive, conduit, dlist, exceptions, hashable
+     , http-api-data, http-client, http-media, http-types, lens
+     , resourcet, scientific, servant, tasty, text, time
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "gogol-core";
+       version = "0.2.0";
+       sha256 = "a629f7bce87624d0ac1314c8aa080ec1d5488f809864031eab716a51167244ab";
+       libraryHaskellDepends = [
+         aeson attoparsec base bifunctors bytestring case-insensitive
+         conduit dlist exceptions hashable http-api-data http-client
+         http-media http-types lens resourcet scientific servant text time
+         unordered-containers
+       ];
+       testHaskellDepends = [ base tasty ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Core data types and functionality for Gogol libraries";
+       license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-customsearch" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-customsearch";
-       version = "0.1.0";
-       sha256 = "3b264eed97aea0cb6ce97edc32ec66f962af7f4892f0ea6313413fba1512eee0";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google CustomSearch SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-customsearch_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-customsearch";
@@ -76056,22 +72453,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google CustomSearch SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-dataflow" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-dataflow";
-       version = "0.1.0";
-       sha256 = "ac82d506a5efd3934f08fde8cd77b4ca387ecbe77409ff4ba2dc657bb7834515";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Dataflow SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-dataflow_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-dataflow";
@@ -76081,22 +72465,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Dataflow SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-dataproc" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-dataproc";
-       version = "0.1.0";
-       sha256 = "d4a60220037b16e884499d0944aa6c858889aa322b48783249f7b6006d648b4f";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Dataproc SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-dataproc_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-dataproc";
@@ -76106,22 +72477,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Dataproc SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-datastore" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-datastore";
-       version = "0.1.0";
-       sha256 = "346888db283ed3ff3ffad7310891cd33d230dfe98234ceb006d9b7aea28b5ea4";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Datastore SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-datastore_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-datastore";
@@ -76131,27 +72489,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Datastore SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-debugger" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-debugger";
-       version = "0.1.0";
-       sha256 = "2f70ed92ff0edd99e7a2e24a00e546a79c1e082f79f97ffbd48b6a24c0f061da";
+       version = "0.1.1";
+       sha256 = "51edec5d57f76a4be8769983831ae655332e55f3fec90bd4bdc22a0644bfbca2";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Debugger SDK";
+       description = "Google Stackdriver Debugger SDK";
        license = "unknown";
      }) {};
 
-  "gogol-debugger_0_1_1" = callPackage
+  "gogol-debugger_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-debugger";
-       version = "0.1.1";
-       sha256 = "51edec5d57f76a4be8769983831ae655332e55f3fec90bd4bdc22a0644bfbca2";
+       version = "0.2.0";
+       sha256 = "142b93f72a911e2f039d7b85e5a2b55c85fd631a3251f7089b78ee1496a882e2";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Stackdriver Debugger SDK";
@@ -76160,18 +72517,6 @@ self: {
      }) {};
 
   "gogol-deploymentmanager" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-deploymentmanager";
-       version = "0.1.0";
-       sha256 = "a3f03570dc6c3d0d678dd4a98d993a0daf8dfa8151fb75b572d372e7b2f881fb";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Deployment Manager SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-deploymentmanager_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-deploymentmanager";
@@ -76181,22 +72526,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Deployment Manager SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-dfareporting" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-dfareporting";
-       version = "0.1.0";
-       sha256 = "3c42ecab212babf6ff6355f8f0083216897dcf344d26e22d9743c14794466625";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google DCM/DFA Reporting And Trafficking SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-dfareporting_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-dfareporting";
@@ -76206,22 +72538,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google DCM/DFA Reporting And Trafficking SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-discovery" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-discovery";
-       version = "0.1.0";
-       sha256 = "f8f107dedc76a4aeeb6e18874a79e0d6fcb9e0212953b2ff89d1770466f629ac";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google APIs Discovery Service SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-discovery_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-discovery";
@@ -76231,22 +72550,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google APIs Discovery Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-dns" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-dns";
-       version = "0.1.0";
-       sha256 = "d07e3fb4f8cdcd079a80509ffe7300b300679900d8234e8833152fd83d378b40";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud DNS SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-dns_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-dns";
@@ -76256,27 +72562,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud DNS SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-doubleclick-bids" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-doubleclick-bids";
-       version = "0.1.0";
-       sha256 = "0ac3d6be06ae897c9dd59fde3cc160708a04f0b1853749df5186a60077590fd5";
+       version = "0.1.1";
+       sha256 = "a0e899ecc589df89980868be218741fb2e7ece21e0837ea46618fd970339de2a";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google DoubleClick Bid Manager SDK";
        license = "unknown";
      }) {};
 
-  "gogol-doubleclick-bids_0_1_1" = callPackage
+  "gogol-doubleclick-bids_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-doubleclick-bids";
-       version = "0.1.1";
-       sha256 = "a0e899ecc589df89980868be218741fb2e7ece21e0837ea46618fd970339de2a";
+       version = "0.2.0";
+       sha256 = "19f2d882820a756ddc7ad6d22b91ae1198e2ff53db2ad03c897e241a61c4b73c";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google DoubleClick Bid Manager SDK";
@@ -76285,18 +72590,6 @@ self: {
      }) {};
 
   "gogol-doubleclick-search" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-doubleclick-search";
-       version = "0.1.0";
-       sha256 = "2ed70d962d5c1ca189682a9ec22af0a903ebe08223ffd6d4b9abff414ea239db";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google DoubleClick Search SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-doubleclick-search_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-doubleclick-search";
@@ -76306,22 +72599,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google DoubleClick Search SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-drive" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-drive";
-       version = "0.1.0";
-       sha256 = "7cccab1d269aa3ee5d6276ff78c86f29974f85418148a15a13d195ac7fd29ca3";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Drive SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-drive_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-drive";
@@ -76331,7 +72611,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Drive SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-firebase-dynamiclinks" = callPackage
@@ -76348,18 +72627,6 @@ self: {
      }) {};
 
   "gogol-firebase-rules" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-firebase-rules";
-       version = "0.1.0";
-       sha256 = "b3f5483c339b0bc5882fdfeb49865d3b13f2c1d61dc7f4e46e25ccc651af2c74";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Firebase Rules SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-firebase-rules_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-firebase-rules";
@@ -76369,22 +72636,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Firebase Rules SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-fitness" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-fitness";
-       version = "0.1.0";
-       sha256 = "486f83148db7c98021f81c9eff1d2e5adea532246adb9627cc0b824aeedda6cd";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Fitness SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-fitness_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-fitness";
@@ -76394,22 +72648,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Fitness SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-fonts" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-fonts";
-       version = "0.1.0";
-       sha256 = "b87b347f22f13e7fd0e809841b4b075bc62169318575b59a0a3a4ff979b41dc9";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Fonts Developer SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-fonts_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-fonts";
@@ -76419,22 +72660,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Fonts Developer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-freebasesearch" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-freebasesearch";
-       version = "0.1.0";
-       sha256 = "668e8e58a7830a391c8bcd1836436bb0adf606017a71d94a6aef638fe078e33c";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Freebase Search SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-freebasesearch_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-freebasesearch";
@@ -76444,27 +72672,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Freebase Search SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-fusiontables" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-fusiontables";
-       version = "0.1.0";
-       sha256 = "2473bf1d25ae2cbe2af0c454f6dcb20765ab652502770327e4b0be6b72994ff1";
+       version = "0.1.1";
+       sha256 = "dda5ab1f88dd93e0bfe8acf046d2feaccb0d3d999dd81b3d06c7e2a5cc7c4a14";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Fusion Tables SDK";
        license = "unknown";
      }) {};
 
-  "gogol-fusiontables_0_1_1" = callPackage
+  "gogol-fusiontables_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-fusiontables";
-       version = "0.1.1";
-       sha256 = "dda5ab1f88dd93e0bfe8acf046d2feaccb0d3d999dd81b3d06c7e2a5cc7c4a14";
+       version = "0.2.0";
+       sha256 = "a8a9c0a90d7dea80b4f76047da04e107c45d4eb6a7ffff7ce418f0eaa79ca159";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Fusion Tables SDK";
@@ -76473,18 +72700,6 @@ self: {
      }) {};
 
   "gogol-games" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-games";
-       version = "0.1.0";
-       sha256 = "0b20a0a057942b5b99b1060c01c6042017d1db5e3cb49e44a8bf95cd5389ffd6";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Play Game Services SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-games_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-games";
@@ -76494,22 +72709,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Game Services SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-games-configuration" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-games-configuration";
-       version = "0.1.0";
-       sha256 = "8f27ec3b23e704b6cd9d33d4bf41fa336098ef2d06edfc7482daa734ae2aa937";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Play Game Services Publishing SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-games-configuration_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-games-configuration";
@@ -76519,22 +72721,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Game Services Publishing SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-games-management" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-games-management";
-       version = "0.1.0";
-       sha256 = "4a4459968df56bd364be7f62300f9a950c466cfa62bc6db91f2460fd67d9f414";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Play Game Services Management SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-games-management_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-games-management";
@@ -76544,22 +72733,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Game Services Management SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-genomics" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-genomics";
-       version = "0.1.0";
-       sha256 = "72098eeef0f3ce6ee3c9febe433ac94a1240a98679a32ca7ce65867f3e972784";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Genomics SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-genomics_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-genomics";
@@ -76569,22 +72745,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Genomics SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-gmail" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-gmail";
-       version = "0.1.0";
-       sha256 = "c5f39483cdfc5123b2bc16a85dccb00651f51cbc05be034ab1f72927d8a1aa8f";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Gmail SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-gmail_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-gmail";
@@ -76594,22 +72757,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Gmail SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-groups-migration" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-groups-migration";
-       version = "0.1.0";
-       sha256 = "af18dfa8279bc475851870b44d66f015fa36dfdb6136320a00d76a5245d86364";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Groups Migration SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-groups-migration_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-groups-migration";
@@ -76619,27 +72769,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Groups Migration SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-groups-settings" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-groups-settings";
-       version = "0.1.0";
-       sha256 = "47c2237898cbf007074c767c738f24d2e099cc17ea2914c1434f703933eb1713";
+       version = "0.1.1";
+       sha256 = "c8e5efeb91f968fbe5ebe7183f7a2ff362589de03bfa4917417d9707fe6ce1ed";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Groups Settings SDK";
        license = "unknown";
      }) {};
 
-  "gogol-groups-settings_0_1_1" = callPackage
+  "gogol-groups-settings_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-groups-settings";
-       version = "0.1.1";
-       sha256 = "c8e5efeb91f968fbe5ebe7183f7a2ff362589de03bfa4917417d9707fe6ce1ed";
+       version = "0.2.0";
+       sha256 = "a9239bbb414bc01dc3639d6c808cbbfa681125fc6aa13708c6f6d9c8f24e7ee6";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Groups Settings SDK";
@@ -76661,18 +72810,6 @@ self: {
      }) {};
 
   "gogol-identity-toolkit" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-identity-toolkit";
-       version = "0.1.0";
-       sha256 = "c6ad66395f449cf7900d1f12657977e5864db8a426acc0f56a9d4674dfbd488d";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Identity Toolkit SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-identity-toolkit_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-identity-toolkit";
@@ -76682,22 +72819,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Identity Toolkit SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-kgsearch" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-kgsearch";
-       version = "0.1.0";
-       sha256 = "c7f006ee6e37cd3c893cd7a60e9cc44d857a7aca5bb29f9d942269c3c88767f3";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Identity and Access Management SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-kgsearch_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-kgsearch";
@@ -76707,22 +72831,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Knowledge Graph Search SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-latencytest" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-latencytest";
-       version = "0.1.0";
-       sha256 = "866074c84140f6ff0cb13eaef954d015f681b7fb5250d9299cc7c993b9e0953d";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Network Performance Monitoring SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-latencytest_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-latencytest";
@@ -76732,22 +72843,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Network Performance Monitoring SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-logging" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-logging";
-       version = "0.1.0";
-       sha256 = "88ee7e43040ab494ba9b138cfa01a626546dadd9aaca9ac451325b118bb97f73";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Logging SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-logging_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-logging";
@@ -76757,27 +72855,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Stackdriver Logging SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-maps-coordinate" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-maps-coordinate";
-       version = "0.1.0";
-       sha256 = "85a7cc97ca13c5b65d8d7fa4c49b643cec3913fb51952b0032fd5e889e33d9c0";
+       version = "0.1.1";
+       sha256 = "5b60120062e741337e299724aa09153f9c7985fff4fb25486a9f7c57df5e8b89";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Maps Coordinate SDK";
        license = "unknown";
      }) {};
 
-  "gogol-maps-coordinate_0_1_1" = callPackage
+  "gogol-maps-coordinate_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-maps-coordinate";
-       version = "0.1.1";
-       sha256 = "5b60120062e741337e299724aa09153f9c7985fff4fb25486a9f7c57df5e8b89";
+       version = "0.2.0";
+       sha256 = "414b03bd9c3679df9c923dd71aa9ecf35fe29c7e17f33630583a2e4e563f30b4";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Maps Coordinate SDK";
@@ -76786,18 +72883,6 @@ self: {
      }) {};
 
   "gogol-maps-engine" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-maps-engine";
-       version = "0.1.0";
-       sha256 = "fe092be561b6b93619ad2626d7b31edad0f08b51f7a9c40273dfafa249d93f09";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Maps Engine SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-maps-engine_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-maps-engine";
@@ -76807,22 +72892,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Maps Engine SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-mirror" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-mirror";
-       version = "0.1.0";
-       sha256 = "de360430d65ded18ba6f0cc3c4bdf381230ad3cf1e37b0c6aaeb0a85737ba41d";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Mirror SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-mirror_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-mirror";
@@ -76832,7 +72904,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Mirror SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-ml" = callPackage
@@ -76849,18 +72920,6 @@ self: {
      }) {};
 
   "gogol-monitoring" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-monitoring";
-       version = "0.1.0";
-       sha256 = "b3d92680ed5688d6556f58fa5db6ff36e4319f03abb58374ee2d51498b7feab1";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Monitoring SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-monitoring_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-monitoring";
@@ -76870,22 +72929,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Stackdriver Monitoring SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-oauth2" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-oauth2";
-       version = "0.1.0";
-       sha256 = "7dfa28c2babc8f0ba8b82e4ecf58108a289d97147848678662870d1404c4798d";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google OAuth2 SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-oauth2_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-oauth2";
@@ -76895,22 +72941,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google OAuth2 SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-pagespeed" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-pagespeed";
-       version = "0.1.0";
-       sha256 = "1243c9dc68363fed8a96596d368622ae7b23296f7c231134f354401428f5815b";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google PageSpeed Insights SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-pagespeed_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-pagespeed";
@@ -76920,27 +72953,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google PageSpeed Insights SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-partners" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-partners";
-       version = "0.1.0";
-       sha256 = "205d4a467aa60df3ae42923341eb2fa688f5f9121e92eeff93e042571df8eb7e";
+       version = "0.1.1";
+       sha256 = "a292356748aa7e00c35f755e1515409b2848244926630902f5ded0773048c8bc";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Partners SDK";
        license = "unknown";
      }) {};
 
-  "gogol-partners_0_1_1" = callPackage
+  "gogol-partners_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-partners";
-       version = "0.1.1";
-       sha256 = "a292356748aa7e00c35f755e1515409b2848244926630902f5ded0773048c8bc";
+       version = "0.2.0";
+       sha256 = "3bce3a43fc727b78b0d90d566a6769ff704eb4764948d0d2c328d95d5c24722c";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Partners SDK";
@@ -76949,18 +72981,6 @@ self: {
      }) {};
 
   "gogol-people" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-people";
-       version = "0.1.0";
-       sha256 = "8cb6eba72fbee2057c58ab7521ba962a44cfd131f4b5dc1a382c8b2e97083e50";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google People SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-people_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-people";
@@ -76970,22 +72990,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google People SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-play-moviespartner" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-play-moviespartner";
-       version = "0.1.0";
-       sha256 = "6ddde72865f91a798e8a1e1281a0a79d6f3d5cd2c34b94146d72bd764d91df9a";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Play Movies Partner SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-play-moviespartner_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-play-moviespartner";
@@ -76995,22 +73002,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Movies Partner SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-plus" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-plus";
-       version = "0.1.0";
-       sha256 = "97646d9b6678b5bb56b0d9ba92bbbdd9baac2e8e50df49f25d60f4bbe08a3840";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google + SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-plus_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-plus";
@@ -77020,27 +73014,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google + SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-plus-domains" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-plus-domains";
-       version = "0.1.0";
-       sha256 = "dce9a8f2f7404a39be2f44b269fc0ef5fa0eb908cc5dda184ea865abca31449f";
+       version = "0.1.1";
+       sha256 = "7ccfb46bec79938344629a2199df912e6279d8da06f449a16faa69309e49afea";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google + Domains SDK";
        license = "unknown";
      }) {};
 
-  "gogol-plus-domains_0_1_1" = callPackage
+  "gogol-plus-domains_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-plus-domains";
-       version = "0.1.1";
-       sha256 = "7ccfb46bec79938344629a2199df912e6279d8da06f449a16faa69309e49afea";
+       version = "0.2.0";
+       sha256 = "c5497f9e0637a5e657cfbbf3003e4101de371b407e81e0df8a89db0979dc0a9b";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google + Domains SDK";
@@ -77049,18 +73042,6 @@ self: {
      }) {};
 
   "gogol-prediction" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-prediction";
-       version = "0.1.0";
-       sha256 = "f877ae9455f43b924b91e08f11c0c6053b72b78a5be28d8f4ea4ed7256e68ca9";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Prediction SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-prediction_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-prediction";
@@ -77070,27 +73051,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Prediction SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-proximitybeacon" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-proximitybeacon";
-       version = "0.1.0";
-       sha256 = "b46bfe6c5bffb3714c3b66a9aa6768ad8d62e84588cc20202956da9fc45ad872";
+       version = "0.1.1";
+       sha256 = "96ef7f2878d294e0d08b2cef02106c40cfc19774dabdee37890b359579d54fb2";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Proximity Beacon SDK";
        license = "unknown";
      }) {};
 
-  "gogol-proximitybeacon_0_1_1" = callPackage
+  "gogol-proximitybeacon_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-proximitybeacon";
-       version = "0.1.1";
-       sha256 = "96ef7f2878d294e0d08b2cef02106c40cfc19774dabdee37890b359579d54fb2";
+       version = "0.2.0";
+       sha256 = "5bff5ddbf059ca8fa55a19f9a892339ef50acb5e5864016cc5a6eae58def1456";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Proximity Beacon SDK";
@@ -77099,18 +73079,6 @@ self: {
      }) {};
 
   "gogol-pubsub" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-pubsub";
-       version = "0.1.0";
-       sha256 = "2063ab0083d0f8538bdf9ff73b567dfaf705198efa3507b30a54a38bf4c8c6fb";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Pub/Sub SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-pubsub_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-pubsub";
@@ -77120,22 +73088,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Pub/Sub SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-qpxexpress" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-qpxexpress";
-       version = "0.1.0";
-       sha256 = "388e2920fc6c35d8341fe728652448edfe5305d48f8dac579af4ed369d918d42";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google QPX Express SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-qpxexpress_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-qpxexpress";
@@ -77145,22 +73100,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google QPX Express SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-replicapool" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-replicapool";
-       version = "0.1.0";
-       sha256 = "765772804708e48f0f443d94bed6980454b2a2d01ae390808cd23fa278e068d3";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Compute Engine Instance Group Manager SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-replicapool_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-replicapool";
@@ -77170,22 +73112,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine Instance Group Manager SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-replicapool-updater" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-replicapool-updater";
-       version = "0.1.0";
-       sha256 = "c57504625cbd16f4cb6c8022736f5b6135dacea1daf9a550aba303e38abe8c40";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Compute Engine Instance Group Updater SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-replicapool-updater_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-replicapool-updater";
@@ -77195,27 +73124,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine Instance Group Updater SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-resourcemanager" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-resourcemanager";
-       version = "0.1.0";
-       sha256 = "021bfb32c5f98e730815d4731c0beabb61e9ff20645096d6d10ed338a1000d4f";
+       version = "0.1.1";
+       sha256 = "b111d37b51d11631d32c0ba201d0483a4693a33d4b805038a74ddca049618577";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Resource Manager SDK";
        license = "unknown";
      }) {};
 
-  "gogol-resourcemanager_0_1_1" = callPackage
+  "gogol-resourcemanager_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-resourcemanager";
-       version = "0.1.1";
-       sha256 = "b111d37b51d11631d32c0ba201d0483a4693a33d4b805038a74ddca049618577";
+       version = "0.2.0";
+       sha256 = "32c1537b1a8238e8c91f67a6289fc07d72c596a4b0b3625306565465173f2445";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Resource Manager SDK";
@@ -77224,18 +73152,6 @@ self: {
      }) {};
 
   "gogol-resourceviews" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-resourceviews";
-       version = "0.1.0";
-       sha256 = "3ae66598edf8248f78a82f229c0333b3e1de9bfd56f25ebf1339802f51a1c8a2";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Compute Engine Instance Groups SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-resourceviews_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-resourceviews";
@@ -77245,15 +73161,14 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine Instance Groups SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-runtimeconfig" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-runtimeconfig";
-       version = "0.1.1";
-       sha256 = "44efa4354d6cd66ccf7a49d4af0b2243eeac2ad375b3ba6a394abdb65f4d4e5c";
+       version = "0.2.0";
+       sha256 = "d4b92f4929007d2da9741c46907137a30a8fb308f0defabe4b64b1c8af58a681";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud RuntimeConfig SDK";
@@ -77265,8 +73180,8 @@ self: {
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-safebrowsing";
-       version = "0.1.1";
-       sha256 = "fb510fb5f125c02f768f3b0653fe2c8a65776a0f81b989906867004aaed31de8";
+       version = "0.2.0";
+       sha256 = "32b972796fddf933ef21c28b4904b7f9192459a5e7b98ce46adca4f3f2d3a171";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Safe Browsing APIs SDK";
@@ -77275,18 +73190,6 @@ self: {
      }) {};
 
   "gogol-script" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-script";
-       version = "0.1.0";
-       sha256 = "92ed9c5f8a2ece251dc7a5777cd24ad2f8cab14683eae775b2f9eea30a0bf731";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Apps Script Execution SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-script_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-script";
@@ -77296,7 +73199,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Apps Script Execution SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-servicecontrol" = callPackage
@@ -77326,18 +73228,6 @@ self: {
      }) {};
 
   "gogol-sheets" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-sheets";
-       version = "0.1.0";
-       sha256 = "ba134680a2c6337acbf7f302d953a993993553618a5032e39c49eaabdc7b7a94";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Sheets SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-sheets_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-sheets";
@@ -77347,22 +73237,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Sheets SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-shopping-content" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-shopping-content";
-       version = "0.1.0";
-       sha256 = "27d3ea61026c0cf577795d1b36766eddcce90f942409ed0dea512d730fbbd361";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Content API for Shopping SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-shopping-content_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-shopping-content";
@@ -77372,22 +73249,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Content API for Shopping SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-siteverification" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-siteverification";
-       version = "0.1.0";
-       sha256 = "4dd9bcd9e9ba39d4d9a6245086faea856c3baa3b4728e9849d8fe50a7f2ff8e1";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Site Verification SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-siteverification_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-siteverification";
@@ -77397,22 +73261,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Site Verification SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-spectrum" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-spectrum";
-       version = "0.1.0";
-       sha256 = "1c1f35f2520281a27e9ebd86895cc91432f1ae4f6e26caf5936054fd72fd04a4";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Spectrum Database SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-spectrum_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-spectrum";
@@ -77422,22 +73273,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Spectrum Database SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-sqladmin" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-sqladmin";
-       version = "0.1.0";
-       sha256 = "04a14790303a9bf830e4fe7471c52924e5ed7f9248676e9f6a3afea7aaab7519";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud SQL Administration SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-sqladmin_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-sqladmin";
@@ -77447,27 +73285,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud SQL Administration SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-storage" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-storage";
-       version = "0.1.0";
-       sha256 = "eba6b6c0c2d7fbc9a24f66f08fa02699317a26b5a85cd2936dabb7c418f90912";
+       version = "0.1.1";
+       sha256 = "7af4f34560e37bbcd7dfb6a872225806afec7736322f20a99497e3817486aa72";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Storage JSON SDK";
        license = "unknown";
      }) {};
 
-  "gogol-storage_0_1_1" = callPackage
+  "gogol-storage_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-storage";
-       version = "0.1.1";
-       sha256 = "7af4f34560e37bbcd7dfb6a872225806afec7736322f20a99497e3817486aa72";
+       version = "0.2.0";
+       sha256 = "158528dc7488c5ac987c2cd05e9d1d15576aa9085d8c1ed3bfb9f3cba517d8da";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Storage JSON SDK";
@@ -77479,20 +73316,20 @@ self: {
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-storage-transfer";
-       version = "0.1.0";
-       sha256 = "fb860f45966d2c5a3545a554a2446c9f66ab58b7cb85f09137ba452dcbf965cd";
+       version = "0.1.1";
+       sha256 = "7f32157f51d3b5d3946a70d8015d03004f9d35c7aa5ef614249e516b9acca745";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Storage Transfer SDK";
        license = "unknown";
      }) {};
 
-  "gogol-storage-transfer_0_1_1" = callPackage
+  "gogol-storage-transfer_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-storage-transfer";
-       version = "0.1.1";
-       sha256 = "7f32157f51d3b5d3946a70d8015d03004f9d35c7aa5ef614249e516b9acca745";
+       version = "0.2.0";
+       sha256 = "64aa9748678d9ed6785cd0475b1711b13389b83c84dc99c71cd4fde2dbde3f1e";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Storage Transfer SDK";
@@ -77501,18 +73338,6 @@ self: {
      }) {};
 
   "gogol-tagmanager" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-tagmanager";
-       version = "0.1.0";
-       sha256 = "cab01a9f11ac12381e410d16c4a951dc4def7a08e42a94cd084c3e156faf61aa";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Tag Manager SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-tagmanager_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-tagmanager";
@@ -77522,27 +73347,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Tag Manager SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-taskqueue" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-taskqueue";
-       version = "0.1.0";
-       sha256 = "5f03a174e2bbf26fa35823e50106b476ecfed71757519fa4c251b24961491765";
+       version = "0.1.1";
+       sha256 = "4797b39b38fb82fc7edf0314d2b168d78c05494c68fa81ef0c978e172452de1c";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google TaskQueue SDK";
        license = "unknown";
      }) {};
 
-  "gogol-taskqueue_0_1_1" = callPackage
+  "gogol-taskqueue_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-taskqueue";
-       version = "0.1.1";
-       sha256 = "4797b39b38fb82fc7edf0314d2b168d78c05494c68fa81ef0c978e172452de1c";
+       version = "0.2.0";
+       sha256 = "5b172c962a9aca7eed4cb4af3e05ccebef93b80584fb6fc902b1c462a8b5b8a6";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google TaskQueue SDK";
@@ -77551,18 +73375,6 @@ self: {
      }) {};
 
   "gogol-translate" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-translate";
-       version = "0.1.0";
-       sha256 = "17d71ff0f9665e8d8737b120cae1d73222d2bea8dce031bf49e9246461921679";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Translate SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-translate_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-translate";
@@ -77572,22 +73384,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Translate SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-urlshortener" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-urlshortener";
-       version = "0.1.0";
-       sha256 = "7247b9d5432d2ef0386134a6ac011b93365779158e62ec56f2d4c8666ceea4ab";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google URL Shortener SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-urlshortener_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-urlshortener";
@@ -77597,27 +73396,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google URL Shortener SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-useraccounts" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-useraccounts";
-       version = "0.1.0";
-       sha256 = "5ca3d5fca236a4c17d66daee9db3f79a8e57e3cccfb8d494514a8f3c3fba7b10";
+       version = "0.1.1";
+       sha256 = "4064ad99cea0db098c6f74fd36b1ba6167354a0e889f7bbc773b08a045ef8647";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud User Accounts SDK";
        license = "unknown";
      }) {};
 
-  "gogol-useraccounts_0_1_1" = callPackage
+  "gogol-useraccounts_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-useraccounts";
-       version = "0.1.1";
-       sha256 = "4064ad99cea0db098c6f74fd36b1ba6167354a0e889f7bbc773b08a045ef8647";
+       version = "0.2.0";
+       sha256 = "91504ac3cbdb11a45ee6762799bfefb3be973b8883ab84254c3bb3101eb9cc67";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud User Accounts SDK";
@@ -77629,20 +73427,20 @@ self: {
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-vision";
-       version = "0.1.0";
-       sha256 = "0a501b91618996ee75f127838626b632c987b0e91ae15d948afecdd4de4c0b0d";
+       version = "0.1.1";
+       sha256 = "e6046ce0d2c131eb0d5c0366577a638eb59e536eb4c4e462a27b0bb05090a565";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Vision SDK";
        license = "unknown";
      }) {};
 
-  "gogol-vision_0_1_1" = callPackage
+  "gogol-vision_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-vision";
-       version = "0.1.1";
-       sha256 = "e6046ce0d2c131eb0d5c0366577a638eb59e536eb4c4e462a27b0bb05090a565";
+       version = "0.2.0";
+       sha256 = "6c87358e77e3565249701b36d8e5fa552f454dfd496c1f65f6586a5781846071";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Vision SDK";
@@ -77651,18 +73449,6 @@ self: {
      }) {};
 
   "gogol-webmaster-tools" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-webmaster-tools";
-       version = "0.1.0";
-       sha256 = "0137d9c88a2c4fb1ef1a10a026ff44e628e52dcf5c915d6b479457b98536aec4";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Search Console SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-webmaster-tools_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-webmaster-tools";
@@ -77672,22 +73458,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Search Console SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-youtube" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-youtube";
-       version = "0.1.0";
-       sha256 = "2edc3a34cb428be4be4bec367f718f047936a80ece335a9b841d82ada7c3cc1f";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google YouTube Data SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-youtube_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-youtube";
@@ -77697,22 +73470,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google YouTube Data SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-youtube-analytics" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-youtube-analytics";
-       version = "0.1.0";
-       sha256 = "8c6a8681cb678edf8208f58f051db36e25cc4b8326319eab071ef573e9e4783d";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google YouTube Analytics SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-youtube-analytics_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-youtube-analytics";
@@ -77722,22 +73482,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google YouTube Analytics SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-youtube-reporting" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-youtube-reporting";
-       version = "0.1.0";
-       sha256 = "2ba85f30e218fa1718cf1a2dcf3c768d023856cdd30a3544c5ffea0750b3f37c";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google YouTube Reporting SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-youtube-reporting_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-youtube-reporting";
@@ -77747,7 +73494,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google YouTube Reporting SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gooey" = callPackage
@@ -79209,6 +74955,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "gridbox" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "gridbox";
+       version = "0.2.0.0";
+       sha256 = "0f035d7cf07e87a46037e5f52e7742667b58a8e049d1a1211b95aaa8731eb580";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/zaidan/gridbox#readme";
+       description = "A grid box model";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "gridfs" = callPackage
     ({ mkDerivation, base, bson, bytestring, conduit, conduit-extra
      , monad-control, mongoDB, mtl, pureMD5, resourcet, tagged, text
@@ -82250,8 +78009,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll";
-       version = "4.9.5.0";
-       sha256 = "47cb6b1859911f638a69ff7cc4fb3ca837be56c51a98b5ff98e43f638ac406d7";
+       version = "4.9.5.1";
+       sha256 = "8deca33939717372ca227559dfe82aa0b02af49b19e9ea60051f555dcee2cfe6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -83605,8 +79364,8 @@ self: {
      }:
      mkDerivation {
        pname = "happstack-server";
-       version = "7.4.6.2";
-       sha256 = "0725900491022e8073d0d61408c2f1d170dbeb7c51bc52e1716c9bf829763b09";
+       version = "7.4.6.3";
+       sha256 = "6dd5f859b114bdbdde00b585800bc4b7ed821dd7bad67bb253e3602d88f5ceef";
        libraryHaskellDepends = [
          base base64-bytestring blaze-html bytestring containers directory
          exceptions extensible-exceptions filepath hslogger html
@@ -84262,27 +80021,6 @@ self: {
      }) {};
 
   "hashable" = callPackage
-    ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp
-     , QuickCheck, random, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, unix
-     }:
-     mkDerivation {
-       pname = "hashable";
-       version = "1.2.4.0";
-       sha256 = "fb9671db0c39cd48d38e2e13e3352e2bf7dfa6341edfe68789a1753d21bb3cf3";
-       libraryHaskellDepends = [
-         base bytestring ghc-prim integer-gmp text
-       ];
-       testHaskellDepends = [
-         base bytestring ghc-prim HUnit QuickCheck random test-framework
-         test-framework-hunit test-framework-quickcheck2 text unix
-       ];
-       homepage = "http://github.com/tibbe/hashable";
-       description = "A class for types that can be converted to a hash value";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hashable_1_2_5_0" = callPackage
     ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp
      , QuickCheck, random, test-framework, test-framework-hunit
      , test-framework-quickcheck2, text, unix
@@ -84301,7 +80039,6 @@ self: {
        homepage = "http://github.com/tibbe/hashable";
        description = "A class for types that can be converted to a hash value";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hashable-extras" = callPackage
@@ -85082,32 +80819,6 @@ self: {
      }) {};
 
   "haskell-gi" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, directory
-     , filepath, glib, gobjectIntrospection, haskell-gi-base, mtl
-     , pretty-show, process, safe, text, transformers, xdg-basedir
-     , xml-conduit
-     }:
-     mkDerivation {
-       pname = "haskell-gi";
-       version = "0.18";
-       sha256 = "c6dabdef4093d0fcbd67fe5b7fa83911f66fdd602bdc02a2615c16d0a1279162";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring Cabal containers directory filepath haskell-gi-base
-         mtl pretty-show process safe text transformers xdg-basedir
-         xml-conduit
-       ];
-       libraryPkgconfigDepends = [ glib gobjectIntrospection ];
-       executableHaskellDepends = [
-         base containers directory filepath haskell-gi-base pretty-show text
-       ];
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Generate Haskell bindings for GObject Introspection capable libraries";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
-
-  "haskell-gi_0_20" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , filepath, glib, gobjectIntrospection, haskell-gi-base, mtl
      , pretty-show, process, regex-tdfa, safe, text, transformers
@@ -85131,23 +80842,9 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Generate Haskell bindings for GObject Introspection capable libraries";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
 
   "haskell-gi-base" = callPackage
-    ({ mkDerivation, base, bytestring, containers, glib, text }:
-     mkDerivation {
-       pname = "haskell-gi-base";
-       version = "0.18.4";
-       sha256 = "45fb9bd2b65668d09f0643c3e4e0629df27610dfb501049c4a4b14a5edba8e16";
-       libraryHaskellDepends = [ base bytestring containers text ];
-       libraryPkgconfigDepends = [ glib ];
-       homepage = "https://github.com/haskell-gi/haskell-gi-base";
-       description = "Foundation for libraries generated by haskell-gi";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib;};
-
-  "haskell-gi-base_0_20" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
      mkDerivation {
        pname = "haskell-gi-base";
@@ -85158,7 +80855,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi-base";
        description = "Foundation for libraries generated by haskell-gi";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
   "haskell-google-trends" = callPackage
@@ -85210,10 +80906,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-import-graph";
-       version = "1.0.0";
-       sha256 = "af555336b7e734dae263e5f68b439d6c4234d7b2da493917fadfe132a7034dee";
-       revision = "1";
-       editedCabalFile = "4c2ba0b2c6d5649842b1f124e4183662cdc4db66810017775ce450cf84223d50";
+       version = "1.0.1";
+       sha256 = "c708c2d5fa7e48c205aeaf1661b07dc52ec4d6e459f3544585b71dbc63f3be92";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -85328,30 +81022,6 @@ self: {
      }) {open-pal = null; open-rte = null; inherit (pkgs) openmpi;};
 
   "haskell-names" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers
-     , data-lens-light, filemanip, filepath, haskell-src-exts, mtl
-     , pretty-show, tasty, tasty-golden, transformers
-     , traverse-with-class, uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-names";
-       version = "0.7.0";
-       sha256 = "c0582b2a51526e24483d71f1669bba2ef340ae7014babb3a9a5b59296fc5faf2";
-       libraryHaskellDepends = [
-         aeson base bytestring containers data-lens-light filepath
-         haskell-src-exts mtl transformers traverse-with-class uniplate
-       ];
-       testHaskellDepends = [
-         base containers filemanip filepath haskell-src-exts mtl pretty-show
-         tasty tasty-golden traverse-with-class
-       ];
-       homepage = "http://documentup.com/haskell-suite/haskell-names";
-       description = "Name resolution library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-names_0_8_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers
      , data-lens-light, filemanip, filepath, haskell-src-exts, mtl
      , pretty-show, tasty, tasty-golden, transformers
@@ -85425,25 +81095,6 @@ self: {
      }) {};
 
   "haskell-packages" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, Cabal, containers
-     , deepseq, directory, filepath, haskell-src-exts, hse-cpp, mtl
-     , optparse-applicative, tagged, transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "haskell-packages";
-       version = "0.4";
-       sha256 = "2c9af5515ce210da304560d6a16b36fa056eefcb2ec609dc0b25c2002ba31021";
-       libraryHaskellDepends = [
-         aeson base bytestring Cabal containers deepseq directory filepath
-         haskell-src-exts hse-cpp mtl optparse-applicative tagged
-         transformers transformers-compat
-       ];
-       homepage = "http://documentup.com/haskell-suite/haskell-packages";
-       description = "Haskell suite library for package management and integration with Cabal";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "haskell-packages_0_5" = callPackage
     ({ mkDerivation, aeson, base, bytestring, Cabal, containers
      , deepseq, directory, filepath, haskell-src-exts, hse-cpp, mtl
      , optparse-applicative, tagged, transformers, transformers-compat
@@ -85460,7 +81111,6 @@ self: {
        homepage = "http://documentup.com/haskell-suite/haskell-packages";
        description = "Haskell suite library for package management and integration with Cabal";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-pdf-presenter" = callPackage
@@ -85659,29 +81309,6 @@ self: {
      }) {};
 
   "haskell-src-exts" = callPackage
-    ({ mkDerivation, array, base, containers, cpphs, directory
-     , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck
-     , syb, tasty, tasty-golden, tasty-smallcheck
-     }:
-     mkDerivation {
-       pname = "haskell-src-exts";
-       version = "1.17.1";
-       sha256 = "ba5c547720514515ad0b94eb8a3d7e22a0e2ad2d85b5e1d178e62c61615528bd";
-       revision = "1";
-       editedCabalFile = "c07248f2a7b4bee1c7777dc6e441e8d1f32a02fb596ea49f47074c68b3c9ea0b";
-       libraryHaskellDepends = [ array base cpphs ghc-prim pretty ];
-       libraryToolDepends = [ happy ];
-       testHaskellDepends = [
-         base containers directory filepath mtl pretty-show smallcheck syb
-         tasty tasty-golden tasty-smallcheck
-       ];
-       doCheck = false;
-       homepage = "https://github.com/haskell-suite/haskell-src-exts";
-       description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-src-exts_1_18_2" = callPackage
     ({ mkDerivation, array, base, containers, cpphs, directory
      , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck
      , tasty, tasty-golden, tasty-smallcheck
@@ -85700,7 +81327,6 @@ self: {
        homepage = "https://github.com/haskell-suite/haskell-src-exts";
        description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-src-exts_1_19_1" = callPackage
@@ -85770,21 +81396,6 @@ self: {
      }) {};
 
   "haskell-src-meta" = callPackage
-    ({ mkDerivation, base, haskell-src-exts, pretty, syb
-     , template-haskell, th-orphans
-     }:
-     mkDerivation {
-       pname = "haskell-src-meta";
-       version = "0.6.0.14";
-       sha256 = "769124392398695667c800225cd908cb455dadf54a9317870bd9384e0eeb20c9";
-       libraryHaskellDepends = [
-         base haskell-src-exts pretty syb template-haskell th-orphans
-       ];
-       description = "Parse source to template-haskell abstract syntax";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-src-meta_0_7_0_1" = callPackage
     ({ mkDerivation, base, haskell-src-exts, pretty, syb
      , template-haskell, th-orphans
      }:
@@ -85797,7 +81408,6 @@ self: {
        ];
        description = "Parse source to template-haskell abstract syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-src-meta-mwotton" = callPackage
@@ -86794,29 +82404,6 @@ self: {
      }) {};
 
   "haskintex" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, directory
-     , filepath, haskell-src-exts, HaTeX, hint, parsec, process, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "haskintex";
-       version = "0.6.0.1";
-       sha256 = "9b45463a0d77e8665cc82b656b6d9f8020c873d73f2dd9fe92fcb85a45e90f44";
-       revision = "1";
-       editedCabalFile = "8a16e2748e754c6fe0d7bd20186166b46819b12c6853c1275fda55e56d8ef8c7";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base binary bytestring containers directory filepath
-         haskell-src-exts HaTeX hint parsec process text transformers
-       ];
-       executableHaskellDepends = [ base ];
-       homepage = "http://daniel-diaz.github.io/projects/haskintex";
-       description = "Haskell Evaluation inside of LaTeX code";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskintex_0_7_0_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, directory
      , filepath, haskell-src-exts, HaTeX, hint, parsec, process, text
      , transformers
@@ -86835,7 +82422,6 @@ self: {
        homepage = "http://daniel-diaz.github.io/projects/haskintex";
        description = "Haskell Evaluation inside of LaTeX code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskmon" = callPackage
@@ -87731,23 +83317,6 @@ self: {
      }) {};
 
   "hasty-hamiltonian" = callPackage
-    ({ mkDerivation, ad, base, lens, mcmc-types, mwc-probability, pipes
-     , primitive, transformers
-     }:
-     mkDerivation {
-       pname = "hasty-hamiltonian";
-       version = "1.1.5";
-       sha256 = "d3a62d1933ca6ebc2b53a7a620922809297350d33986904e69072c1e8bfa3fa6";
-       libraryHaskellDepends = [
-         base lens mcmc-types mwc-probability pipes primitive transformers
-       ];
-       testHaskellDepends = [ ad base mwc-probability ];
-       homepage = "http://github.com/jtobin/hasty-hamiltonian";
-       description = "Speedy traversal through parameter space";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hasty-hamiltonian_1_3_0" = callPackage
     ({ mkDerivation, ad, base, kan-extensions, lens, mcmc-types
      , mwc-probability, pipes, primitive, transformers
      }:
@@ -87763,7 +83332,6 @@ self: {
        homepage = "http://github.com/jtobin/hasty-hamiltonian";
        description = "Speedy traversal through parameter space";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hat" = callPackage
@@ -90029,8 +85597,8 @@ self: {
      }:
      mkDerivation {
        pname = "heterocephalus";
-       version = "1.0.3.1";
-       sha256 = "9be3bf3945b4a937cb7c34e040ba5ebc220551a4e4685258a9ad3da7280575c4";
+       version = "1.0.4.0";
+       sha256 = "4a208830f15a3575f10c238bed8ff09827483eec94b8cc068c6907d2106f982a";
        libraryHaskellDepends = [
          base blaze-html blaze-markup containers dlist parsec shakespeare
          template-haskell text
@@ -91147,8 +86715,8 @@ self: {
      }:
      mkDerivation {
        pname = "highjson";
-       version = "0.3.0.0";
-       sha256 = "4d1d518ca40891e76e67dc6616d8ec94351efa70715098a745b596c987ddc5f7";
+       version = "0.4.0.0";
+       sha256 = "c3eb05ed1abd9dd59eedcd22bd60b326059d0c3dcaee2a9f8238b0ac08a26962";
        libraryHaskellDepends = [ aeson base hvect lens text ];
        testHaskellDepends = [ aeson base hspec lens QuickCheck text ];
        homepage = "https://github.com/agrafix/highjson";
@@ -91163,8 +86731,8 @@ self: {
      }:
      mkDerivation {
        pname = "highjson-swagger";
-       version = "0.3.0.0";
-       sha256 = "d03b13a9fdd2fa9ef3c68cbecd2b1a875242fd68787c667d19e3d592796d992f";
+       version = "0.4.0.0";
+       sha256 = "2df02d2fd764fd5386094de59e181314ba152bd87dc2905d9869fefd4cb87e1f";
        libraryHaskellDepends = [
          base highjson hvect insert-ordered-containers lens swagger2 text
        ];
@@ -91176,6 +86744,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "highjson-th" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, highjson
+     , highjson-swagger, hspec, lens, QuickCheck, swagger2
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "highjson-th";
+       version = "0.4.0.0";
+       sha256 = "f30c4937a9db6eb1cea8b9efef76855af3b4745e3a620798681b8cf3c73202c5";
+       libraryHaskellDepends = [
+         aeson base highjson highjson-swagger swagger2 template-haskell text
+       ];
+       testHaskellDepends = [
+         aeson base bytestring highjson highjson-swagger hspec lens
+         QuickCheck swagger2 text
+       ];
+       homepage = "https://github.com/agrafix/highjson";
+       description = "Template Haskell helpers for highjson specs";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "highlight-versions" = callPackage
     ({ mkDerivation, ansi-terminal, base, Cabal, containers, hackage-db
      }:
@@ -91608,26 +87197,6 @@ self: {
      }) {};
 
   "hip" = callPackage
-    ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, colour
-     , deepseq, directory, filepath, hspec, JuicyPixels, netpbm
-     , primitive, process, QuickCheck, repa, temporary, vector
-     }:
-     mkDerivation {
-       pname = "hip";
-       version = "1.2.0.0";
-       sha256 = "d72879134b56197e0abf21abd09b0198581cb0302574711ffbcfff6da17dd083";
-       libraryHaskellDepends = [
-         base bytestring Chart Chart-diagrams colour deepseq directory
-         filepath JuicyPixels netpbm primitive process repa temporary vector
-       ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/lehins/hip";
-       description = "Haskell Image Processing (HIP) Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hip_1_5_2_0" = callPackage
     ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, colour
      , deepseq, directory, filepath, hspec, JuicyPixels, netpbm
      , primitive, process, QuickCheck, repa, temporary, vector
@@ -92087,26 +87656,6 @@ self: {
      }) {};
 
   "hjsonpointer" = callPackage
-    ({ mkDerivation, aeson, base, hspec, http-types, QuickCheck, text
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "hjsonpointer";
-       version = "1.0.0.2";
-       sha256 = "98e2675781d11e1c9eb903b6a7c35020137625e305efb0fcb8f7614f09e6e8f2";
-       libraryHaskellDepends = [
-         aeson base QuickCheck text unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base hspec http-types QuickCheck text unordered-containers
-         vector
-       ];
-       homepage = "https://github.com/seagreen/hjsonpointer";
-       description = "JSON Pointer library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hjsonpointer_1_1_0_2" = callPackage
     ({ mkDerivation, aeson, base, hashable, hspec, http-types
      , QuickCheck, semigroups, text, unordered-containers, vector
      }:
@@ -92125,37 +87674,9 @@ self: {
        homepage = "https://github.com/seagreen/hjsonpointer";
        description = "JSON Pointer library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hjsonschema" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, containers
-     , directory, file-embed, filepath, hjsonpointer, http-client
-     , http-types, HUnit, pcre-heavy, profunctors, QuickCheck
-     , scientific, semigroups, tasty, tasty-hunit, tasty-quickcheck
-     , text, unordered-containers, vector, wai-app-static, warp
-     }:
-     mkDerivation {
-       pname = "hjsonschema";
-       version = "1.1.0.1";
-       sha256 = "52e85f98ace68a20ad1435b56c0d201a5cbb8c475dd3086aee860aa72da3824d";
-       libraryHaskellDepends = [
-         aeson base bytestring containers file-embed filepath hjsonpointer
-         http-client http-types pcre-heavy profunctors QuickCheck scientific
-         semigroups text unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson async base bytestring directory filepath hjsonpointer HUnit
-         profunctors QuickCheck semigroups tasty tasty-hunit
-         tasty-quickcheck text unordered-containers vector wai-app-static
-         warp
-       ];
-       homepage = "https://github.com/seagreen/hjsonschema";
-       description = "JSON Schema library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hjsonschema_1_5_0_1" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , directory, file-embed, filepath, hashable, hjsonpointer, hspec
      , http-client, http-types, pcre-heavy, profunctors, protolude
@@ -92180,7 +87701,6 @@ self: {
        homepage = "https://github.com/seagreen/hjsonschema";
        description = "JSON Schema library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hkdf" = callPackage
@@ -92624,8 +88144,8 @@ self: {
     ({ mkDerivation, base, bindings-DSL, git, openssl, process, zlib }:
      mkDerivation {
        pname = "hlibgit2";
-       version = "0.18.0.15";
-       sha256 = "1170c1f71b39d13699018c29688c005c7aa2d07d8bbbb9d383a9a85e5d4c5601";
+       version = "0.18.0.16";
+       sha256 = "199e4027faafe0a39d18ca3168923d44c57b386b960c72398df1c0fb7eff8e5e";
        libraryHaskellDepends = [ base bindings-DSL zlib ];
        librarySystemDepends = [ openssl ];
        testHaskellDepends = [ base process ];
@@ -92656,8 +88176,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "1.9.35";
-       sha256 = "5e6289dadc77a0862ee12ec09136059011fd779c96ff6ffeec899170a97d7a8a";
+       version = "1.9.41";
+       sha256 = "2d9299f7952af44b2f06a67af917859fd51e1056c7d405f0930769ea1e093fb4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92671,29 +88191,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hlint_1_9_40" = callPackage
-    ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs
-     , directory, extra, filepath, haskell-src-exts, hscolour, process
-     , refact, transformers, uniplate
-     }:
-     mkDerivation {
-       pname = "hlint";
-       version = "1.9.40";
-       sha256 = "68ff63ac4686ac5b09ff71be811af57a2e640af49e3e606f389901b6388594a1";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-terminal base cmdargs containers cpphs directory extra
-         filepath haskell-src-exts hscolour process refact transformers
-         uniplate
-       ];
-       executableHaskellDepends = [ base ];
-       homepage = "https://github.com/ndmitchell/hlint#readme";
-       description = "Source code suggestions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "hlogger" = callPackage
     ({ mkDerivation, base, old-locale, time }:
      mkDerivation {
@@ -92799,26 +88296,6 @@ self: {
      }) {};
 
   "hmatrix" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, deepseq
-     , openblasCompat, random, split, storable-complex, vector
-     }:
-     mkDerivation {
-       pname = "hmatrix";
-       version = "0.17.0.2";
-       sha256 = "28ed9558064917636db095ef76e10b59ae935e3ee68c96ff0d27f9e405ccfab9";
-       configureFlags = [ "-fopenblas" ];
-       libraryHaskellDepends = [
-         array base binary bytestring deepseq random split storable-complex
-         vector
-       ];
-       librarySystemDepends = [ openblasCompat ];
-       preConfigure = "sed -i hmatrix.cabal -e 's@/usr/@/dont/hardcode/paths/@'";
-       homepage = "https://github.com/albertoruiz/hmatrix";
-       description = "Numeric Linear Algebra";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) openblasCompat;};
-
-  "hmatrix_0_18_0_0" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, deepseq
      , openblasCompat, random, split, storable-complex, vector
      }:
@@ -92836,7 +88313,6 @@ self: {
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Numeric Linear Algebra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openblasCompat;};
 
   "hmatrix-banded" = callPackage
@@ -92880,22 +88356,6 @@ self: {
      }) {inherit (pkgs) glpk;};
 
   "hmatrix-gsl" = callPackage
-    ({ mkDerivation, array, base, gsl, hmatrix, process, random, vector
-     }:
-     mkDerivation {
-       pname = "hmatrix-gsl";
-       version = "0.17.0.0";
-       sha256 = "fc50e9f80adee9f93874b20aae1a8009a1dcd94316784827618d5ad192e578c9";
-       libraryHaskellDepends = [
-         array base hmatrix process random vector
-       ];
-       libraryPkgconfigDepends = [ gsl ];
-       homepage = "https://github.com/albertoruiz/hmatrix";
-       description = "Numerical computation";
-       license = "GPL";
-     }) {inherit (pkgs) gsl;};
-
-  "hmatrix-gsl_0_18_0_1" = callPackage
     ({ mkDerivation, array, base, gsl, hmatrix, process, random, vector
      }:
      mkDerivation {
@@ -92909,27 +88369,9 @@ self: {
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Numerical computation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gsl;};
 
   "hmatrix-gsl-stats" = callPackage
-    ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex
-     , vector
-     }:
-     mkDerivation {
-       pname = "hmatrix-gsl-stats";
-       version = "0.4.1.4";
-       sha256 = "98fe0e49be78a1ff7e5ca44ab086d57bafcf97b86bc249d940501a28dacffafa";
-       libraryHaskellDepends = [
-         base binary hmatrix storable-complex vector
-       ];
-       libraryPkgconfigDepends = [ gsl ];
-       homepage = "http://code.haskell.org/hmatrix-gsl-stats";
-       description = "GSL Statistics interface";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) gsl;};
-
-  "hmatrix-gsl-stats_0_4_1_6" = callPackage
     ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex
      , vector
      }:
@@ -92944,7 +88386,6 @@ self: {
        homepage = "http://code.haskell.org/hmatrix-gsl-stats";
        description = "GSL Statistics interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gsl;};
 
   "hmatrix-mmap" = callPackage
@@ -93426,14 +88867,15 @@ self: {
 
   "hoauth2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types
-     , text
+     , text, unordered-containers
      }:
      mkDerivation {
        pname = "hoauth2";
-       version = "0.5.4.0";
-       sha256 = "dc83b0cd5ee51b9c9b28ea04417341dbd146720f43ac73792b180e205ea4cdf9";
+       version = "0.5.7";
+       sha256 = "7b196e4b70b8207c4beb3479f5ab4476c17d9c0ec7d8f1fcb658590641e9b9ec";
        libraryHaskellDepends = [
          aeson base bytestring http-conduit http-types text
+         unordered-containers
        ];
        homepage = "https://github.com/freizl/hoauth2";
        description = "Haskell OAuth2 authentication client";
@@ -93525,27 +88967,6 @@ self: {
      }) {};
 
   "hocilib" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, containers, inline-c
-     , ocilib, tasty, tasty-hunit, template-haskell
-     }:
-     mkDerivation {
-       pname = "hocilib";
-       version = "0.1.0";
-       sha256 = "44354cbcfd324ce02786131fc3e0ffac29d4a8676854cac45e675e47cdc35e51";
-       libraryHaskellDepends = [
-         base containers inline-c template-haskell
-       ];
-       librarySystemDepends = [ ocilib ];
-       libraryToolDepends = [ c2hs ];
-       testHaskellDepends = [ base bytestring tasty tasty-hunit ];
-       testSystemDepends = [ ocilib ];
-       homepage = "https://github.com/fpinsight/hocilib";
-       description = "FFI binding to OCILIB";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {ocilib = null;};
-
-  "hocilib_0_2_0" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, containers, inline-c
      , ocilib, tasty, tasty-hunit, template-haskell
      }:
@@ -93821,28 +89242,6 @@ self: {
      }) {};
 
   "homplexity" = callPackage
-    ({ mkDerivation, base, containers, cpphs, deepseq, directory
-     , filepath, happy, haskell-src-exts, hflags, template-haskell
-     , uniplate
-     }:
-     mkDerivation {
-       pname = "homplexity";
-       version = "0.4.3.3";
-       sha256 = "a536f540770c741a12387df2e6f68042f9644311e9077dbdd7d59a4551753609";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base containers cpphs deepseq directory filepath haskell-src-exts
-         hflags template-haskell uniplate
-       ];
-       executableToolDepends = [ happy ];
-       testHaskellDepends = [ base haskell-src-exts uniplate ];
-       homepage = "https://github.com/mgajda/homplexity";
-       description = "Haskell code quality tool";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "homplexity_0_4_3_4" = callPackage
     ({ mkDerivation, base, containers, cpphs, deepseq, directory
      , filepath, happy, haskell-src-exts, hflags, template-haskell
      , uniplate
@@ -93862,7 +89261,6 @@ self: {
        homepage = "https://github.com/mgajda/homplexity";
        description = "Haskell code quality tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "honi" = callPackage
@@ -95584,24 +90982,6 @@ self: {
      }) {};
 
   "hreader" = callPackage
-    ({ mkDerivation, base, exceptions, hset, mmorph, monad-control, mtl
-     , tagged, transformers-base
-     }:
-     mkDerivation {
-       pname = "hreader";
-       version = "1.0.2";
-       sha256 = "49e1e805966fab3f82ef2e1f2565b2a760b73026f392410b53df6c2c8b8f59d4";
-       libraryHaskellDepends = [
-         base exceptions hset mmorph monad-control mtl tagged
-         transformers-base
-       ];
-       testHaskellDepends = [ base hset transformers-base ];
-       homepage = "https://bitbucket.org/s9gf4ult/hreader";
-       description = "Generalization of MonadReader and ReaderT using hset";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hreader_1_1_0" = callPackage
     ({ mkDerivation, base, exceptions, hset, mmorph, monad-control, mtl
      , tagged, transformers, transformers-base
      }:
@@ -95617,7 +90997,6 @@ self: {
        homepage = "https://bitbucket.org/s9gf4ult/hreader";
        description = "Generalization of MonadReader and ReaderT using hset";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hreader-lens" = callPackage
@@ -97094,20 +92473,6 @@ self: {
      }) {};
 
   "hsdns" = callPackage
-    ({ mkDerivation, adns, base, containers, network }:
-     mkDerivation {
-       pname = "hsdns";
-       version = "1.6.1";
-       sha256 = "64c1475d7625733c9fafe804ae809d459156f6a96a922adf99e5d8e02553c368";
-       libraryHaskellDepends = [ base containers network ];
-       librarySystemDepends = [ adns ];
-       homepage = "http://github.com/peti/hsdns";
-       description = "Asynchronous DNS Resolver";
-       license = stdenv.lib.licenses.lgpl3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
-     }) {inherit (pkgs) adns;};
-
-  "hsdns_1_7" = callPackage
     ({ mkDerivation, adns, base, containers, network }:
      mkDerivation {
        pname = "hsdns";
@@ -97118,7 +92483,6 @@ self: {
        homepage = "http://github.com/peti/hsdns";
        description = "Asynchronous DNS Resolver";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {inherit (pkgs) adns;};
 
@@ -97140,19 +92504,6 @@ self: {
      }) {};
 
   "hse-cpp" = callPackage
-    ({ mkDerivation, base, cpphs, haskell-src-exts }:
-     mkDerivation {
-       pname = "hse-cpp";
-       version = "0.1";
-       sha256 = "a075790dd132107b8005478179fcaf7e37a78c3011ca536ff0d95e0b437c2b38";
-       revision = "1";
-       editedCabalFile = "9ed587127e9760a075bf6ea478997e1a1fb9e500102bd883206aa843e7d92a4b";
-       libraryHaskellDepends = [ base cpphs haskell-src-exts ];
-       description = "Preprocess+parse haskell code";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hse-cpp_0_2" = callPackage
     ({ mkDerivation, base, cpphs, haskell-src-exts }:
      mkDerivation {
        pname = "hse-cpp";
@@ -97161,7 +92512,6 @@ self: {
        libraryHaskellDepends = [ base cpphs haskell-src-exts ];
        description = "Preprocess+parse haskell code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsebaysdk" = callPackage
@@ -97275,6 +92625,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hsexif_0_6_1_0" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit
+     , iconv, text, time
+     }:
+     mkDerivation {
+       pname = "hsexif";
+       version = "0.6.1.0";
+       sha256 = "868a46bcd841a2db36eebba803962f966c24c4a98b7581c9f329fd596bafab4f";
+       libraryHaskellDepends = [
+         base binary bytestring containers iconv text time
+       ];
+       testHaskellDepends = [
+         base binary bytestring containers hspec HUnit iconv text time
+       ];
+       homepage = "https://github.com/emmanueltouzery/hsexif";
+       description = "EXIF handling library in pure Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hsfacter" = callPackage
     ({ mkDerivation, base, containers, language-puppet, text }:
      mkDerivation {
@@ -97390,27 +92760,6 @@ self: {
      }) {};
 
   "hsignal" = callPackage
-    ({ mkDerivation, array, base, binary, blas, bytestring, gsl
-     , hmatrix, hmatrix-gsl, hmatrix-gsl-stats, hstatistics, liblapack
-     , mtl, storable-complex, vector
-     }:
-     mkDerivation {
-       pname = "hsignal";
-       version = "0.2.7.4";
-       sha256 = "290436ca76d13a4435da0b33d20a69663d955abcf361661cf9835e7eedb4f53a";
-       libraryHaskellDepends = [
-         array base binary bytestring hmatrix hmatrix-gsl hmatrix-gsl-stats
-         hstatistics mtl storable-complex vector
-       ];
-       librarySystemDepends = [ blas liblapack ];
-       libraryPkgconfigDepends = [ gsl ];
-       homepage = "http://code.haskell.org/hsignal";
-       description = "Signal processing and EEG data analysis";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) blas; inherit (pkgs) gsl; 
-         inherit (pkgs) liblapack;};
-
-  "hsignal_0_2_7_5" = callPackage
     ({ mkDerivation, array, base, binary, blas, bytestring, gsl
      , hmatrix, hmatrix-gsl, hmatrix-gsl-stats, hstatistics, liblapack
      , mtl, storable-complex, vector
@@ -97428,7 +92777,6 @@ self: {
        homepage = "http://code.haskell.org/hsignal";
        description = "Signal processing and EEG data analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) blas; inherit (pkgs) gsl; 
          inherit (pkgs) liblapack;};
 
@@ -98019,30 +93367,6 @@ self: {
      }) {};
 
   "hspec" = callPackage
-    ({ mkDerivation, base, directory, hspec-core, hspec-discover
-     , hspec-expectations, hspec-meta, HUnit, QuickCheck, stringbuilder
-     , transformers
-     }:
-     mkDerivation {
-       pname = "hspec";
-       version = "2.2.4";
-       sha256 = "724b0af9c871711f10a414d335a2ed0caabb94efb8576f94b43386b7f103c9b1";
-       revision = "1";
-       editedCabalFile = "eb22cb737adc3312b21699b6ac4137489590ada1ee9ee9ae21aae3c342b3880f";
-       libraryHaskellDepends = [
-         base hspec-core hspec-discover hspec-expectations HUnit QuickCheck
-         transformers
-       ];
-       testHaskellDepends = [
-         base directory hspec-core hspec-discover hspec-expectations
-         hspec-meta HUnit QuickCheck stringbuilder transformers
-       ];
-       homepage = "http://hspec.github.io/";
-       description = "A Testing Framework for Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec_2_4_1" = callPackage
     ({ mkDerivation, base, call-stack, directory, hspec-core
      , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck
      , stringbuilder, transformers
@@ -98063,7 +93387,6 @@ self: {
        homepage = "http://hspec.github.io/";
        description = "A Testing Framework for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-attoparsec" = callPackage
@@ -98111,32 +93434,6 @@ self: {
      }) {};
 
   "hspec-core" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, deepseq
-     , hspec-expectations, hspec-meta, HUnit, process, QuickCheck
-     , quickcheck-io, random, setenv, silently, tf-random, time
-     , transformers
-     }:
-     mkDerivation {
-       pname = "hspec-core";
-       version = "2.2.4";
-       sha256 = "328ac2525b9eb0fe4807d5ae10fe2d846220f9a8b5ac6b5d316e1bea9e2d0475";
-       revision = "1";
-       editedCabalFile = "9a0c9fc612eb71ee55ebcaacbce010b87ffef8a535ed6ee1f50d8bd952dc86c3";
-       libraryHaskellDepends = [
-         ansi-terminal async base deepseq hspec-expectations HUnit
-         QuickCheck quickcheck-io random setenv tf-random time transformers
-       ];
-       testHaskellDepends = [
-         ansi-terminal async base deepseq hspec-expectations hspec-meta
-         HUnit process QuickCheck quickcheck-io random setenv silently
-         tf-random time transformers
-       ];
-       homepage = "http://hspec.github.io/";
-       description = "A Testing Framework for Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-core_2_4_1" = callPackage
     ({ mkDerivation, ansi-terminal, array, async, base, call-stack
      , deepseq, directory, filepath, hspec-expectations, hspec-meta
      , HUnit, process, QuickCheck, quickcheck-io, random, setenv
@@ -98160,26 +93457,9 @@ self: {
        homepage = "http://hspec.github.io/";
        description = "A Testing Framework for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-discover" = callPackage
-    ({ mkDerivation, base, directory, filepath, hspec-meta }:
-     mkDerivation {
-       pname = "hspec-discover";
-       version = "2.2.4";
-       sha256 = "bb8ddb3c53d4c0cc3829c60d9b848aa19d843b19f22ef26355a12fb0d1e2e7af";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base directory filepath ];
-       executableHaskellDepends = [ base directory filepath ];
-       testHaskellDepends = [ base directory filepath hspec-meta ];
-       homepage = "http://hspec.github.io/";
-       description = "Automatically discover and run Hspec tests";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-discover_2_4_1" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta }:
      mkDerivation {
        pname = "hspec-discover";
@@ -98193,22 +93473,9 @@ self: {
        homepage = "http://hspec.github.io/";
        description = "Automatically discover and run Hspec tests";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-expectations" = callPackage
-    ({ mkDerivation, base, HUnit }:
-     mkDerivation {
-       pname = "hspec-expectations";
-       version = "0.7.2";
-       sha256 = "371a176b22ebdbc94b7bba55e0bda2296b44c11af01d20b23e4350ef7094a6f0";
-       libraryHaskellDepends = [ base HUnit ];
-       homepage = "https://github.com/sol/hspec-expectations#readme";
-       description = "Catchy combinators for HUnit";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-expectations_0_8_2" = callPackage
     ({ mkDerivation, base, call-stack, HUnit, nanospec }:
      mkDerivation {
        pname = "hspec-expectations";
@@ -98219,7 +93486,6 @@ self: {
        homepage = "https://github.com/hspec/hspec-expectations#readme";
        description = "Catchy combinators for HUnit";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-expectations-lens" = callPackage
@@ -98363,27 +93629,6 @@ self: {
      }) {};
 
   "hspec-megaparsec" = callPackage
-    ({ mkDerivation, base, containers, hspec, hspec-expectations
-     , megaparsec
-     }:
-     mkDerivation {
-       pname = "hspec-megaparsec";
-       version = "0.2.1";
-       sha256 = "6474bc9a4d77cf68c4415bfa2d76da77ece418d6570429ca6c8b68eb7463de6b";
-       revision = "2";
-       editedCabalFile = "6da45ba059597259f057ddbfeb7b852beccd3476a21f7e0e2e68ced36a5668c8";
-       libraryHaskellDepends = [
-         base containers hspec-expectations megaparsec
-       ];
-       testHaskellDepends = [
-         base containers hspec hspec-expectations megaparsec
-       ];
-       homepage = "https://github.com/mrkkrp/hspec-megaparsec";
-       description = "Utility functions for testing Megaparsec parsers with Hspec";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hspec-megaparsec_0_3_1" = callPackage
     ({ mkDerivation, base, containers, hspec, hspec-expectations
      , megaparsec
      }:
@@ -98400,31 +93645,9 @@ self: {
        homepage = "https://github.com/mrkkrp/hspec-megaparsec";
        description = "Utility functions for testing Megaparsec parsers with Hspec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-meta" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, deepseq, directory
-     , filepath, hspec-expectations, HUnit, QuickCheck, quickcheck-io
-     , random, setenv, time, transformers
-     }:
-     mkDerivation {
-       pname = "hspec-meta";
-       version = "2.2.1";
-       sha256 = "aa7b54c33cad9842783035d1a5cddbbbc3d556c8b2c8f6d0e6bfd3177b9e37d4";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-terminal async base deepseq hspec-expectations HUnit
-         QuickCheck quickcheck-io random setenv time transformers
-       ];
-       executableHaskellDepends = [ base directory filepath ];
-       homepage = "http://hspec.github.io/";
-       description = "A version of Hspec which is used to test Hspec itself";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-meta_2_3_2" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, call-stack, deepseq
      , directory, filepath, hspec-expectations, HUnit, QuickCheck
      , quickcheck-io, random, setenv, time, transformers
@@ -98447,7 +93670,6 @@ self: {
        homepage = "http://hspec.github.io/";
        description = "A version of Hspec which is used to test Hspec itself";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-monad-control" = callPackage
@@ -98485,22 +93707,6 @@ self: {
      }) {};
 
   "hspec-setup" = callPackage
-    ({ mkDerivation, base, directory, filepath, process, projectroot }:
-     mkDerivation {
-       pname = "hspec-setup";
-       version = "0.1.1.1";
-       sha256 = "fd294bd10fc0fa1573e84d78ba7f6fd77e294efbaac419a5530e0818ece91109";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base directory filepath process projectroot
-       ];
-       homepage = "https://github.com/yamadapc/haskell-hspec-setup";
-       description = "Add an hspec test-suite in one command";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-setup_0_2_1_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, cryptohash
      , directory, directory-tree, filepath, haskell-src-exts, hspec
      , language-dockerfile, pretty, process, projectroot, QuickCheck
@@ -98528,7 +93734,6 @@ self: {
        homepage = "https://github.com/yamadapc/haskell-hspec-setup";
        description = "Add an hspec test-suite in one command";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-shouldbe" = callPackage
@@ -98557,23 +93762,6 @@ self: {
      }) {};
 
   "hspec-smallcheck" = callPackage
-    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, smallcheck }:
-     mkDerivation {
-       pname = "hspec-smallcheck";
-       version = "0.4.1";
-       sha256 = "c5ddd014ad58679554d2726a4442a124d7a3a9fad04c928c610cdc46773fc0f5";
-       revision = "1";
-       editedCabalFile = "b53fe047da5d19509d2b756c094a2acba8f7cc7011b750b0ae3f77176a53c5f6";
-       libraryHaskellDepends = [ base hspec-core smallcheck ];
-       testHaskellDepends = [
-         base hspec hspec-core QuickCheck smallcheck
-       ];
-       homepage = "http://hspec.github.io/";
-       description = "SmallCheck support for the Hspec testing framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-smallcheck_0_4_2" = callPackage
     ({ mkDerivation, base, hspec, hspec-core, QuickCheck, smallcheck }:
      mkDerivation {
        pname = "hspec-smallcheck";
@@ -98586,7 +93774,6 @@ self: {
        homepage = "http://hspec.github.io/";
        description = "SmallCheck support for the Hspec testing framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-snap" = callPackage
@@ -98682,30 +93869,6 @@ self: {
      }) {};
 
   "hspec-wai" = callPackage
-    ({ mkDerivation, base, base-compat, bytestring, case-insensitive
-     , hspec, hspec-core, hspec-expectations, http-types, QuickCheck
-     , text, transformers, wai, wai-extra, with-location
-     }:
-     mkDerivation {
-       pname = "hspec-wai";
-       version = "0.6.6";
-       sha256 = "89a1753cd56b6f312a0af11b7f312c744c73a97d8ab3facfd87f8e4e3080b0e0";
-       libraryHaskellDepends = [
-         base base-compat bytestring case-insensitive hspec-core
-         hspec-expectations http-types QuickCheck text transformers wai
-         wai-extra with-location
-       ];
-       testHaskellDepends = [
-         base base-compat bytestring case-insensitive hspec hspec-core
-         hspec-expectations http-types QuickCheck text transformers wai
-         wai-extra with-location
-       ];
-       homepage = "https://github.com/hspec/hspec-wai#readme";
-       description = "Experimental Hspec support for testing WAI applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-wai_0_8_0" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, case-insensitive
      , hspec, hspec-core, hspec-expectations, http-types, QuickCheck
      , text, transformers, wai, wai-extra
@@ -98727,28 +93890,9 @@ self: {
        homepage = "https://github.com/hspec/hspec-wai#readme";
        description = "Experimental Hspec support for testing WAI applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-wai-json" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, bytestring
-     , case-insensitive, hspec, hspec-wai, template-haskell
-     }:
-     mkDerivation {
-       pname = "hspec-wai-json";
-       version = "0.6.1";
-       sha256 = "303e0e67c217ead3ef64f3ac3870b6c9b14a4135df5e8b2c79ad73df5a347c69";
-       libraryHaskellDepends = [
-         aeson aeson-qq base bytestring case-insensitive hspec-wai
-         template-haskell
-       ];
-       testHaskellDepends = [ base hspec hspec-wai ];
-       homepage = "https://github.com/hspec/hspec-wai#readme";
-       description = "Testing JSON APIs with hspec-wai";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-wai-json_0_8_0" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, bytestring
      , case-insensitive, hspec, hspec-wai, template-haskell
      }:
@@ -98764,7 +93908,6 @@ self: {
        homepage = "https://github.com/hspec/hspec-wai#readme";
        description = "Testing JSON APIs with hspec-wai";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-webdriver" = callPackage
@@ -99231,22 +94374,6 @@ self: {
      }) {};
 
   "hstatistics" = callPackage
-    ({ mkDerivation, array, base, hmatrix, hmatrix-gsl-stats, random
-     , vector
-     }:
-     mkDerivation {
-       pname = "hstatistics";
-       version = "0.2.5.4";
-       sha256 = "e657ac9bb672b502d5dec0e8920679a5833be5bfe0a8a981b7eccc0a99a0e47b";
-       libraryHaskellDepends = [
-         array base hmatrix hmatrix-gsl-stats random vector
-       ];
-       homepage = "http://code.haskell.org/hstatistics";
-       description = "Statistics";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hstatistics_0_3" = callPackage
     ({ mkDerivation, array, base, hmatrix, hmatrix-gsl-stats, random
      , vector
      }:
@@ -99260,7 +94387,6 @@ self: {
        homepage = "http://code.haskell.org/hstatistics";
        description = "Statistics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hstats" = callPackage
@@ -99541,25 +94667,6 @@ self: {
      }) {};
 
   "hsx2hs" = callPackage
-    ({ mkDerivation, base, bytestring, haskell-src-exts
-     , haskell-src-meta, mtl, template-haskell, utf8-string
-     }:
-     mkDerivation {
-       pname = "hsx2hs";
-       version = "0.13.5";
-       sha256 = "0dbaa29287ef82bfbe573f399a635aa109fe675e4dd91f3ee8c2cefd5593ed6e";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring haskell-src-exts haskell-src-meta mtl
-         template-haskell utf8-string
-       ];
-       homepage = "https://github.com/seereason/hsx2hs";
-       description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hsx2hs_0_14_0" = callPackage
     ({ mkDerivation, base, bytestring, haskell-src-exts
      , haskell-src-meta, mtl, template-haskell, utf8-string
      }:
@@ -99576,7 +94683,6 @@ self: {
        homepage = "https://github.com/seereason/hsx2hs";
        description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsyscall" = callPackage
@@ -100078,26 +95184,6 @@ self: {
      }) {};
 
   "http-api-data" = callPackage
-    ({ mkDerivation, base, bytestring, directory, doctest, filepath
-     , hspec, HUnit, QuickCheck, text, time, time-locale-compat
-     }:
-     mkDerivation {
-       pname = "http-api-data";
-       version = "0.2.4";
-       sha256 = "6bb90863343b17b9ce6ee8cfce9a41db0b4287343aa6cf0654a3ad5c5c5e6635";
-       libraryHaskellDepends = [
-         base bytestring text time time-locale-compat
-       ];
-       testHaskellDepends = [
-         base bytestring directory doctest filepath hspec HUnit QuickCheck
-         text time
-       ];
-       homepage = "http://github.com/fizruk/http-api-data";
-       description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "http-api-data_0_3_5" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , doctest, filepath, hashable, hspec, HUnit, QuickCheck
      , quickcheck-instances, text, time, time-locale-compat
@@ -100119,7 +95205,6 @@ self: {
        homepage = "http://github.com/fizruk/http-api-data";
        description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-attoparsec" = callPackage
@@ -100136,36 +95221,6 @@ self: {
      }) {};
 
   "http-client" = callPackage
-    ({ mkDerivation, array, async, base, base64-bytestring
-     , blaze-builder, bytestring, case-insensitive, containers, cookie
-     , data-default-class, deepseq, directory, exceptions, filepath
-     , ghc-prim, hspec, http-types, mime-types, monad-control, network
-     , network-uri, random, streaming-commons, text, time, transformers
-     , zlib
-     }:
-     mkDerivation {
-       pname = "http-client";
-       version = "0.4.31.2";
-       sha256 = "16410148a9705677cdd89510192caf1abd3460db2a17ce0c2fafd7bd0c15d88b";
-       libraryHaskellDepends = [
-         array base base64-bytestring blaze-builder bytestring
-         case-insensitive containers cookie data-default-class deepseq
-         exceptions filepath ghc-prim http-types mime-types network
-         network-uri random streaming-commons text time transformers
-       ];
-       testHaskellDepends = [
-         async base base64-bytestring blaze-builder bytestring
-         case-insensitive containers deepseq directory hspec http-types
-         monad-control network network-uri streaming-commons text time
-         transformers zlib
-       ];
-       doCheck = false;
-       homepage = "https://github.com/snoyberg/http-client";
-       description = "An HTTP client engine, intended as a base layer for more user-friendly packages";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "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
@@ -100192,7 +95247,6 @@ self: {
        homepage = "https://github.com/snoyberg/http-client";
        description = "An HTTP client engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-client-auth" = callPackage
@@ -100328,27 +95382,6 @@ self: {
      }) {};
 
   "http-client-tls" = callPackage
-    ({ mkDerivation, base, bytestring, connection, data-default-class
-     , hspec, http-client, http-types, network, tls
-     }:
-     mkDerivation {
-       pname = "http-client-tls";
-       version = "0.2.4.1";
-       sha256 = "8dc85884e15cd32f59a47e11861d78566c6ccb202e8d317403b784278f628ba3";
-       revision = "1";
-       editedCabalFile = "26f1b0cf1b449df4fce7c4531444ff06ccfacae528d20c5470461ecc4058f56c";
-       libraryHaskellDepends = [
-         base bytestring connection data-default-class http-client network
-         tls
-       ];
-       testHaskellDepends = [ base hspec http-client http-types ];
-       doCheck = false;
-       homepage = "https://github.com/snoyberg/http-client";
-       description = "http-client backend using the connection package and tls library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "http-client-tls_0_3_3_1" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, connection
      , cryptonite, data-default-class, exceptions, hspec, http-client
      , http-types, memory, network, tls, transformers
@@ -100367,7 +95400,6 @@ self: {
        homepage = "https://github.com/snoyberg/http-client";
        description = "http-client backend using the connection package and tls library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-common" = callPackage
@@ -100389,36 +95421,6 @@ self: {
      }) {};
 
   "http-conduit" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring
-     , case-insensitive, conduit, conduit-extra, connection, cookie
-     , data-default-class, exceptions, hspec, http-client
-     , http-client-tls, http-types, HUnit, lifted-base, monad-control
-     , mtl, network, resourcet, streaming-commons, temporary, text, time
-     , transformers, utf8-string, wai, wai-conduit, warp, warp-tls
-     }:
-     mkDerivation {
-       pname = "http-conduit";
-       version = "2.1.11";
-       sha256 = "75df5c0515080a09b4cdc73a759523b10265a692ff50beb964766d4f8dcf0d7f";
-       libraryHaskellDepends = [
-         aeson base bytestring conduit conduit-extra data-default-class
-         exceptions http-client http-client-tls http-types lifted-base
-         monad-control mtl resourcet transformers
-       ];
-       testHaskellDepends = [
-         aeson base blaze-builder bytestring case-insensitive conduit
-         conduit-extra connection cookie data-default-class hspec
-         http-client http-types HUnit lifted-base network streaming-commons
-         temporary text time transformers utf8-string wai wai-conduit warp
-         warp-tls
-       ];
-       doCheck = false;
-       homepage = "http://www.yesodweb.com/book/http-conduit";
-       description = "HTTP client package with conduit interface and HTTPS support";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "http-conduit_2_2_3" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring
      , case-insensitive, conduit, conduit-extra, connection, cookie
      , data-default-class, exceptions, hspec, http-client
@@ -100446,7 +95448,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/http-conduit";
        description = "HTTP client package with conduit interface and HTTPS support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-conduit-browser" = callPackage
@@ -100998,29 +95999,6 @@ self: {
      }) {};
 
   "http2" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
-     , bytestring-builder, case-insensitive, containers, directory
-     , doctest, filepath, Glob, hex, hspec, psqueues, stm, text
-     , unordered-containers, vector, word8
-     }:
-     mkDerivation {
-       pname = "http2";
-       version = "1.6.2";
-       sha256 = "99e75ac0fa19276d276ec63bb94eefb2e952b0a374aea8f3d2c2408a634b6fe7";
-       libraryHaskellDepends = [
-         array base bytestring bytestring-builder case-insensitive
-         containers psqueues stm
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty array base bytestring bytestring-builder
-         case-insensitive containers directory doctest filepath Glob hex
-         hspec psqueues stm text unordered-containers vector word8
-       ];
-       description = "HTTP/2.0 library including frames and HPACK";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "http2_1_6_3" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
      , bytestring-builder, case-insensitive, containers, directory
      , doctest, filepath, Glob, hex, hspec, psqueues, stm, text
@@ -101042,7 +96020,6 @@ self: {
        homepage = "https://github.com/kazu-yamamoto/http2";
        description = "HTTP/2 library including frames, priority queues and HPACK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "httpd-shed" = callPackage
@@ -101679,19 +96656,6 @@ self: {
      }) {};
 
   "hvect" = callPackage
-    ({ mkDerivation, base, HTF }:
-     mkDerivation {
-       pname = "hvect";
-       version = "0.3.1.0";
-       sha256 = "b9ba2408a3718b7a38b72cf7f81ce51ac9f0db63908969d386213c47b6526ab8";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base HTF ];
-       homepage = "https://github.com/agrafix/hvect";
-       description = "Simple strict heterogeneous lists";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hvect_0_4_0_0" = callPackage
     ({ mkDerivation, base, hspec }:
      mkDerivation {
        pname = "hvect";
@@ -101702,7 +96666,6 @@ self: {
        homepage = "https://github.com/agrafix/hvect";
        description = "Simple strict heterogeneous lists";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-balancedparens" = callPackage
@@ -101726,31 +96689,6 @@ self: {
      }) {};
 
   "hw-bits" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, hspec, hw-prim, mmap
-     , parsec, QuickCheck, resourcet, safe, vector
-     }:
-     mkDerivation {
-       pname = "hw-bits";
-       version = "0.1.0.1";
-       sha256 = "7d20025de04db0e4639aded0ae6ad6b9252358a14626a1bfeb726dfbf084fd0e";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring hw-prim parsec safe vector
-       ];
-       executableHaskellDepends = [
-         base criterion mmap resourcet vector
-       ];
-       testHaskellDepends = [
-         base bytestring hspec hw-prim QuickCheck vector
-       ];
-       homepage = "http://github.com/haskell-works/hw-bits#readme";
-       description = "Conduits for tokenizing streams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hw-bits_0_5_0_0" = callPackage
     ({ mkDerivation, base, bytestring, hspec, hw-int, hw-prim
      , hw-string-parse, QuickCheck, safe, vector
      }:
@@ -101771,27 +96709,6 @@ self: {
      }) {};
 
   "hw-conduit" = callPackage
-    ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec
-     , hw-bits, resourcet, word8
-     }:
-     mkDerivation {
-       pname = "hw-conduit";
-       version = "0.0.0.11";
-       sha256 = "e0e1193a901858d9bc5fccc51f99977a9bffd24993f9de6c1c3030aa0a1ed77b";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base bytestring conduit hw-bits resourcet word8
-       ];
-       executableHaskellDepends = [ base criterion ];
-       testHaskellDepends = [ base bytestring hspec ];
-       homepage = "http://github.com/haskell-works/hw-conduit#readme";
-       description = "Conduits for tokenizing streams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hw-conduit_0_1_0_0" = callPackage
     ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec
      , hw-bits, resourcet, word8
      }:
@@ -101997,26 +96914,6 @@ self: {
      }) {};
 
   "hw-prim" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, hspec, QuickCheck
-     , random, vector
-     }:
-     mkDerivation {
-       pname = "hw-prim";
-       version = "0.1.0.3";
-       sha256 = "f237844283733b85403e18d5243925946946395a2b7c2d731b7312f4a0293b84";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base bytestring deepseq random vector ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base bytestring hspec QuickCheck random vector
-       ];
-       homepage = "http://github.com/haskell-works/hw-prim#readme";
-       description = "Primitive functions and data types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hw-prim_0_4_0_2" = callPackage
     ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }:
      mkDerivation {
        pname = "hw-prim";
@@ -102027,30 +96924,9 @@ self: {
        homepage = "http://github.com/haskell-works/hw-prim#readme";
        description = "Primitive functions and data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-rankselect" = callPackage
-    ({ mkDerivation, base, hspec, hw-bits, hw-prim, QuickCheck, vector
-     }:
-     mkDerivation {
-       pname = "hw-rankselect";
-       version = "0.3.0.0";
-       sha256 = "c1b053a7b5752c55636bd95ad30678f0143aa0a3afc962ba2827187309782cfe";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base hw-bits hw-prim vector ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base hspec hw-bits hw-prim QuickCheck vector
-       ];
-       homepage = "http://github.com/haskell-works/hw-rankselect#readme";
-       description = "Conduits for tokenizing streams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hw-rankselect_0_8_0_0" = callPackage
     ({ mkDerivation, base, hspec, hw-balancedparens, hw-bits, hw-prim
      , hw-rankselect-base, QuickCheck, vector
      }:
@@ -102104,25 +96980,6 @@ self: {
      }) {};
 
   "hw-succinct" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, conduit, containers
-     , hw-bits, hw-conduit, hw-parser, hw-prim, hw-rankselect
-     , mono-traversable, text, vector, word8
-     }:
-     mkDerivation {
-       pname = "hw-succinct";
-       version = "0.0.0.14";
-       sha256 = "f3e2ec65f1d7e0baa7cda17442cdcd60635cd2693a38873361df9578b65ffbeb";
-       libraryHaskellDepends = [
-         attoparsec base bytestring conduit containers hw-bits hw-conduit
-         hw-parser hw-prim hw-rankselect mono-traversable text vector word8
-       ];
-       homepage = "http://github.com/haskell-works/hw-succinct#readme";
-       description = "Conduits for tokenizing streams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hw-succinct_0_1_0_1" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, conduit, containers
      , hw-balancedparens, hw-bits, hw-prim, hw-rankselect
      , hw-rankselect-base, mmap, mono-traversable, text, vector, word8
@@ -103668,19 +98525,6 @@ self: {
      }) {};
 
   "identicon" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, JuicyPixels }:
-     mkDerivation {
-       pname = "identicon";
-       version = "0.1.0";
-       sha256 = "cc710ce81b969cd4a6a13b3ea46c72e5a5dd9805e8f437f5c54c9ba6b4abac93";
-       libraryHaskellDepends = [ base bytestring JuicyPixels ];
-       testHaskellDepends = [ base bytestring hspec JuicyPixels ];
-       homepage = "https://github.com/mrkkrp/identicon";
-       description = "Flexible generation of identicons";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "identicon_0_2_0" = callPackage
     ({ mkDerivation, base, bytestring, hspec, JuicyPixels }:
      mkDerivation {
        pname = "identicon";
@@ -103691,7 +98535,6 @@ self: {
        homepage = "https://github.com/mrkkrp/identicon";
        description = "Flexible generation of identicons";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "identifiers" = callPackage
@@ -103785,49 +98628,6 @@ self: {
      }) {};
 
   "idris" = callPackage
-    ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal
-     , ansi-wl-pprint, array, async, base, base64-bytestring, binary
-     , blaze-html, blaze-markup, bytestring, cheapskate, containers
-     , deepseq, directory, filepath, fingertree, fsnotify, gmp
-     , haskeline, ieee754, libffi, mtl, network, optparse-applicative
-     , parsers, pretty, process, regex-tdfa, safe, split, tagged, tasty
-     , tasty-golden, tasty-rerun, terminal-size, text, time
-     , transformers, transformers-compat, trifecta, uniplate, unix
-     , unordered-containers, utf8-string, vector
-     , vector-binary-instances, zip-archive
-     }:
-     mkDerivation {
-       pname = "idris";
-       version = "0.12.3";
-       sha256 = "3a9f3d5aeb032b1d987402cf4ca54a2fbfc7b02d852a629f528943a5fe5b59c6";
-       configureFlags = [ "-fcurses" "-fffi" "-fgmp" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson annotated-wl-pprint ansi-terminal ansi-wl-pprint array async
-         base base64-bytestring binary blaze-html blaze-markup bytestring
-         cheapskate containers deepseq directory filepath fingertree
-         fsnotify haskeline ieee754 libffi mtl network optparse-applicative
-         parsers pretty process regex-tdfa safe split terminal-size text
-         time transformers transformers-compat trifecta uniplate unix
-         unordered-containers utf8-string vector vector-binary-instances
-         zip-archive
-       ];
-       librarySystemDepends = [ gmp ];
-       executableHaskellDepends = [
-         base directory filepath haskeline transformers
-       ];
-       testHaskellDepends = [
-         base bytestring containers directory filepath haskeline
-         optparse-applicative process tagged tasty tasty-golden tasty-rerun
-         time transformers
-       ];
-       homepage = "http://www.idris-lang.org/";
-       description = "Functional Programming Language with Dependent Types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) gmp;};
-
-  "idris_0_99" = callPackage
     ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal
      , ansi-wl-pprint, array, async, base, base64-bytestring, binary
      , blaze-html, blaze-markup, bytestring, cheapskate, containers
@@ -103868,7 +98668,6 @@ self: {
        homepage = "http://www.idris-lang.org/";
        description = "Functional Programming Language with Dependent Types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gmp;};
 
   "ieee" = callPackage
@@ -103907,18 +98706,6 @@ self: {
      }) {};
 
   "ieee754" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "ieee754";
-       version = "0.7.9";
-       sha256 = "dc1860c545d7143ea8c7e53509ac535ca2932495f0f89b2801c960295cfcdd15";
-       libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/patperry/hs-ieee754";
-       description = "Utilities for dealing with IEEE floating point numbers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ieee754_0_8_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "ieee754";
@@ -103928,7 +98715,6 @@ self: {
        homepage = "http://github.com/patperry/hs-ieee754";
        description = "Utilities for dealing with IEEE floating point numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ieee754-parser" = callPackage
@@ -104589,41 +99375,6 @@ self: {
      }) {};
 
   "imm" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, atom-conduit, base
-     , bytestring, case-insensitive, chunked-data, comonad, compdata
-     , conduit, conduit-combinators, conduit-parse, connection
-     , containers, directory, dyre, exceptions, fast-logger, filepath
-     , free, hashable, HaskellNet, HaskellNet-SSL, http-client
-     , http-client-tls, http-types, mime-mail, mono-traversable
-     , monoid-subclasses, network, opml-conduit, optparse-applicative
-     , rainbow, rainbox, rss-conduit, text, time, timerep, tls
-     , transformers, uri-bytestring, xml, xml-conduit
-     }:
-     mkDerivation {
-       pname = "imm";
-       version = "1.0.1.0";
-       sha256 = "287a4815b43de90e89b27a356215e57d97c03ba4f929965b1a8ca5c4fe35658b";
-       revision = "1";
-       editedCabalFile = "b6f35aaba374bd580f6f40b4629047706562a9d677ff917a7b0dee1063817e25";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-wl-pprint atom-conduit base bytestring case-insensitive
-         chunked-data comonad compdata conduit conduit-combinators
-         conduit-parse connection containers directory dyre exceptions
-         fast-logger filepath free hashable HaskellNet HaskellNet-SSL
-         http-client http-client-tls http-types mime-mail mono-traversable
-         monoid-subclasses network opml-conduit optparse-applicative rainbow
-         rainbox rss-conduit text time timerep tls transformers
-         uri-bytestring xml xml-conduit
-       ];
-       executableHaskellDepends = [ base free ];
-       homepage = "https://github.com/k0ral/imm";
-       description = "Execute arbitrary actions for each unread element of RSS/Atom feeds";
-       license = "unknown";
-     }) {};
-
-  "imm_1_1_0_0" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, atom-conduit, base
      , blaze-html, blaze-markup, bytestring, case-insensitive
      , chunked-data, comonad, conduit, conduit-combinators, connection
@@ -104655,7 +99406,6 @@ self: {
        homepage = "https://github.com/k0ral/imm";
        description = "Execute arbitrary actions for each unread element of RSS/Atom feeds";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "immortal" = callPackage
@@ -105092,18 +99842,6 @@ self: {
      }) {};
 
   "indents" = callPackage
-    ({ mkDerivation, base, concatenative, mtl, parsec }:
-     mkDerivation {
-       pname = "indents";
-       version = "0.3.3";
-       sha256 = "b61f51ac894609cb5571cc3ded12db5de97185a8de236c69ec24c87457109f9a";
-       libraryHaskellDepends = [ base concatenative mtl parsec ];
-       homepage = "http://patch-tag.com/r/salazar/indents";
-       description = "indentation sensitive parser-combinators for parsec";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "indents_0_4_0_0" = callPackage
     ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit }:
      mkDerivation {
        pname = "indents";
@@ -105114,7 +99852,6 @@ self: {
        homepage = "http://github.com/jaspervdj/indents";
        description = "indentation sensitive parser-combinators for parsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "index-core" = callPackage
@@ -105328,24 +100065,6 @@ self: {
      }) {};
 
   "inflections" = callPackage
-    ({ mkDerivation, base, containers, HUnit, parsec, QuickCheck
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "inflections";
-       version = "0.2.0.1";
-       sha256 = "4bc856a2b409fbf874714f7bf50b9db4701242cf58e133bd31b1ae39fe8e2c35";
-       libraryHaskellDepends = [ base containers parsec ];
-       testHaskellDepends = [
-         base containers HUnit parsec QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2
-       ];
-       homepage = "https://github.com/stackbuilders/inflections-hs";
-       description = "Inflections library for Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "inflections_0_3_0_0" = callPackage
     ({ mkDerivation, base, exceptions, hspec, hspec-megaparsec
      , megaparsec, QuickCheck, text, unordered-containers
      }:
@@ -105362,7 +100081,6 @@ self: {
        homepage = "https://github.com/stackbuilders/inflections-hs";
        description = "Inflections library for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inflist" = callPackage
@@ -105637,31 +100355,6 @@ self: {
      }) {aether = null;};
 
   "insert-ordered-containers" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, hashable, lens
-     , QuickCheck, semigroupoids, semigroups, tasty, tasty-quickcheck
-     , text, transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "insert-ordered-containers";
-       version = "0.1.0.1";
-       sha256 = "4905e5d128c19887a79b281150acb16cb3b043ab2c5a7788b0151ba7d46b900a";
-       revision = "3";
-       editedCabalFile = "c81fa69aa035ad468b45c812c16b80bc70020b05bf2d4a8298c90b4f772c98b1";
-       libraryHaskellDepends = [
-         aeson base base-compat hashable lens semigroupoids semigroups text
-         transformers unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base base-compat hashable lens QuickCheck semigroupoids
-         semigroups tasty tasty-quickcheck text transformers
-         unordered-containers
-       ];
-       homepage = "https://github.com/phadej/insert-ordered-containers#readme";
-       description = "Associative containers retating insertion order for traversals";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "insert-ordered-containers_0_2_0_0" = callPackage
     ({ mkDerivation, aeson, base, base-compat, hashable, lens
      , QuickCheck, semigroupoids, semigroups, tasty, tasty-quickcheck
      , text, transformers, unordered-containers
@@ -105684,7 +100377,6 @@ self: {
        homepage = "https://github.com/phadej/insert-ordered-containers#readme";
        description = "Associative containers retating insertion order for traversals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inserts" = callPackage
@@ -108680,36 +103372,6 @@ self: {
      }) {};
 
   "jose" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
-     , bifunctors, byteable, bytestring, cryptonite, data-default-class
-     , hspec, lens, memory, mtl, network-uri, QuickCheck
-     , quickcheck-instances, safe, semigroups, tasty, tasty-hspec
-     , tasty-quickcheck, template-haskell, text, time
-     , unordered-containers, vector, x509
-     }:
-     mkDerivation {
-       pname = "jose";
-       version = "0.4.0.3";
-       sha256 = "742b8037e5cc9c427789196bd425594c3fb17768fb584c8434548415aa5e0f0a";
-       libraryHaskellDepends = [
-         aeson attoparsec base base64-bytestring bifunctors byteable
-         bytestring cryptonite data-default-class lens memory mtl
-         network-uri QuickCheck quickcheck-instances safe semigroups
-         template-haskell text time unordered-containers vector x509
-       ];
-       testHaskellDepends = [
-         aeson attoparsec base base64-bytestring bifunctors byteable
-         bytestring cryptonite data-default-class hspec lens memory mtl
-         network-uri QuickCheck quickcheck-instances safe semigroups tasty
-         tasty-hspec tasty-quickcheck template-haskell text time
-         unordered-containers vector x509
-       ];
-       homepage = "https://github.com/frasertweedale/hs-jose";
-       description = "Javascript Object Signing and Encryption and JSON Web Token library";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "jose_0_5_0_2" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , byteable, bytestring, containers, cryptonite, hspec, lens, memory
      , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances
@@ -108739,7 +103401,6 @@ self: {
        homepage = "https://github.com/frasertweedale/hs-jose";
        description = "Javascript Object Signing and Encryption and JSON Web Token library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jose-jwt" = callPackage
@@ -109012,8 +103673,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-assertions";
-       version = "1.0.8";
-       sha256 = "d4e060ec54e264581e47d409e303dc3165c311dcfcd6127278c99b7a876ae259";
+       version = "1.0.9";
+       sha256 = "5a046e3559638d902adbf01d8ba99c3e3aef01e4c1ee26b5701ebdcd7a0f980b";
        libraryHaskellDepends = [
          aeson base indexed indexed-free lens lens-aeson text
        ];
@@ -110464,31 +105125,6 @@ self: {
      }) {};
 
   "kawhi" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, exceptions, http-client
-     , http-conduit, http-types, mtl, safe, scientific, smallcheck
-     , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text
-     }:
-     mkDerivation {
-       pname = "kawhi";
-       version = "0.0.1";
-       sha256 = "bb7bb30129c065032d217834d9f991df63ddfa55ee14e4c45ef5ddf141839d6f";
-       revision = "1";
-       editedCabalFile = "624bf276517215fb85d51f9252dce93acfde800feaa6439d054f6037bc2f3cb3";
-       libraryHaskellDepends = [
-         aeson base bytestring exceptions http-client http-conduit
-         http-types mtl safe scientific text
-       ];
-       testHaskellDepends = [
-         aeson base bytestring exceptions http-client http-types mtl
-         scientific smallcheck tasty tasty-hunit tasty-quickcheck
-         tasty-smallcheck text
-       ];
-       homepage = "https://github.com/hamsterdam/kawhi";
-       description = "stats.NBA.com library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "kawhi_0_2_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, exceptions, http-client
      , http-conduit, http-types, mtl, safe, scientific, smallcheck
      , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text
@@ -110509,7 +105145,6 @@ self: {
        homepage = "https://github.com/hamsterdam/kawhi";
        description = "stats.NBA.com library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kazura-queue" = callPackage
@@ -113278,50 +107913,6 @@ self: {
      }) {};
 
   "language-puppet" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
-     , base16-bytestring, bytestring, case-insensitive, containers
-     , cryptonite, directory, either, exceptions, filecache, formatting
-     , Glob, hashable, hruby, hslogger, hspec, hspec-megaparsec
-     , http-api-data, http-client, HUnit, lens, lens-aeson, megaparsec
-     , memory, mtl, operational, optparse-applicative, parallel-io
-     , parsec, pcre-utils, process, random, regex-pcre-builtin
-     , scientific, semigroups, servant, servant-client, split, stm
-     , strict-base-types, temporary, text, time, transformers, unix
-     , unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "language-puppet";
-       version = "1.3.1.1";
-       sha256 = "e2fba21b6adb148896819687062378022393fc6b237d0c65ddb7196bc86ddd12";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
-         case-insensitive containers cryptonite directory either exceptions
-         filecache formatting hashable hruby hslogger hspec http-api-data
-         http-client lens lens-aeson megaparsec memory mtl operational
-         parsec pcre-utils process random regex-pcre-builtin scientific
-         semigroups servant servant-client split stm strict-base-types text
-         time transformers unix unordered-containers vector yaml
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring containers Glob hslogger http-client lens
-         megaparsec mtl optparse-applicative parallel-io regex-pcre-builtin
-         servant-client strict-base-types text transformers
-         unordered-containers vector yaml
-       ];
-       testHaskellDepends = [
-         ansi-wl-pprint base Glob hslogger hspec hspec-megaparsec HUnit lens
-         megaparsec mtl scientific strict-base-types temporary text
-         transformers unix unordered-containers vector
-       ];
-       homepage = "http://lpuppet.banquise.net/";
-       description = "Tools to parse and evaluate the Puppet DSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-linux" ];
-     }) {};
-
-  "language-puppet_1_3_5_1" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
      , base16-bytestring, bytestring, case-insensitive, containers
      , cryptonite, directory, either, exceptions, filecache, formatting
@@ -113362,7 +107953,7 @@ self: {
        homepage = "http://lpuppet.banquise.net/";
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
   "language-python" = callPackage
@@ -113506,28 +108097,6 @@ self: {
      }) {};
 
   "language-thrift" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, containers, hspec
-     , hspec-discover, megaparsec, QuickCheck, scientific, semigroups
-     , text, transformers
-     }:
-     mkDerivation {
-       pname = "language-thrift";
-       version = "0.9.0.2";
-       sha256 = "a5c204193572f1272a9e1593f553df6d6471ea01a6432475fff0115b458bd740";
-       libraryHaskellDepends = [
-         ansi-wl-pprint base containers megaparsec scientific semigroups
-         text transformers
-       ];
-       testHaskellDepends = [
-         ansi-wl-pprint base containers hspec hspec-discover megaparsec
-         QuickCheck scientific semigroups text transformers
-       ];
-       homepage = "https://github.com/abhinav/language-thrift#readme";
-       description = "Parser and pretty printer for the Thrift IDL format";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "language-thrift_0_10_0_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, containers, hspec
      , hspec-discover, megaparsec, QuickCheck, scientific, semigroups
      , text, transformers
@@ -113547,7 +108116,6 @@ self: {
        homepage = "https://github.com/abhinav/language-thrift#readme";
        description = "Parser and pretty printer for the Thrift IDL format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-typescript" = callPackage
@@ -114506,39 +109074,6 @@ self: {
      }) {};
 
   "lens" = callPackage
-    ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
-     , comonad, containers, contravariant, distributive, exceptions
-     , filepath, free, ghc-prim, hashable, hlint, HUnit, kan-extensions
-     , mtl, parallel, profunctors, QuickCheck, reflection, semigroupoids
-     , semigroups, tagged, template-haskell, test-framework
-     , test-framework-hunit, test-framework-quickcheck2
-     , test-framework-th, text, transformers, transformers-compat
-     , unordered-containers, vector, void
-     }:
-     mkDerivation {
-       pname = "lens";
-       version = "4.14";
-       sha256 = "70a3cd18ef352950b88d6cac449988b9320704b56dceda80e7de9f2907ee5f4b";
-       revision = "1";
-       editedCabalFile = "ec2f258fa783b324c6c9177b16b5432e757928b5efec042295c88306148059c4";
-       libraryHaskellDepends = [
-         array base base-orphans bifunctors bytestring comonad containers
-         contravariant distributive exceptions filepath free ghc-prim
-         hashable kan-extensions mtl parallel profunctors reflection
-         semigroupoids semigroups tagged template-haskell text transformers
-         transformers-compat unordered-containers vector void
-       ];
-       testHaskellDepends = [
-         base containers hlint HUnit mtl QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2 test-framework-th
-         transformers
-       ];
-       homepage = "http://github.com/ekmett/lens/";
-       description = "Lenses, Folds and Traversals";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lens_4_15_1" = callPackage
     ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
      , comonad, containers, contravariant, deepseq, directory
      , distributive, doctest, exceptions, filepath, free
@@ -114572,7 +109107,6 @@ self: {
        homepage = "http://github.com/ekmett/lens/";
        description = "Lenses, Folds and Traversals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-action" = callPackage
@@ -116193,25 +110727,6 @@ self: {
      }) {};
 
   "line" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
-     , cryptohash-sha256, http-types, lens, text, time, transformers
-     , wai, wreq
-     }:
-     mkDerivation {
-       pname = "line";
-       version = "1.0.1.0";
-       sha256 = "b356e813369b9ebf80ea71a79e658caabbc32645de8821eb878809afb0f1e1d5";
-       libraryHaskellDepends = [
-         aeson base base64-bytestring bytestring cryptohash-sha256
-         http-types lens text time transformers wai wreq
-       ];
-       testHaskellDepends = [ base ];
-       homepage = "https://github.com/noraesae/line";
-       description = "Haskell SDK for the LINE API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "line_2_2_0" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , cryptohash-sha256, hspec, hspec-wai, http-conduit, http-types
      , QuickCheck, quickcheck-instances, raw-strings-qq, scotty, text
@@ -116233,7 +110748,6 @@ self: {
        homepage = "https://github.com/noraesae/line";
        description = "Haskell SDK for the LINE API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "line-break" = callPackage
@@ -118129,31 +112643,6 @@ self: {
      }) {};
 
   "log-domain" = callPackage
-    ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq
-     , directory, distributive, doctest, filepath, generic-deriving
-     , hashable, hashable-extras, safecopy, semigroupoids, semigroups
-     , simple-reflect, vector
-     }:
-     mkDerivation {
-       pname = "log-domain";
-       version = "0.10.3.1";
-       sha256 = "36f427506218358b20a2066d5fb38406816fabac18ca26c807a416a795643815";
-       revision = "2";
-       editedCabalFile = "d5c0d4af0c551eb4b014ce825c1ff6a92fa947225992a89ec9f4b67ece705c6f";
-       libraryHaskellDepends = [
-         base binary bytes cereal comonad deepseq distributive hashable
-         hashable-extras safecopy semigroupoids semigroups vector
-       ];
-       testHaskellDepends = [
-         base directory doctest filepath generic-deriving semigroups
-         simple-reflect
-       ];
-       homepage = "http://github.com/ekmett/log-domain/";
-       description = "Log-domain arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "log-domain_0_11" = callPackage
     ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq
      , directory, distributive, doctest, filepath, generic-deriving
      , hashable, safecopy, semigroupoids, semigroups, simple-reflect
@@ -118174,7 +112663,6 @@ self: {
        homepage = "http://github.com/ekmett/log-domain/";
        description = "Log-domain arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "log-effect" = callPackage
@@ -118401,8 +112889,8 @@ self: {
      }:
      mkDerivation {
        pname = "logging-effect";
-       version = "1.1.1";
-       sha256 = "4e1a6f746757ebf787820cbdb202b0b9ff206a44a24895d5500bec2ffc789fc5";
+       version = "1.1.2";
+       sha256 = "7a39a46028c456b024088fcc5995f7552abe21f6578019970cb079083180d12c";
        libraryHaskellDepends = [
          async base exceptions free monad-control mtl semigroups stm
          stm-delay text time transformers transformers-base wl-pprint-text
@@ -118410,7 +112898,6 @@ self: {
        homepage = "https://github.com/ocharles/logging-effect";
        description = "A mtl-style monad transformer for general purpose & compositional logging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logging-facade" = callPackage
@@ -120134,8 +114621,8 @@ self: {
      }:
      mkDerivation {
        pname = "mailchimp";
-       version = "0.1.0";
-       sha256 = "dbbc4645a3322e11ce33059a4660dd837574f58530aaa459b4d99dc7b1b91fe2";
+       version = "0.1.1";
+       sha256 = "d6bdac26adc60ded7352010674a0b562f9b809e5c49954dd738d1cbfd6cb95d6";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring http-client http-client-tls
          servant servant-client text transformers
@@ -122018,30 +116505,6 @@ self: {
      }) {};
 
   "megaparsec" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, exceptions
-     , HUnit, mtl, QuickCheck, scientific, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "megaparsec";
-       version = "5.0.1";
-       sha256 = "8bd9c4f4f1d92cf45577ceabd13f58e0a980848142fba1036fa37bcab4aa3b25";
-       libraryHaskellDepends = [
-         base bytestring containers deepseq exceptions mtl scientific text
-         transformers
-       ];
-       testHaskellDepends = [
-         base bytestring containers exceptions HUnit mtl QuickCheck
-         scientific test-framework test-framework-hunit
-         test-framework-quickcheck2 text transformers
-       ];
-       homepage = "https://github.com/mrkkrp/megaparsec";
-       description = "Monadic parser combinators";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "megaparsec_5_2_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, exceptions
      , hspec, hspec-expectations, mtl, QuickCheck, scientific, text
      , transformers
@@ -122061,7 +116524,6 @@ self: {
        homepage = "https://github.com/mrkkrp/megaparsec";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "meldable-heap" = callPackage
@@ -122353,21 +116815,6 @@ self: {
      }) {};
 
   "memory" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty
-     , tasty-hunit, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "memory";
-       version = "0.13";
-       sha256 = "dc73602573eaed85b1887f07057151c7de63f559ef90a10297c363d9b120870a";
-       libraryHaskellDepends = [ base bytestring deepseq ghc-prim ];
-       testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
-       homepage = "https://github.com/vincenthz/hs-memory";
-       description = "memory and related abstraction stuff";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "memory_0_14_1" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty
      , tasty-hunit, tasty-quickcheck
      }:
@@ -122380,7 +116827,6 @@ self: {
        homepage = "https://github.com/vincenthz/hs-memory";
        description = "memory and related abstraction stuff";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "memorypool" = callPackage
@@ -122444,18 +116890,6 @@ self: {
      }) {};
 
   "mersenne-random-pure64" = callPackage
-    ({ mkDerivation, base, old-time, random }:
-     mkDerivation {
-       pname = "mersenne-random-pure64";
-       version = "0.2.0.5";
-       sha256 = "3ca131d6c26fe8a086c40c6e79459149286c31083e0e110f7032aeba8038346e";
-       libraryHaskellDepends = [ base old-time random ];
-       homepage = "http://code.haskell.org/~dons/code/mersenne-random-pure64/";
-       description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "mersenne-random-pure64_0_2_2_0" = callPackage
     ({ mkDerivation, base, random, time }:
      mkDerivation {
        pname = "mersenne-random-pure64";
@@ -122465,7 +116899,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/mersenne-random-pure64/";
        description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "messagepack" = callPackage
@@ -122630,28 +117063,6 @@ self: {
      }) {};
 
   "metrics" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
-     , lens, mtl, mwc-random, primitive, QuickCheck, text, time, unix
-     , unordered-containers, vector, vector-algorithms
-     }:
-     mkDerivation {
-       pname = "metrics";
-       version = "0.3.0.2";
-       sha256 = "0df2801b630fcfe5c4a1968ccc1571016fb4c9408dfc881c599ba6f872543c02";
-       libraryHaskellDepends = [
-         ansi-terminal base bytestring containers lens mtl mwc-random
-         primitive text time unix unordered-containers vector
-         vector-algorithms
-       ];
-       testHaskellDepends = [
-         async base lens mwc-random primitive QuickCheck unix
-       ];
-       description = "High-performance application metric tracking";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "metrics_0_4_0_1" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
      , HUnit, lens, mwc-random, primitive, QuickCheck, text, time
      , transformers, transformers-base, unix-compat
@@ -122839,29 +117250,6 @@ self: {
      }) {};
 
   "microlens-aeson" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens
-     , scientific, tasty, tasty-hunit, text, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "microlens-aeson";
-       version = "2.1.1.3";
-       sha256 = "4e43bdbd0d258804ee4de0f78149dc93cfe1aaa2e1e235bc11b1965c94166731";
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring microlens scientific text
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring microlens tasty tasty-hunit text
-         unordered-containers vector
-       ];
-       homepage = "http://github.com/fosskers/microlens-aeson/";
-       description = "Law-abiding lenses for Aeson, using microlens";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "microlens-aeson_2_2_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens
      , scientific, tasty, tasty-hunit, text, unordered-containers
      , vector
@@ -123217,8 +117605,8 @@ self: {
      }:
      mkDerivation {
        pname = "mighttpd2";
-       version = "3.3.4";
-       sha256 = "9a8dd3e2bf2a62f34695a8baf8b715223c3aa57de1c3b30d5a604d364ae1d4b4";
+       version = "3.3.5";
+       sha256 = "89e4e32bab7820b01e2b6e45cf70e406af1639aaf8534f769225efd89cc3730a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -123241,23 +117629,6 @@ self: {
      }) {};
 
   "mighty-metropolis" = callPackage
-    ({ mkDerivation, base, containers, mcmc-types, mwc-probability
-     , pipes, primitive, transformers
-     }:
-     mkDerivation {
-       pname = "mighty-metropolis";
-       version = "1.0.4";
-       sha256 = "6e670796298b3f47a7226c0ce51a97889395119e3de32e4722186af55d8092cf";
-       libraryHaskellDepends = [
-         base mcmc-types mwc-probability pipes primitive transformers
-       ];
-       testHaskellDepends = [ base containers mwc-probability ];
-       homepage = "http://github.com/jtobin/mighty-metropolis";
-       description = "The Metropolis algorithm";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mighty-metropolis_1_2_0" = callPackage
     ({ mkDerivation, base, containers, kan-extensions, mcmc-types
      , mwc-probability, pipes, primitive, transformers
      }:
@@ -123273,7 +117644,6 @@ self: {
        homepage = "http://github.com/jtobin/mighty-metropolis";
        description = "The Metropolis algorithm";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mikmod" = callPackage
@@ -123334,8 +117704,8 @@ self: {
      }:
      mkDerivation {
        pname = "milena";
-       version = "0.5.0.1";
-       sha256 = "2fe50795fe7a1826d1a24e66f5f31823cc83621de5137dd98196e2ce7420db10";
+       version = "0.5.0.2";
+       sha256 = "8e770eba91b0caddd5fb16b96f191ca7f4554689fc88f41261687a1af74f5c4b";
        libraryHaskellDepends = [
          base bytestring cereal containers digest lens lifted-base mtl
          murmur-hash network random resource-pool semigroups transformers
@@ -123383,8 +117753,8 @@ self: {
      }:
      mkDerivation {
        pname = "mime-mail";
-       version = "0.4.12";
-       sha256 = "93e1caa9932bec12dc1b931db2f3ea9e2e2db9b8382b7babaf0a5e559936217c";
+       version = "0.4.13";
+       sha256 = "a089fd837b77b75eb36dc1749da422820d2658d0145a378e6de32f3b30b7a440";
        libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring filepath process
          random text
@@ -123591,6 +117961,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "minio-hs" = callPackage
+    ({ mkDerivation, async, base, bytestring, case-insensitive, conduit
+     , conduit-combinators, conduit-extra, containers, cryptonite
+     , cryptonite-conduit, data-default, directory, exceptions, filepath
+     , http-client, http-conduit, http-types, lifted-async, lifted-base
+     , memory, monad-control, protolude, QuickCheck, resourcet, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, temporary, text
+     , time, transformers, transformers-base, xml-conduit
+     }:
+     mkDerivation {
+       pname = "minio-hs";
+       version = "0.1.0";
+       sha256 = "7138f31251268521dd35b143dd943f87f32c3f3b7606487b8f176e4561ddf908";
+       libraryHaskellDepends = [
+         async base bytestring case-insensitive conduit conduit-combinators
+         conduit-extra containers cryptonite cryptonite-conduit data-default
+         exceptions filepath http-client http-conduit http-types
+         lifted-async lifted-base memory monad-control protolude resourcet
+         text time transformers transformers-base xml-conduit
+       ];
+       testHaskellDepends = [
+         async base bytestring case-insensitive conduit conduit-combinators
+         conduit-extra containers cryptonite cryptonite-conduit data-default
+         directory exceptions filepath http-client http-conduit http-types
+         lifted-async lifted-base memory monad-control protolude QuickCheck
+         resourcet tasty tasty-hunit tasty-quickcheck tasty-smallcheck
+         temporary text time transformers transformers-base xml-conduit
+       ];
+       homepage = "https://github.com/donatello/minio-hs#readme";
+       description = "A Minio client library, compatible with S3 like services";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "minions" = callPackage
     ({ mkDerivation, ansi-terminal, base, MissingH, process, time }:
      mkDerivation {
@@ -124099,31 +118502,6 @@ self: {
      }) {};
 
   "modify-fasta" = callPackage
-    ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative
-     , pipes, pipes-text, regex-tdfa, regex-tdfa-text, split, text
-     , text-show
-     }:
-     mkDerivation {
-       pname = "modify-fasta";
-       version = "0.8.2.1";
-       sha256 = "5af7cddb753353ac1e16e15e5962e6a6c46eeb6a1d1ae38a8f014e20b04e61a0";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers fasta regex-tdfa regex-tdfa-text split text
-         text-show
-       ];
-       executableHaskellDepends = [
-         base containers fasta mtl optparse-applicative pipes pipes-text
-         split text
-       ];
-       homepage = "https://github.com/GregorySchwartz/modify-fasta";
-       description = "Modify fasta (and CLIP) files in several optional ways";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "modify-fasta_0_8_2_3" = callPackage
     ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative
      , pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split
      , text, text-show
@@ -124570,8 +118948,8 @@ self: {
      }:
      mkDerivation {
        pname = "monad-extras";
-       version = "0.5.11";
-       sha256 = "76972ce47148f8a60498a878394135cd4079bef79f79f12c9cd86d1766230467";
+       version = "0.6.0";
+       sha256 = "df33d7c51a97d16226b8160d9bc09686cb6f7b7bf5c54557381c6fe4a3c84f2c";
        libraryHaskellDepends = [
          base mmorph monad-control stm transformers transformers-base
        ];
@@ -124885,10 +119263,8 @@ self: {
      }:
      mkDerivation {
        pname = "monad-metrics";
-       version = "0.1.0.1";
-       sha256 = "f34fd76689245c12d694de7db877ea9ab20c259aafc57489f1fa6baecb1f2d61";
-       revision = "1";
-       editedCabalFile = "265f5c26b239a08c4c003eda08a9863928f2a3ac6530d24566cf3ecad4522dcd";
+       version = "0.1.0.2";
+       sha256 = "a64e5f3aebe020c0f38892874f74b2b94ad84b319cee2e7ec092c5b2bd842276";
        libraryHaskellDepends = [
          base clock containers ekg-core microlens mtl text transformers
        ];
@@ -125610,6 +119986,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "monetdb-mapi" = callPackage
+    ({ mkDerivation, base, bindings-monetdb-mapi }:
+     mkDerivation {
+       pname = "monetdb-mapi";
+       version = "0.1.0.0";
+       sha256 = "b9e2b238b7442757e849fa61016251c42fc52d8950cc56fd3f008bbe7f02e76c";
+       libraryHaskellDepends = [ base bindings-monetdb-mapi ];
+       description = "Mid-level bindings for the MonetDB API (mapi)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "money" = callPackage
     ({ mkDerivation, base, doctest }:
      mkDerivation {
@@ -125840,26 +120227,6 @@ self: {
      }) {};
 
   "monoid-subclasses" = callPackage
-    ({ mkDerivation, base, bytestring, containers, primes, QuickCheck
-     , quickcheck-instances, tasty, tasty-quickcheck, text, vector
-     }:
-     mkDerivation {
-       pname = "monoid-subclasses";
-       version = "0.4.2.1";
-       sha256 = "4fe3360d06c09b66ba89c080337e2813ad225b1e6a28a580410930e882f5032a";
-       libraryHaskellDepends = [
-         base bytestring containers primes text vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers primes QuickCheck quickcheck-instances
-         tasty tasty-quickcheck text vector
-       ];
-       homepage = "https://github.com/blamario/monoid-subclasses/";
-       description = "Subclasses of Monoid";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "monoid-subclasses_0_4_3_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, primes, QuickCheck
      , quickcheck-instances, tasty, tasty-quickcheck, text, vector
      }:
@@ -125877,7 +120244,6 @@ self: {
        homepage = "https://github.com/blamario/monoid-subclasses/";
        description = "Subclasses of Monoid";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monoid-transformer" = callPackage
@@ -126154,34 +120520,6 @@ self: {
      }) {};
 
   "morte" = callPackage
-    ({ mkDerivation, alex, array, base, binary, containers, deepseq
-     , Earley, http-client, http-client-tls, microlens, microlens-mtl
-     , mtl, optparse-applicative, pipes, QuickCheck, system-fileio
-     , system-filepath, tasty, tasty-hunit, tasty-quickcheck, text
-     , text-format, transformers
-     }:
-     mkDerivation {
-       pname = "morte";
-       version = "1.6.2";
-       sha256 = "277ba41cc40236a8a02dd154d29108ddc9d8ca7706daa5fe3177189487363b5a";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base binary containers deepseq Earley http-client
-         http-client-tls microlens microlens-mtl pipes system-fileio
-         system-filepath text text-format transformers
-       ];
-       libraryToolDepends = [ alex ];
-       executableHaskellDepends = [ base optparse-applicative text ];
-       testHaskellDepends = [
-         base mtl QuickCheck system-filepath tasty tasty-hunit
-         tasty-quickcheck text transformers
-       ];
-       description = "A bare-bones calculus of constructions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "morte_1_6_5" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers, deepseq
      , Earley, http-client, http-client-tls, microlens, microlens-mtl
      , mtl, optparse-applicative, pipes, QuickCheck, system-fileio
@@ -126207,7 +120545,6 @@ self: {
        ];
        description = "A bare-bones calculus of constructions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mosaico-lib" = callPackage
@@ -127905,18 +122242,6 @@ self: {
      }) {};
 
   "mwc-probability" = callPackage
-    ({ mkDerivation, base, mwc-random, primitive, transformers }:
-     mkDerivation {
-       pname = "mwc-probability";
-       version = "1.2.2";
-       sha256 = "a54e9e9e51c7b67e0eb8244d584fcfc999ab7af00e5146ffdf3efed837d5915a";
-       libraryHaskellDepends = [ base mwc-random primitive transformers ];
-       homepage = "http://github.com/jtobin/mwc-probability";
-       description = "Sampling function-based probability distributions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mwc-probability_1_3_0" = callPackage
     ({ mkDerivation, base, mwc-random, primitive, transformers }:
      mkDerivation {
        pname = "mwc-probability";
@@ -127926,7 +122251,6 @@ self: {
        homepage = "http://github.com/jtobin/mwc-probability";
        description = "Sampling function-based probability distributions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mwc-random" = callPackage
@@ -127957,6 +122281,48 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mxnet" = callPackage
+    ({ mkDerivation, base, c2hs, c2hs-extra, mxnet }:
+     mkDerivation {
+       pname = "mxnet";
+       version = "0.1.0.1";
+       sha256 = "9407f88beb3f0f472b3aa61ca9a16b0ae41c6b3eff6b1bb868d4787ad27bb10e";
+       libraryHaskellDepends = [ base c2hs-extra ];
+       librarySystemDepends = [ mxnet ];
+       libraryToolDepends = [ c2hs ];
+       homepage = "http://github.com/sighingnow/mxnet-haskell#readme";
+       description = "MXNet interface in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {mxnet = null;};
+
+  "mxnet-examples" = callPackage
+    ({ mkDerivation, base, mxnet }:
+     mkDerivation {
+       pname = "mxnet-examples";
+       version = "0.1.0.0";
+       sha256 = "147cb175fd9b409dd11292b3ce3ab98359a69a4fbd6c42fdcd4a75b0c7e8f7bf";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base mxnet ];
+       homepage = "http://github.com/sighingnow/mxnet-haskell#readme";
+       description = "Examples for MXNet in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "mxnet-nnvm" = callPackage
+    ({ mkDerivation, base, c2hs, c2hs-extra, mxnet }:
+     mkDerivation {
+       pname = "mxnet-nnvm";
+       version = "0.1.0.0";
+       sha256 = "1e9e0b48a91789553befa80b8714365a63a9185809463a6127df715eb11f6561";
+       libraryHaskellDepends = [ base c2hs-extra ];
+       librarySystemDepends = [ mxnet ];
+       libraryToolDepends = [ c2hs ];
+       homepage = "http://github.com/sighingnow/mxnet-haskell#readme";
+       description = "NNVM interface in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {mxnet = null;};
+
   "myTestlll" = callPackage
     ({ mkDerivation, ansi-terminal, array, arrows, base, bytestring
      , Cabal, CCA, containers, deepseq, Euterpea, ghc-prim, HCodecs
@@ -128764,23 +123130,6 @@ self: {
      }) {};
 
   "natural-transformation" = callPackage
-    ({ mkDerivation, base, containers, quickcheck-instances, tasty
-     , tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "natural-transformation";
-       version = "0.3.1";
-       sha256 = "9b5a39f18790f33807298d47dc7098e2863ca874e8b3d2b419bf696f2ad09702";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base containers quickcheck-instances tasty tasty-quickcheck
-       ];
-       homepage = "https://github.com/ku-fpg/natural-transformation";
-       description = "A natural transformation package";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "natural-transformation_0_4" = callPackage
     ({ mkDerivation, base, containers, quickcheck-instances, tasty
      , tasty-quickcheck
      }:
@@ -128795,7 +123144,6 @@ self: {
        homepage = "https://github.com/ku-fpg/natural-transformation";
        description = "A natural transformation package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "naturalcomp" = callPackage
@@ -129786,10 +124134,8 @@ self: {
     ({ mkDerivation, base, bytestring, network, text, time, vector }:
      mkDerivation {
        pname = "network-carbon";
-       version = "1.0.7";
-       sha256 = "9cb794e29273aedf7f3fba7eed81a6a9f83791809095c22c11bf094a687dc9c0";
-       revision = "1";
-       editedCabalFile = "aed14a345bcd3d3ef50f393ffd360e8d2870aa0272926190565c39e7e4989c4b";
+       version = "1.0.8";
+       sha256 = "071b81db16f33edfb0dd11e918911f177b9584da27b3481c23a82a9d29f61d86";
        libraryHaskellDepends = [
          base bytestring network text time vector
        ];
@@ -132348,36 +126694,6 @@ self: {
      }) {};
 
   "octane" = callPackage
-    ({ mkDerivation, aeson, base, bimap, binary, binary-bits
-     , bytestring, containers, data-binary-ieee754, data-default-class
-     , deepseq, file-embed, http-client, http-client-tls
-     , overloaded-records, regex-compat, tasty, tasty-hspec
-     , tasty-quickcheck, text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "octane";
-       version = "0.16.3";
-       sha256 = "e62faeb9bec990995d507e7542ebde84edfb42cbae4b0369bfe4aadec05d91fe";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bimap binary binary-bits bytestring containers
-         data-binary-ieee754 data-default-class deepseq file-embed
-         overloaded-records regex-compat text unordered-containers vector
-       ];
-       executableHaskellDepends = [
-         aeson base binary bytestring http-client http-client-tls
-       ];
-       testHaskellDepends = [
-         base binary binary-bits bytestring containers tasty tasty-hspec
-         tasty-quickcheck text
-       ];
-       homepage = "https://github.com/tfausak/octane#readme";
-       description = "Parse Rocket League replays";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "octane_0_18_2" = callPackage
     ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers
      , data-default-class, file-embed, http-client, http-client-tls
      , overloaded-records, rattletrap, text
@@ -132398,7 +126714,6 @@ self: {
        homepage = "https://github.com/tfausak/octane#readme";
        description = "Parse Rocket League replays";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "octohat" = callPackage
@@ -132834,6 +127149,17 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "onama" = callPackage
+    ({ mkDerivation, base, containers, parsec, tagsoup }:
+     mkDerivation {
+       pname = "onama";
+       version = "0.2.2.0";
+       sha256 = "df85a43fa050f6d6afc6f56789fdf176da7b615019871b3a8f4f82c635f47626";
+       libraryHaskellDepends = [ base containers parsec tagsoup ];
+       description = "HTML-parsing primitives for Parsec";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "once" = callPackage
     ({ mkDerivation, base, containers, hashable, template-haskell
      , unordered-containers
@@ -132856,8 +127182,8 @@ self: {
      }:
      mkDerivation {
        pname = "one-liner";
-       version = "0.7";
-       sha256 = "2ea06f985f3755c870b2cdcd9b7ab0d541b51e1687507acccd833eb2de258ab4";
+       version = "0.8";
+       sha256 = "83831911ce829082bff57e5596bbb23947a153cd5ad6dd90f02b3152faf22ea6";
        libraryHaskellDepends = [
          base bifunctors contravariant ghc-prim profunctors tagged
          transformers
@@ -132958,8 +127284,8 @@ self: {
      }:
      mkDerivation {
        pname = "opaleye";
-       version = "0.5.2.2";
-       sha256 = "e09e565314d59a420349f0a5295ee4f9ed7215d579741fcf06d376703dd3d102";
+       version = "0.5.3.0";
+       sha256 = "6ceda758d97c5b0b547182fb2c7a0379f0f5843e76f4bbd0baa81a171a763d73";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring case-insensitive
          contravariant postgresql-simple pretty product-profunctors
@@ -133825,37 +128151,6 @@ self: {
      }) {};
 
   "opml-conduit" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, conduit
-     , conduit-combinators, conduit-parse, containers, data-default
-     , exceptions, foldl, hlint, lens-simple, mono-traversable
-     , monoid-subclasses, mtl, parsers, QuickCheck, quickcheck-instances
-     , resourcet, semigroups, tasty, tasty-hunit, tasty-quickcheck, text
-     , time, timerep, uri-bytestring, xml-conduit, xml-conduit-parse
-     , xml-types
-     }:
-     mkDerivation {
-       pname = "opml-conduit";
-       version = "0.5.0.1";
-       sha256 = "69c22270aa0f3a9c45dcf993e9de06982a780b5e035e343f257bf9d8fd8a2533";
-       libraryHaskellDepends = [
-         base case-insensitive conduit conduit-parse containers exceptions
-         foldl lens-simple mono-traversable monoid-subclasses parsers
-         semigroups text time timerep uri-bytestring xml-conduit
-         xml-conduit-parse xml-types
-       ];
-       testHaskellDepends = [
-         base bytestring conduit conduit-combinators conduit-parse
-         containers data-default exceptions hlint lens-simple
-         mono-traversable mtl parsers QuickCheck quickcheck-instances
-         resourcet semigroups tasty tasty-hunit tasty-quickcheck text time
-         uri-bytestring xml-conduit-parse
-       ];
-       homepage = "https://github.com/k0ral/opml-conduit";
-       description = "Streaming parser/renderer for the OPML 2.0 format.";
-       license = "unknown";
-     }) {};
-
-  "opml-conduit_0_6_0_1" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, conduit
      , conduit-combinators, containers, data-default, hlint, lens-simple
      , mono-traversable, monoid-subclasses, mtl, parsers, QuickCheck
@@ -133881,7 +128176,6 @@ self: {
        homepage = "https://github.com/k0ral/opml-conduit";
        description = "Streaming parser/renderer for the OPML 2.0 format.";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opn" = callPackage
@@ -134031,29 +128325,13 @@ self: {
      }) {};
 
   "optparse-applicative" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, process, transformers
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "optparse-applicative";
-       version = "0.12.1.0";
-       sha256 = "18b46d6d2c17e941bb02f84e980390f056795dce73ece946d71d3d4d002313d5";
-       libraryHaskellDepends = [
-         ansi-wl-pprint base process transformers transformers-compat
-       ];
-       homepage = "https://github.com/pcapriotti/optparse-applicative";
-       description = "Utilities and combinators for parsing command line options";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "optparse-applicative_0_13_0_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, process, QuickCheck
      , transformers, transformers-compat
      }:
      mkDerivation {
        pname = "optparse-applicative";
-       version = "0.13.0.0";
-       sha256 = "cec6b1d94d347898a25446fb8a6643399d8429cf326f221e38a02d849b2b0cac";
+       version = "0.13.1.0";
+       sha256 = "f1fcf9d7e78ddf14083a07d8fe1aa65d75c5102e0d44df981585bce54c5c2a2b";
        libraryHaskellDepends = [
          ansi-wl-pprint base process transformers transformers-compat
        ];
@@ -134061,7 +128339,6 @@ self: {
        homepage = "https://github.com/pcapriotti/optparse-applicative";
        description = "Utilities and combinators for parsing command line options";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "optparse-declarative" = callPackage
@@ -134077,22 +128354,6 @@ self: {
      }) {};
 
   "optparse-generic" = callPackage
-    ({ mkDerivation, base, bytestring, optparse-applicative
-     , system-filepath, text, time, transformers, void
-     }:
-     mkDerivation {
-       pname = "optparse-generic";
-       version = "1.1.1";
-       sha256 = "02938fa18d2d2aee9ccd69ed402771e01eff20da280be5a1ca1229e07929c611";
-       libraryHaskellDepends = [
-         base bytestring optparse-applicative system-filepath text time
-         transformers void
-       ];
-       description = "Auto-generate a command-line parser for your datatype";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "optparse-generic_1_1_4" = callPackage
     ({ mkDerivation, base, bytestring, optparse-applicative, semigroups
      , system-filepath, text, time, transformers, void
      }:
@@ -134106,7 +128367,6 @@ self: {
        ];
        description = "Auto-generate a command-line parser for your datatype";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "optparse-helper" = callPackage
@@ -134421,8 +128681,8 @@ self: {
        pname = "orgstat";
        version = "0.0.1";
        sha256 = "573cf350998a5625162d997290d932ab962f3ed594e20e81c810c962892635c8";
-       revision = "1";
-       editedCabalFile = "ccd6a9c2b4f92b27c55e90af11ecd4841bb757e48f066a0407b37af49240238b";
+       revision = "2";
+       editedCabalFile = "90bf3eedb1ad96d0ac2601cbd6732270793c6b5a4d3fdc26592b688a3a387d47";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -134946,30 +129206,6 @@ self: {
      }) {};
 
   "pagerduty" = callPackage
-    ({ mkDerivation, aeson, base, bifunctors, bytestring
-     , bytestring-conversion, conduit, data-default-class, exceptions
-     , generics-sop, http-client, http-types, lens, lens-aeson, mmorph
-     , monad-control, mtl, template-haskell, text, time
-     , time-locale-compat, transformers, transformers-base
-     , transformers-compat, unordered-containers
-     }:
-     mkDerivation {
-       pname = "pagerduty";
-       version = "0.0.7";
-       sha256 = "5e46075a080cf6c6561977e3f0cdd53a32a627b3a193d58c61a05e628757fe9c";
-       libraryHaskellDepends = [
-         aeson base bifunctors bytestring bytestring-conversion conduit
-         data-default-class exceptions generics-sop http-client http-types
-         lens lens-aeson mmorph monad-control mtl template-haskell text time
-         time-locale-compat transformers transformers-base
-         transformers-compat unordered-containers
-       ];
-       homepage = "http://github.com/brendanhay/pagerduty";
-       description = "Client library for PagerDuty Integration and REST APIs";
-       license = "unknown";
-     }) {};
-
-  "pagerduty_0_0_8" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, bytestring
      , bytestring-conversion, conduit, data-default-class, exceptions
      , generics-sop, http-client, http-types, lens, lens-aeson, mmorph
@@ -134991,7 +129227,6 @@ self: {
        homepage = "http://github.com/brendanhay/pagerduty";
        description = "Client library for PagerDuty Integration and REST APIs";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pagination" = callPackage
@@ -135023,6 +129258,18 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "paint" = callPackage
+    ({ mkDerivation, base, text }:
+     mkDerivation {
+       pname = "paint";
+       version = "1.0.0";
+       sha256 = "a4029057144e91384edfa6e6c56e90b2fe2f1e166201d73f9f8e02e265b6424f";
+       libraryHaskellDepends = [ base text ];
+       homepage = "https://github.com/lovasko/paint";
+       description = "Colorization of text for command-line output";
+       license = "unknown";
+     }) {};
+
   "palette" = callPackage
     ({ mkDerivation, array, base, colour, containers }:
      mkDerivation {
@@ -135084,55 +129331,6 @@ self: {
      }) {};
 
   "pandoc" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, array, base
-     , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
-     , cmark, containers, data-default, deepseq, Diff, directory
-     , executable-path, extensible-exceptions, filemanip, filepath
-     , ghc-prim, haddock-library, highlighting-kate, hslua, HTTP
-     , http-client, http-client-tls, http-types, HUnit, JuicyPixels, mtl
-     , network, network-uri, old-time, pandoc-types, parsec, process
-     , QuickCheck, random, scientific, SHA, syb, tagsoup, temporary
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , texmath, text, time, unordered-containers, vector, xml, yaml
-     , zip-archive, zlib
-     }:
-     mkDerivation {
-       pname = "pandoc";
-       version = "1.17.1";
-       sha256 = "5978baaf664ce254b508108a6be9d5a11a2c2ac61462ae85286be2ecdb010c86";
-       revision = "1";
-       editedCabalFile = "0ceaa11f58bcbaa0b3aa8babf7a92de818ff331f38193c8e42ee8bc174113681";
-       configureFlags = [ "-fhttps" "-f-trypandoc" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson array base base64-bytestring binary blaze-html blaze-markup
-         bytestring cmark containers data-default deepseq directory
-         extensible-exceptions filemanip filepath ghc-prim haddock-library
-         highlighting-kate hslua HTTP http-client http-client-tls http-types
-         JuicyPixels mtl network network-uri old-time pandoc-types parsec
-         process random scientific SHA syb tagsoup temporary texmath text
-         time unordered-containers vector xml yaml zip-archive zlib
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring containers directory extensible-exceptions
-         filepath highlighting-kate HTTP network network-uri pandoc-types
-         text yaml
-       ];
-       testHaskellDepends = [
-         ansi-terminal base bytestring containers Diff directory
-         executable-path filepath highlighting-kate HUnit pandoc-types
-         process QuickCheck syb test-framework test-framework-hunit
-         test-framework-quickcheck2 text zip-archive
-       ];
-       doCheck = false;
-       homepage = "http://pandoc.org";
-       description = "Conversion between markup formats";
-       license = "GPL";
-       maintainers = with stdenv.lib.maintainers; [ peti ];
-     }) {};
-
-  "pandoc_1_19_2_1" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, base
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
      , cmark, containers, data-default, deepseq, Diff, directory
@@ -135177,7 +129375,6 @@ self: {
        homepage = "http://pandoc.org";
        description = "Conversion between markup formats";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
@@ -135390,22 +129587,6 @@ self: {
      }) {};
 
   "pandoc-types" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, deepseq
-     , ghc-prim, syb
-     }:
-     mkDerivation {
-       pname = "pandoc-types";
-       version = "1.16.1.1";
-       sha256 = "f8feb3aef9adc16e7a81d4fd4548e5a142366c59a826272f9b04a9dddbfb9524";
-       libraryHaskellDepends = [
-         aeson base bytestring containers deepseq ghc-prim syb
-       ];
-       homepage = "http://johnmacfarlane.net/pandoc";
-       description = "Types for representing a structured document";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pandoc-types_1_17_0_5" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , ghc-prim, HUnit, QuickCheck, string-qq, syb, test-framework
      , test-framework-hunit, test-framework-quickcheck2
@@ -135424,7 +129605,6 @@ self: {
        homepage = "http://johnmacfarlane.net/pandoc";
        description = "Types for representing a structured document";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-unlit" = callPackage
@@ -139281,30 +133461,6 @@ self: {
      }) {};
 
   "pinboard" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, either, hspec
-     , http-client, http-client-tls, http-types, mtl, network
-     , old-locale, profunctors, QuickCheck, random, semigroups, text
-     , time, transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "pinboard";
-       version = "0.9.6";
-       sha256 = "1b999ac66e530a840b425a4656b8499eccf1928bb25dd059a09b9e14863347db";
-       libraryHaskellDepends = [
-         aeson base bytestring containers either http-client http-client-tls
-         http-types mtl network old-locale profunctors random text time
-         transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers hspec mtl QuickCheck semigroups
-         text time transformers unordered-containers
-       ];
-       homepage = "https://github.com/jonschoning/pinboard";
-       description = "Access to the Pinboard API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "pinboard_0_9_12_4" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hspec
      , http-client, http-client-tls, http-types, monad-logger, mtl
      , network, profunctors, QuickCheck, random, safe-exceptions
@@ -139328,7 +133484,6 @@ self: {
        homepage = "https://github.com/jonschoning/pinboard";
        description = "Access to the Pinboard API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pinch" = callPackage
@@ -139354,24 +133509,6 @@ self: {
      }) {};
 
   "pinchot" = callPackage
-    ({ mkDerivation, base, containers, Earley, lens, ListLike
-     , non-empty-sequence, pretty-show, semigroups, template-haskell
-     , transformers
-     }:
-     mkDerivation {
-       pname = "pinchot";
-       version = "0.22.0.0";
-       sha256 = "248a9e9108d5e12afd4da1aa5bc6bc8d2e732257da318c60bb225844edb88617";
-       libraryHaskellDepends = [
-         base containers Earley lens ListLike non-empty-sequence pretty-show
-         semigroups template-haskell transformers
-       ];
-       homepage = "http://www.github.com/massysett/pinchot";
-       description = "Write grammars, not parsers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pinchot_0_24_0_0" = callPackage
     ({ mkDerivation, base, containers, Earley, lens, pretty-show
      , semigroups, template-haskell, transformers
      }:
@@ -139386,7 +133523,6 @@ self: {
        homepage = "http://www.github.com/massysett/pinchot";
        description = "Write grammars, not parsers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipe-enumerator" = callPackage
@@ -139418,23 +133554,6 @@ self: {
      }) {};
 
   "pipes" = callPackage
-    ({ mkDerivation, base, mmorph, mtl, QuickCheck, test-framework
-     , test-framework-quickcheck2, transformers
-     }:
-     mkDerivation {
-       pname = "pipes";
-       version = "4.1.9";
-       sha256 = "c2d5d08761bbb62dca03f81b3d99bb2f50a386c52c30b2abc8c3ca8aabdea3ea";
-       libraryHaskellDepends = [ base mmorph mtl transformers ];
-       testHaskellDepends = [
-         base mtl QuickCheck test-framework test-framework-quickcheck2
-         transformers
-       ];
-       description = "Compositional pipelines";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes_4_3_2" = callPackage
     ({ mkDerivation, base, exceptions, mmorph, mtl, QuickCheck
      , test-framework, test-framework-quickcheck2, transformers
      }:
@@ -139451,7 +133570,6 @@ self: {
        ];
        description = "Compositional pipelines";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-aeson" = callPackage
@@ -139614,20 +133732,6 @@ self: {
      }) {inherit (pkgs) bzip2;};
 
   "pipes-cacophony" = callPackage
-    ({ mkDerivation, base, bytestring, cacophony, hlint, pipes }:
-     mkDerivation {
-       pname = "pipes-cacophony";
-       version = "0.4.0";
-       sha256 = "224ff8983cc61a92bc733cbdd2a9632b30858ef7a644203a346c0c9d18821ec0";
-       libraryHaskellDepends = [ base bytestring cacophony 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-cacophony_0_4_1" = callPackage
     ({ mkDerivation, base, bytestring, cacophony, hlint, memory, pipes
      }:
      mkDerivation {
@@ -139907,16 +134011,16 @@ self: {
   "pipes-fluid" = callPackage
     ({ mkDerivation, async, base, constraints, hspec, lens
      , lifted-async, mmorph, monad-control, mtl, pipes
-     , pipes-concurrency, pipes-misc, stm, these, transformers
-     , transformers-base
+     , pipes-concurrency, pipes-misc, semigroups, stm, these
+     , transformers, transformers-base
      }:
      mkDerivation {
        pname = "pipes-fluid";
-       version = "0.4.0.0";
-       sha256 = "c82a04b5799e9c94a1989fc6f940ad4fb624259e6c8eda98515fe43d7b67131d";
+       version = "0.5.0.3";
+       sha256 = "0d2ef03e16992ef96a4f5d15f1c6d566c7ea7d65eb87e9c64be081d8a60b2b39";
        libraryHaskellDepends = [
-         base constraints lens lifted-async monad-control pipes stm these
-         transformers transformers-base
+         base constraints lens lifted-async monad-control pipes semigroups
+         stm these transformers transformers-base
        ];
        testHaskellDepends = [
          async base constraints hspec lens lifted-async mmorph monad-control
@@ -140176,8 +134280,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-postgresql-simple";
-       version = "0.1.2.0";
-       sha256 = "81f11a44938d2ba1744f0ba82053a3a5aaaa0cfc716f5a4762ff4bde7415328a";
+       version = "0.1.3.0";
+       sha256 = "53de5231df1c0591e9dbd3b989a4075e45fa2a493adce060b53b8e741dbae688";
        libraryHaskellDepends = [
          async base bytestring exceptions mtl pipes pipes-concurrency
          pipes-safe postgresql-simple stm text transformers
@@ -140238,18 +134342,23 @@ self: {
      }) {};
 
   "pipes-s3" = callPackage
-    ({ mkDerivation, aws, base, bytestring, http-client
-     , http-client-tls, pipes, pipes-bytestring, pipes-safe, resourcet
-     , text, transformers
+    ({ mkDerivation, aws, base, bytestring, exceptions, http-client
+     , http-client-tls, http-types, pipes, pipes-bytestring, pipes-safe
+     , QuickCheck, resourcet, tasty, tasty-quickcheck, text
+     , transformers
      }:
      mkDerivation {
        pname = "pipes-s3";
-       version = "0.1.0.0";
-       sha256 = "a41869e5fa135c8abb3749474cb4c7e9fd572de201109de79176a4c09e33d813";
+       version = "0.3.0.2";
+       sha256 = "fd89bb1af54af172c2b4fb2c75782a1cbf8ff7778fbb40da1bc2d2e3ec2fa4e7";
        libraryHaskellDepends = [
-         aws base bytestring http-client http-client-tls pipes
+         aws base bytestring http-client http-client-tls http-types pipes
          pipes-bytestring pipes-safe resourcet text transformers
        ];
+       testHaskellDepends = [
+         base bytestring exceptions pipes pipes-bytestring pipes-safe
+         QuickCheck tasty tasty-quickcheck text
+       ];
        homepage = "http://github.com/bgamari/pipes-s3";
        description = "A simple interface for streaming data to and from Amazon S3";
        license = stdenv.lib.licenses.bsd3;
@@ -140257,24 +134366,6 @@ self: {
      }) {};
 
   "pipes-safe" = callPackage
-    ({ mkDerivation, base, containers, exceptions, monad-control, mtl
-     , pipes, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "pipes-safe";
-       version = "2.2.4";
-       sha256 = "502dca5ab38596c70917906ed979f917db52ed91b938d52d96dcb7c56735486e";
-       revision = "1";
-       editedCabalFile = "c91c8835d9ed03ad82795b877f080a06ed43557bacf5bce90121ca0e6d58e873";
-       libraryHaskellDepends = [
-         base containers exceptions monad-control mtl pipes transformers
-         transformers-base
-       ];
-       description = "Safety for the pipes ecosystem";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes-safe_2_2_5" = callPackage
     ({ mkDerivation, base, containers, exceptions, monad-control, mtl
      , pipes, transformers, transformers-base
      }:
@@ -140288,7 +134379,6 @@ self: {
        ];
        description = "Safety for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-shell" = callPackage
@@ -140574,28 +134664,6 @@ self: {
      }) {};
 
   "pkcs10" = callPackage
-    ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
-     , bytestring, cryptonite, pem, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck, transformers, x509
-     }:
-     mkDerivation {
-       pname = "pkcs10";
-       version = "0.1.1.0";
-       sha256 = "1d4665fa5a429e859535e132c507b1e1ec713de50d3e085de9731bbd1c9cbeec";
-       libraryHaskellDepends = [
-         asn1-encoding asn1-parse asn1-types base bytestring cryptonite pem
-         x509
-       ];
-       testHaskellDepends = [
-         asn1-encoding asn1-parse asn1-types base bytestring cryptonite pem
-         QuickCheck tasty tasty-hunit tasty-quickcheck transformers x509
-       ];
-       homepage = "https://github.com/fcomb/pkcs10-hs#readme";
-       description = "PKCS#10 library";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "pkcs10_0_2_0_0" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
      , bytestring, cryptonite, pem, QuickCheck, tasty, tasty-hunit
      , tasty-quickcheck, transformers, x509
@@ -140615,7 +134683,6 @@ self: {
        homepage = "https://github.com/fcomb/pkcs10-hs#readme";
        description = "PKCS#10 library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pkcs7" = callPackage
@@ -141137,6 +135204,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pocket" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, http-client
+     , http-client-tls, servant, servant-client, text, transformers
+     }:
+     mkDerivation {
+       pname = "pocket";
+       version = "0.1.0";
+       sha256 = "c73d73f4221023178324a954c4c0f5873febed698db8ed86acf70d999eb6b712";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring http-client http-client-tls
+         servant servant-client text transformers
+       ];
+       homepage = "https://github.com/jpvillaisaza/pocket-haskell";
+       description = "Bindings for the Pocket API";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "pocket-dns" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cabal-test-bin
      , data-default, dns, hspec, hspec-contrib, hspec-server
@@ -141260,29 +135344,6 @@ self: {
      }) {};
 
   "pointful" = callPackage
-    ({ mkDerivation, base, containers, haskell-src-exts, mtl, syb
-     , transformers
-     }:
-     mkDerivation {
-       pname = "pointful";
-       version = "1.0.8";
-       sha256 = "813152e920e7aad9d2ba2ab5d922deff9cd82ec156f981d16de4bc91320967ac";
-       revision = "1";
-       editedCabalFile = "b2038459d89251a94f3cc8709f5be0ce80c0cc1be72e2b65fca387efdd61d477";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers haskell-src-exts mtl syb transformers
-       ];
-       executableHaskellDepends = [
-         base containers haskell-src-exts mtl syb transformers
-       ];
-       homepage = "http://github.com/23Skidoo/pointful";
-       description = "Pointful refactoring tool";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pointful_1_0_9" = callPackage
     ({ mkDerivation, base, containers, haskell-src-exts-simple, mtl
      , syb, transformers
      }:
@@ -141301,7 +135362,6 @@ self: {
        homepage = "http://github.com/23Skidoo/pointful";
        description = "Pointful refactoring tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pointless-fun" = callPackage
@@ -142517,27 +136577,6 @@ self: {
      }) {};
 
   "postgresql-simple-url" = callPackage
-    ({ mkDerivation, base, network-uri, postgresql-simple, split, tasty
-     , tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "postgresql-simple-url";
-       version = "0.1.0.1";
-       sha256 = "cf165ec652e1192f392349e09e413a776921ddef71d95bac0d23e9f81cfbe8a0";
-       revision = "7";
-       editedCabalFile = "f4f8535e362cc496675fa36640cea043fbe46e99e2d3bc8ee449ebe6a293c8cc";
-       libraryHaskellDepends = [
-         base network-uri postgresql-simple split
-       ];
-       testHaskellDepends = [
-         base postgresql-simple tasty tasty-quickcheck
-       ];
-       homepage = "https://github.com/futurice/postgresql-simple-url";
-       description = "Parse postgres:// url into ConnectInfo";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "postgresql-simple-url_0_2_0_0" = callPackage
     ({ mkDerivation, base, network-uri, postgresql-simple, split, tasty
      , tasty-quickcheck
      }:
@@ -142554,7 +136593,6 @@ self: {
        homepage = "https://github.com/futurice/postgresql-simple-url";
        description = "Parse postgres:// url into ConnectInfo";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-transactional" = callPackage
@@ -143947,22 +137985,6 @@ self: {
      }) {};
 
   "process-extras" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, generic-deriving
-     , ListLike, process, text
-     }:
-     mkDerivation {
-       pname = "process-extras";
-       version = "0.4.1.4";
-       sha256 = "05cd949158ff605cb63fc86a2de1b51bfd8d27bf54b5fbe6427a1941e938cfc0";
-       libraryHaskellDepends = [
-         base bytestring deepseq generic-deriving ListLike process text
-       ];
-       homepage = "https://github.com/seereason/process-extras";
-       description = "Process extras";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "process-extras_0_7_1" = callPackage
     ({ mkDerivation, base, bytestring, data-default, deepseq
      , generic-deriving, HUnit, ListLike, mtl, process, text
      }:
@@ -143978,7 +138000,6 @@ self: {
        homepage = "https://github.com/seereason/process-extras";
        description = "Process extras";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "process-iterio" = callPackage
@@ -144262,25 +138283,6 @@ self: {
      }) {};
 
   "profiteur" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, filepath
-     , text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "profiteur";
-       version = "0.3.0.3";
-       sha256 = "4f9929059826c24be4c4cbfae00cfea5985c20c4c2ddb03d56a47cd72c18e144";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson attoparsec base bytestring filepath text unordered-containers
-         vector
-       ];
-       homepage = "http://github.com/jaspervdj/profiteur";
-       description = "Treemap visualiser for GHC prof files";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "profiteur_0_4_2_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, filepath
      , ghc-prof, js-jquery, scientific, text, unordered-containers
      , vector
@@ -144298,7 +138300,6 @@ self: {
        homepage = "http://github.com/jaspervdj/profiteur";
        description = "Treemap visualiser for GHC prof files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "profunctor-extras" = callPackage
@@ -144654,8 +138655,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "3.2.3";
-       sha256 = "078b51c15e4dbce6f55cd26eeb82ed6307e3c47661ab6518f421a1c95e60a11a";
+       version = "3.3.0";
+       sha256 = "dba271f7078786ba229c5dfe72caf4f03b92044506fab82e1a0ed24c555d9172";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -145271,19 +139272,6 @@ self: {
      }) {};
 
   "publicsuffix" = callPackage
-    ({ mkDerivation, base, filepath, hspec, template-haskell }:
-     mkDerivation {
-       pname = "publicsuffix";
-       version = "0.20160716";
-       sha256 = "19d7fd9990954284073323d9d22a892f1b600761e5353e9a0473d46591956956";
-       libraryHaskellDepends = [ base filepath template-haskell ];
-       testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
-       description = "The publicsuffix list exposed as proper Haskell types";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "publicsuffix_0_20170109" = callPackage
     ({ mkDerivation, base, filepath, hspec, template-haskell }:
      mkDerivation {
        pname = "publicsuffix";
@@ -145294,7 +139282,6 @@ self: {
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
        description = "The publicsuffix list exposed as proper Haskell types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "publicsuffixlist" = callPackage
@@ -145717,59 +139704,12 @@ self: {
      }) {};
 
   "purescript" = callPackage
-    ({ mkDerivation, aeson, aeson-better-errors, ansi-terminal
-     , ansi-wl-pprint, base, base-compat, bower-json, boxes, bytestring
-     , clock, containers, directory, dlist, edit-distance, file-embed
-     , filepath, fsnotify, Glob, haskeline, hspec, hspec-discover
-     , http-client, http-types, HUnit, language-javascript, lifted-base
-     , monad-control, monad-logger, mtl, network, optparse-applicative
-     , parallel, parsec, pattern-arrows, pipes, pipes-http, process
-     , protolude, regex-tdfa, safe, semigroups, silently, sourcemap
-     , spdx, split, stm, syb, text, time, transformers
-     , transformers-base, transformers-compat, unordered-containers
-     , utf8-string, vector, wai, wai-websockets, warp, websockets
-     }:
-     mkDerivation {
-       pname = "purescript";
-       version = "0.9.3";
-       sha256 = "0e4628232508a37568103d3ffcce68355258af388bba1b0bb3847c1fb33b91e5";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-better-errors ansi-terminal base base-compat bower-json
-         boxes bytestring clock containers directory dlist edit-distance
-         filepath fsnotify Glob haskeline http-client http-types
-         language-javascript lifted-base monad-control monad-logger mtl
-         parallel parsec pattern-arrows pipes pipes-http process protolude
-         regex-tdfa safe semigroups sourcemap spdx split stm syb text time
-         transformers transformers-base transformers-compat
-         unordered-containers utf8-string vector
-       ];
-       executableHaskellDepends = [
-         aeson ansi-terminal ansi-wl-pprint base base-compat boxes
-         bytestring containers directory file-embed filepath Glob haskeline
-         http-types monad-logger mtl network optparse-applicative parsec
-         process protolude split stm text time transformers
-         transformers-compat utf8-string wai wai-websockets warp websockets
-       ];
-       testHaskellDepends = [
-         aeson aeson-better-errors base base-compat boxes bytestring
-         containers directory filepath Glob haskeline hspec hspec-discover
-         HUnit mtl optparse-applicative parsec process protolude silently
-         stm text time transformers transformers-compat utf8-string vector
-       ];
-       doCheck = false;
-       homepage = "http://www.purescript.org/";
-       description = "PureScript Programming Language Compiler";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "purescript_0_10_5" = callPackage
     ({ mkDerivation, aeson, aeson-better-errors, aeson-pretty
-     , ansi-terminal, ansi-wl-pprint, base, base-compat, bower-json
-     , boxes, bytestring, clock, containers, data-ordlist, directory
-     , dlist, edit-distance, file-embed, filepath, foldl, fsnotify, Glob
-     , haskeline, hspec, hspec-discover, http-client, http-types, HUnit
+     , ansi-terminal, ansi-wl-pprint, base, base-compat, blaze-html
+     , bower-json, boxes, bytestring, cheapskate, clock, containers
+     , data-ordlist, deepseq, directory, dlist, edit-distance
+     , file-embed, filepath, foldl, fsnotify, Glob, haskeline, hspec
+     , hspec-discover, http-client, http-types, HUnit
      , language-javascript, lens, lifted-base, monad-control
      , monad-logger, mtl, network, optparse-applicative, parallel
      , parsec, pattern-arrows, pipes, pipes-http, process, protolude
@@ -145781,19 +139721,20 @@ self: {
      }:
      mkDerivation {
        pname = "purescript";
-       version = "0.10.5";
-       sha256 = "0d36361819866efe703eb3ae37f597316098ec3ead6edc9236ea63d54bdc8916";
+       version = "0.10.7";
+       sha256 = "85dff2f4b6916e9d45b6a1b2674dc6c91c56ac6c1597f627d5f1cbee9d0b3a9d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson aeson-better-errors ansi-terminal base base-compat bower-json
-         boxes bytestring clock containers data-ordlist directory dlist
-         edit-distance filepath fsnotify Glob haskeline http-client
-         http-types language-javascript lens lifted-base monad-control
-         monad-logger mtl parallel parsec pattern-arrows pipes pipes-http
-         process protolude regex-tdfa safe scientific semigroups sourcemap
-         spdx split stm syb text time transformers transformers-base
-         transformers-compat unordered-containers utf8-string vector
+         aeson aeson-better-errors ansi-terminal base base-compat blaze-html
+         bower-json boxes bytestring cheapskate clock containers
+         data-ordlist deepseq directory dlist edit-distance filepath
+         fsnotify Glob haskeline http-client http-types language-javascript
+         lens lifted-base monad-control monad-logger mtl parallel parsec
+         pattern-arrows pipes pipes-http process protolude regex-tdfa safe
+         scientific semigroups sourcemap spdx split stm syb text time
+         transformers transformers-base transformers-compat
+         unordered-containers utf8-string vector
        ];
        executableHaskellDepends = [
          aeson aeson-pretty ansi-terminal ansi-wl-pprint base base-compat
@@ -145806,15 +139747,14 @@ self: {
        testHaskellDepends = [
          aeson aeson-better-errors base base-compat bower-json boxes
          bytestring containers directory filepath Glob haskeline hspec
-         hspec-discover HUnit mtl optparse-applicative parsec process
-         protolude silently stm text time transformers transformers-compat
-         utf8-string vector
+         hspec-discover HUnit lens monad-logger mtl optparse-applicative
+         parsec process protolude silently stm text time transformers
+         transformers-compat utf8-string vector
        ];
        doCheck = false;
        homepage = "http://www.purescript.org/";
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "purescript-bridge" = callPackage
@@ -145824,8 +139764,8 @@ self: {
      }:
      mkDerivation {
        pname = "purescript-bridge";
-       version = "0.8.0.1";
-       sha256 = "ab3cf87f637053e0378ca266166e5699ae4acfb5f404dae9ac4a793890124329";
+       version = "0.10.0.0";
+       sha256 = "6bfb056e3dc2f93a4bb5db20e1151f258145ae7a8c2a13a2e8478936b4ff37d3";
        libraryHaskellDepends = [
          base containers directory filepath generic-deriving lens mtl text
          transformers
@@ -145838,15 +139778,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "purescript-bridge_0_9_0_0" = callPackage
+  "purescript-bridge_0_10_1_0" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , generic-deriving, hspec, hspec-expectations-pretty-diff, lens
      , mtl, text, transformers
      }:
      mkDerivation {
        pname = "purescript-bridge";
-       version = "0.9.0.0";
-       sha256 = "ba7ed603c5cc92099b48388ce4caade457f6f51a8b3eaf87c665aea21d394f04";
+       version = "0.10.1.0";
+       sha256 = "1a5f92b77f01a214272aed6df3c0b47d28c8f7954c07b2d16f7cdd3f2c596223";
        libraryHaskellDepends = [
          base containers directory filepath generic-deriving lens mtl text
          transformers
@@ -146001,6 +139941,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pusher-http-haskell_1_2_0_0" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+     , cryptohash, hashable, hspec, http-client, http-types, QuickCheck
+     , text, time, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "pusher-http-haskell";
+       version = "1.2.0.0";
+       sha256 = "372de78c2efaf60512d22311ad38bd6e968e9e29de171517438c8b129a4b7371";
+       libraryHaskellDepends = [
+         aeson base base16-bytestring bytestring cryptohash hashable
+         http-client http-types text time transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring hspec http-client http-types QuickCheck text
+         transformers unordered-containers
+       ];
+       homepage = "https://github.com/pusher-community/pusher-http-haskell";
+       description = "Haskell client library for the Pusher HTTP API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pusher-ws" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , hashable, http-conduit, lens, lens-aeson, network, scientific
@@ -146855,19 +140818,6 @@ self: {
      }) {};
 
   "quickcheck-assertions" = callPackage
-    ({ mkDerivation, base, hspec, ieee754, QuickCheck }:
-     mkDerivation {
-       pname = "quickcheck-assertions";
-       version = "0.2.0";
-       sha256 = "600fbafab414f5fba7df40a10635aa407d3af8de3938a6c2866bf80f0952f740";
-       libraryHaskellDepends = [ base ieee754 QuickCheck ];
-       testHaskellDepends = [ base hspec ieee754 QuickCheck ];
-       homepage = "https://github.com/s9gf4ult/quickcheck-assertions";
-       description = "HUnit like assertions for QuickCheck";
-       license = stdenv.lib.licenses.lgpl3;
-     }) {};
-
-  "quickcheck-assertions_0_3_0" = callPackage
     ({ mkDerivation, base, hspec, ieee754, pretty-show, QuickCheck }:
      mkDerivation {
        pname = "quickcheck-assertions";
@@ -146878,7 +140828,6 @@ self: {
        homepage = "https://github.com/s9gf4ult/quickcheck-assertions";
        description = "HUnit like assertions for QuickCheck";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-combinators" = callPackage
@@ -147892,8 +141841,8 @@ self: {
     ({ mkDerivation, base, hspec, QuickCheck, quickcheck-io }:
      mkDerivation {
        pname = "ramus";
-       version = "0.1.0";
-       sha256 = "8acc90e5aec53ea31b8da0a1dd0164c4e2aa6e3226c5b69da0882b5c47255537";
+       version = "0.1.2";
+       sha256 = "dcddddc416e79c401604565b7297a945f814edeed056fb3b897eda5f4f0b794e";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck quickcheck-io ];
        homepage = "https://github.com/NickSeagull/ramus#readme";
@@ -148561,33 +142510,6 @@ self: {
      }) {};
 
   "rasterific-svg" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, directory
-     , filepath, FontyFruity, JuicyPixels, lens, linear, mtl
-     , optparse-applicative, Rasterific, scientific, svg-tree, text
-     , transformers, vector
-     }:
-     mkDerivation {
-       pname = "rasterific-svg";
-       version = "0.3.1.2";
-       sha256 = "83c90ea97d73f05003de2a4622ed26754fa52cb94a3341feada477713332a789";
-       revision = "1";
-       editedCabalFile = "1a66db5d85478533f4d6702dd36b158f464f3a725a365bcb68fefed59edfa586";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base binary bytestring containers directory filepath FontyFruity
-         JuicyPixels lens linear mtl Rasterific scientific svg-tree text
-         transformers vector
-       ];
-       executableHaskellDepends = [
-         base directory filepath FontyFruity JuicyPixels
-         optparse-applicative Rasterific svg-tree
-       ];
-       description = "SVG renderer based on Rasterific";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "rasterific-svg_0_3_2_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, directory
      , filepath, FontyFruity, JuicyPixels, lens, linear, mtl
      , optparse-applicative, primitive, Rasterific, scientific, svg-tree
@@ -148610,7 +142532,6 @@ self: {
        ];
        description = "SVG renderer based on Rasterific";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rate-limit" = callPackage
@@ -150487,10 +144408,8 @@ self: {
     ({ mkDerivation, base, blaze-html, blaze-markup, reform, text }:
      mkDerivation {
        pname = "reform-blaze";
-       version = "0.2.4.1";
-       sha256 = "d4acf094d75cef125e9d587646b9bbb66ce927b43ed16c99738f11e80569678b";
-       revision = "1";
-       editedCabalFile = "abe598582e2e9627ce899e3fe47c1d495da157d0059115aca220beecee6a05f1";
+       version = "0.2.4.3";
+       sha256 = "11bcf127356bf5840a0947ea1058cbf1e08096ab0fc872aa5c1ec7d88e40b2e4";
        libraryHaskellDepends = [
          base blaze-html blaze-markup reform text
        ];
@@ -150503,8 +144422,8 @@ self: {
     ({ mkDerivation, base, blaze-markup, reform, shakespeare, text }:
      mkDerivation {
        pname = "reform-hamlet";
-       version = "0.0.5.1";
-       sha256 = "a0271fc7580463d3790f26e651836e0030178444987c9132b3c74dab249286f2";
+       version = "0.0.5.3";
+       sha256 = "512729389fc3eec118a8079486eb2319e1e8eaecdeecafdd6b36205373ce3466";
        libraryHaskellDepends = [
          base blaze-markup reform shakespeare text
        ];
@@ -152405,26 +146324,6 @@ self: {
      }) {};
 
   "reroute" = callPackage
-    ({ mkDerivation, base, deepseq, hashable, hspec, hvect, mtl
-     , path-pieces, text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "reroute";
-       version = "0.4.0.1";
-       sha256 = "d1c3636aa6d2895055721ff9290a595fff2ce3e9d917e9af7e36aafb71701f0e";
-       libraryHaskellDepends = [
-         base deepseq hashable hvect mtl path-pieces text
-         unordered-containers
-       ];
-       testHaskellDepends = [
-         base hspec hvect mtl text unordered-containers vector
-       ];
-       homepage = "http://github.com/agrafix/Spock";
-       description = "abstract implementation of typed and untyped web routing";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "reroute_0_4_1_0" = callPackage
     ({ mkDerivation, base, deepseq, hashable, hspec, http-api-data
      , hvect, mtl, text, unordered-containers, vector
      }:
@@ -152442,7 +146341,6 @@ self: {
        homepage = "http://github.com/agrafix/Spock";
        description = "abstract implementation of typed and untyped web routing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reserve" = callPackage
@@ -152749,34 +146647,6 @@ self: {
      }) {};
 
   "rest-gen" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, blaze-html, Cabal
-     , code-builder, directory, fclabels, filepath, hashable
-     , haskell-src-exts, HStringTemplate, HUnit, hxt, json-schema
-     , pretty, process, rest-core, safe, scientific, semigroups, split
-     , test-framework, test-framework-hunit, text, uniplate
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "rest-gen";
-       version = "0.19.0.3";
-       sha256 = "9ed4224ed8de81c56000b6814724bfed46f4e7b8890fe5892d308b6edcab2e76";
-       revision = "1";
-       editedCabalFile = "d613ead87b1c5a0a7fee13c46dc42edf4c9e486277a14f1a3ce5314799963abd";
-       libraryHaskellDepends = [
-         aeson base base-compat blaze-html Cabal code-builder directory
-         fclabels filepath hashable haskell-src-exts HStringTemplate hxt
-         json-schema pretty process rest-core safe scientific semigroups
-         split text uniplate unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base fclabels haskell-src-exts HUnit rest-core test-framework
-         test-framework-hunit
-       ];
-       description = "Documentation and client generation from rest definition";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "rest-gen_0_20_0_0" = callPackage
     ({ mkDerivation, aeson, base, base-compat, blaze-html, Cabal
      , code-builder, directory, fclabels, filepath, hashable
      , haskell-src-exts, HStringTemplate, HUnit, hxt, json-schema
@@ -152802,7 +146672,6 @@ self: {
        ];
        description = "Documentation and client generation from rest definition";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rest-happstack" = callPackage
@@ -154202,21 +148071,6 @@ self: {
      }) {};
 
   "rotating-log" = callPackage
-    ({ mkDerivation, base, bytestring, directory, filepath, time }:
-     mkDerivation {
-       pname = "rotating-log";
-       version = "0.4";
-       sha256 = "661a22b9f5b05d7dd8989f61f1d625862d57b18aa19fba7077746f05be77b451";
-       libraryHaskellDepends = [
-         base bytestring directory filepath time
-       ];
-       testHaskellDepends = [ base bytestring directory filepath time ];
-       homepage = "http://github.com/Soostone/rotating-log";
-       description = "Size-limited, concurrent, automatically-rotating log writer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "rotating-log_0_4_2" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, old-locale
      , time, time-locale-compat
      }:
@@ -154234,7 +148088,6 @@ self: {
        homepage = "http://github.com/Soostone/rotating-log";
        description = "Size-limited, concurrent, automatically-rotating log writer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roundRobin" = callPackage
@@ -154540,33 +148393,6 @@ self: {
      }) {};
 
   "rss-conduit" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, conduit-extra
-     , conduit-parse, containers, data-default, exceptions, foldl, hlint
-     , lens-simple, mono-traversable, parsers, QuickCheck
-     , quickcheck-instances, resourcet, safe, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, timerep, uri-bytestring
-     , xml-conduit, xml-conduit-parse, xml-types
-     }:
-     mkDerivation {
-       pname = "rss-conduit";
-       version = "0.2.0.2";
-       sha256 = "304a2918743f7b65191ce8c4a57c94b1c3afb2692e5c79d6b0822a05be3294d1";
-       libraryHaskellDepends = [
-         base conduit conduit-parse containers exceptions foldl lens-simple
-         mono-traversable parsers safe text time timerep uri-bytestring
-         xml-conduit xml-conduit-parse xml-types
-       ];
-       testHaskellDepends = [
-         base bytestring conduit conduit-extra conduit-parse data-default
-         exceptions hlint lens-simple mono-traversable parsers QuickCheck
-         quickcheck-instances resourcet tasty tasty-hunit tasty-quickcheck
-         text time uri-bytestring xml-conduit xml-conduit-parse xml-types
-       ];
-       description = "Streaming parser/renderer for the RSS 2.0 standard.";
-       license = "unknown";
-     }) {};
-
-  "rss-conduit_0_3_0_0" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-combinators
      , conduit-extra, containers, data-default, hlint, lens-simple
      , mono-traversable, QuickCheck, quickcheck-instances, resourcet
@@ -154590,7 +148416,6 @@ self: {
        ];
        description = "Streaming parser/renderer for the RSS 2.0 standard.";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rss2irc" = callPackage
@@ -155019,8 +148844,8 @@ self: {
     ({ mkDerivation, base, deepseq, QuickCheck }:
      mkDerivation {
        pname = "safe";
-       version = "0.3.11";
-       sha256 = "6a58c8199a8c5ee7ca14077b69c2e876b29be51c797ec4b93de9c7ab3c7bd879";
+       version = "0.3.13";
+       sha256 = "4a75af71313ef98bb66fbb4f1416f6f1220cd37a2c8b1462ed8c5a982a264884";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base deepseq QuickCheck ];
        homepage = "https://github.com/ndmitchell/safe#readme";
@@ -155028,20 +148853,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "safe_0_3_12" = callPackage
-    ({ mkDerivation, base, deepseq, QuickCheck }:
-     mkDerivation {
-       pname = "safe";
-       version = "0.3.12";
-       sha256 = "738c849bdc619f9bbcd23f7fc956af2b87a182a9887ac88c1a80895ae931e29e";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base deepseq QuickCheck ];
-       homepage = "https://github.com/ndmitchell/safe#readme";
-       description = "Library of safe (exception free) functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "safe-access" = callPackage
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
@@ -155543,23 +149354,6 @@ self: {
      }) {};
 
   "sampling" = callPackage
-    ({ mkDerivation, base, foldl, mwc-random, primitive, vector }:
-     mkDerivation {
-       pname = "sampling";
-       version = "0.2.0";
-       sha256 = "0300849bb9b276455397df71fcf061e1db8563045af176f04a2ad31dd333295a";
-       revision = "1";
-       editedCabalFile = "705929c9a629db8150478fd996315889fb8e5ab16dd584bc969727d6cc7e25b1";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base foldl mwc-random primitive vector ];
-       executableHaskellDepends = [ base ];
-       homepage = "https://github.com/jtobin/sampling";
-       description = "Sample values from collections";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "sampling_0_3_2" = callPackage
     ({ mkDerivation, base, containers, foldl, mwc-random, primitive
      , vector
      }:
@@ -155574,7 +149368,6 @@ self: {
        homepage = "https://github.com/jtobin/sampling";
        description = "Sample values from collections";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "samtools" = callPackage
@@ -155913,8 +149706,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbp";
-       version = "2.1.6";
-       sha256 = "85387a8556d0b25b009ab48b6bcbafb5ac91bfb7dc5442838376f913be59924b";
+       version = "2.1.7";
+       sha256 = "481f1bb36ecd467b2e60d2a97c6393384d78b96ece7afd644d96641ee51bb32e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -155964,8 +149757,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbv";
-       version = "5.12";
-       sha256 = "0c43caeb77fd6a3d6d4e8e71835da0ca5e207dcc2b0bf6ef07abb7dd5c3bd55f";
+       version = "5.14";
+       sha256 = "92dc71b96071162a47383c5f4833e8b78c2874009e671e2a6bc8de9707328e7e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -156107,24 +149900,6 @@ self: {
      }) {};
 
   "scalpel" = callPackage
-    ({ mkDerivation, base, bytestring, containers, curl, data-default
-     , HUnit, regex-base, regex-tdfa, tagsoup, text
-     }:
-     mkDerivation {
-       pname = "scalpel";
-       version = "0.3.1";
-       sha256 = "5db9046a506f40d713fb678e496b7fd9cfa21c453bd5e6f574720d57826a204f";
-       libraryHaskellDepends = [
-         base bytestring containers curl data-default regex-base regex-tdfa
-         tagsoup text
-       ];
-       testHaskellDepends = [ base HUnit regex-base regex-tdfa tagsoup ];
-       homepage = "https://github.com/fimad/scalpel";
-       description = "A high level web scraping library for Haskell";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "scalpel_0_5_0" = callPackage
     ({ mkDerivation, base, bytestring, curl, data-default, scalpel-core
      , tagsoup, text
      }:
@@ -156138,7 +149913,6 @@ self: {
        homepage = "https://github.com/fimad/scalpel";
        description = "A high level web scraping library for Haskell";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scalpel-core" = callPackage
@@ -156531,31 +150305,6 @@ self: {
      }) {};
 
   "scientific" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, deepseq
-     , ghc-prim, hashable, integer-gmp, QuickCheck, smallcheck, tasty
-     , tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-smallcheck
-     , text, vector
-     }:
-     mkDerivation {
-       pname = "scientific";
-       version = "0.3.4.9";
-       sha256 = "108330662b0af9a04d7da55864211ce12008efe36614d897ba635e80670918a8";
-       revision = "1";
-       editedCabalFile = "833f5960e622c7346c3c02547538da037bcc4eececc00ba2ab9412eabdb71d61";
-       libraryHaskellDepends = [
-         base binary bytestring containers deepseq ghc-prim hashable
-         integer-gmp text vector
-       ];
-       testHaskellDepends = [
-         base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
-         tasty-hunit tasty-quickcheck tasty-smallcheck text
-       ];
-       homepage = "https://github.com/basvandijk/scientific";
-       description = "Numbers represented using scientific notation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "scientific_0_3_4_10" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq
      , ghc-prim, hashable, integer-gmp, integer-logarithms, QuickCheck
      , smallcheck, tasty, tasty-ant-xml, tasty-hunit, tasty-quickcheck
@@ -156576,7 +150325,6 @@ self: {
        homepage = "https://github.com/basvandijk/scientific";
        description = "Numbers represented using scientific notation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scion" = callPackage
@@ -157180,23 +150928,6 @@ self: {
      }) {};
 
   "sdl2" = callPackage
-    ({ mkDerivation, base, bytestring, exceptions, linear, SDL2
-     , StateVar, text, transformers, vector
-     }:
-     mkDerivation {
-       pname = "sdl2";
-       version = "2.1.3.1";
-       sha256 = "788a7f1e2bb08e393b806d9f700f62234703ec85b772e0e25ff740b4aafaae14";
-       libraryHaskellDepends = [
-         base bytestring exceptions linear StateVar text transformers vector
-       ];
-       librarySystemDepends = [ SDL2 ];
-       libraryPkgconfigDepends = [ SDL2 ];
-       description = "Both high- and low-level bindings to the SDL library (version 2.0.2+).";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) SDL2;};
-
-  "sdl2_2_2_0" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, linear, SDL2
      , StateVar, text, transformers, vector
      }:
@@ -157211,7 +150942,6 @@ self: {
        libraryPkgconfigDepends = [ SDL2 ];
        description = "Both high- and low-level bindings to the SDL library (version 2.0.4+).";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL2;};
 
   "sdl2-cairo" = callPackage
@@ -157947,8 +151677,8 @@ self: {
      }:
      mkDerivation {
        pname = "semiring-num";
-       version = "0.8.0.0";
-       sha256 = "13b47bc891b8b2bcfe648409554e4b811ce964d86febd1403584beb5f3b21a4e";
+       version = "0.9.0.1";
+       sha256 = "2605eddf961927ce04be8167a2a01123ee0a0dcae55dcd44f3830736ae4d9830";
        libraryHaskellDepends = [ base containers template-haskell ];
        testHaskellDepends = [
          base containers doctest nat-sized-numbers QuickCheck smallcheck
@@ -158532,19 +152262,21 @@ self: {
 
   "servant" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
-     , bytestring-conversion, case-insensitive, directory, doctest
-     , filemanip, filepath, hspec, http-api-data, http-media, http-types
-     , mmorph, mtl, network-uri, QuickCheck, quickcheck-instances
-     , string-conversions, text, url, vault
+     , case-insensitive, directory, doctest, filemanip, filepath, hspec
+     , http-api-data, http-media, http-types, mmorph, mtl, network-uri
+     , QuickCheck, quickcheck-instances, string-conversions, text, url
+     , vault
      }:
      mkDerivation {
        pname = "servant";
-       version = "0.8.1";
-       sha256 = "2b5494ceb4d8123c7a92535d0cf109485e165dfc9cba9471b11127e04556d8c1";
+       version = "0.9.1.1";
+       sha256 = "fb3372f676ab07dfab1695ccd0e23d98c948318f4b4d5ae827a6fa5284c4e5fa";
+       revision = "1";
+       editedCabalFile = "a9be93ef6e6464dc76f4572fe372095b9e77fdbaf92966569b5a50ee4829de4d";
        libraryHaskellDepends = [
-         aeson attoparsec base base-compat bytestring bytestring-conversion
-         case-insensitive http-api-data http-media http-types mmorph mtl
-         network-uri string-conversions text vault
+         aeson attoparsec base base-compat bytestring case-insensitive
+         http-api-data http-media http-types mmorph mtl network-uri
+         string-conversions text vault
        ];
        testHaskellDepends = [
          aeson attoparsec base base-compat bytestring directory doctest
@@ -158645,7 +152377,6 @@ self: {
        homepage = "http://github.com/plow-technologies/servant-auth#readme";
        description = "Authentication combinators for servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-client" = callPackage
@@ -158752,6 +152483,47 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-auth-server_0_2_1_0" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
+     , bytestring, bytestring-conversion, case-insensitive, cookie
+     , crypto-api, data-default-class, entropy, hspec, http-api-data
+     , http-client, http-types, jose, lens, lens-aeson, markdown-unlit
+     , monad-time, mtl, QuickCheck, servant-auth, servant-server, text
+     , time, transformers, unordered-containers, wai, warp, wreq
+     }:
+     mkDerivation {
+       pname = "servant-auth-server";
+       version = "0.2.1.0";
+       sha256 = "0f9e848300a916de0892c55a8b530a02d3fc8bcbc7983012780355a88e266c84";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base64-bytestring blaze-builder bytestring
+         bytestring-conversion case-insensitive cookie crypto-api
+         data-default-class entropy http-api-data jose lens monad-time mtl
+         servant-auth servant-server text time unordered-containers wai
+       ];
+       executableHaskellDepends = [
+         aeson base base64-bytestring blaze-builder bytestring
+         bytestring-conversion case-insensitive cookie crypto-api
+         data-default-class entropy http-api-data jose lens markdown-unlit
+         monad-time mtl servant-auth servant-server text time transformers
+         unordered-containers wai warp
+       ];
+       testHaskellDepends = [
+         aeson base base64-bytestring blaze-builder bytestring
+         bytestring-conversion case-insensitive cookie crypto-api
+         data-default-class entropy hspec http-api-data http-client
+         http-types jose lens lens-aeson monad-time mtl QuickCheck
+         servant-auth servant-server text time unordered-containers wai warp
+         wreq
+       ];
+       homepage = "http://github.com/plow-technologies/servant-auth#readme";
+       description = "servant-server/servant-auth compatibility";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-auth-server" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
      , bytestring, bytestring-conversion, case-insensitive, cookie
@@ -158790,7 +152562,6 @@ self: {
        homepage = "http://github.com/plow-technologies/servant-auth#readme";
        description = "servant-server/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-token" = callPackage
@@ -158801,8 +152572,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token";
-       version = "0.3.2.0";
-       sha256 = "e15307d04c1011f118696c791d641d2a22844737d2484138147beb49f1abcae2";
+       version = "0.4.0.0";
+       sha256 = "e194c5c860508e22b8eb030d6c52c431df9fd7631a6287b042b48daf74825250";
        libraryHaskellDepends = [
          aeson-injector base bytestring containers mtl persistent
          persistent-postgresql persistent-template pwstore-fast
@@ -158814,14 +152585,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-auth-token-acid" = callPackage
+    ({ mkDerivation, acid-state, aeson-injector, base, bytestring
+     , containers, ghc-prim, monad-control, mtl, safe, safecopy
+     , servant-auth-token, servant-auth-token-api, servant-server
+     , template-haskell, text, time, transformers, transformers-base
+     , uuid
+     }:
+     mkDerivation {
+       pname = "servant-auth-token-acid";
+       version = "0.4.0.0";
+       sha256 = "22c16f9a7d05a3555c7f3195248165b384c99792bf0e952326d3992831da318b";
+       libraryHaskellDepends = [
+         acid-state aeson-injector base bytestring containers ghc-prim
+         monad-control mtl safe safecopy servant-auth-token
+         servant-auth-token-api servant-server template-haskell text time
+         transformers transformers-base uuid
+       ];
+       homepage = "https://github.com/ncrashed/servant-auth-token#readme";
+       description = "Acid-state backend for servant-auth-token server";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-auth-token-api" = callPackage
     ({ mkDerivation, aeson, aeson-injector, base, lens, raw-strings-qq
      , servant, servant-docs, servant-swagger, swagger2, text
      }:
      mkDerivation {
        pname = "servant-auth-token-api";
-       version = "0.3.2.0";
-       sha256 = "f2fe6ed30518036c9866095521fc9212877e3760ea9a57fd40543d601b8c5e4e";
+       version = "0.4.0.0";
+       sha256 = "6a8ab7ae1f63d2aecca8c6d63f2b305238b010e5c2e19e4c7f51e01d6bb65526";
        libraryHaskellDepends = [
          aeson aeson-injector base lens raw-strings-qq servant servant-docs
          servant-swagger swagger2 text
@@ -158832,6 +152625,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-auth-token-persistent" = callPackage
+    ({ mkDerivation, aeson-injector, base, bytestring, containers
+     , ghc-prim, monad-control, mtl, persistent, persistent-postgresql
+     , persistent-template, servant-auth-token, servant-auth-token-api
+     , servant-server, text, time, transformers, transformers-base, uuid
+     }:
+     mkDerivation {
+       pname = "servant-auth-token-persistent";
+       version = "0.4.0.0";
+       sha256 = "8b2a6cbc45e3f52ac5d12cd05c052373ca758599672b6086b3148e0dd5f9a075";
+       libraryHaskellDepends = [
+         aeson-injector base bytestring containers ghc-prim monad-control
+         mtl persistent persistent-postgresql persistent-template
+         servant-auth-token servant-auth-token-api servant-server text time
+         transformers transformers-base uuid
+       ];
+       homepage = "https://github.com/ncrashed/servant-auth-token#readme";
+       description = "Persistent backend for servant-auth-token server";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-blaze" = callPackage
     ({ mkDerivation, base, blaze-html, http-media, servant }:
      mkDerivation {
@@ -158861,27 +152675,29 @@ self: {
      }) {};
 
   "servant-client" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
-     , bytestring, deepseq, exceptions, hspec, http-api-data
-     , http-client, http-client-tls, http-media, http-types, HUnit
-     , network, network-uri, QuickCheck, safe, servant, servant-server
-     , string-conversions, text, transformers, transformers-compat, wai
-     , warp
+    ({ mkDerivation, aeson, attoparsec, base, base-compat
+     , base64-bytestring, bytestring, deepseq, exceptions, hspec
+     , http-api-data, http-client, http-client-tls, http-media
+     , http-types, HUnit, mtl, network, network-uri, QuickCheck, safe
+     , servant, servant-server, string-conversions, text, transformers
+     , transformers-compat, wai, warp
      }:
      mkDerivation {
        pname = "servant-client";
-       version = "0.8.1";
-       sha256 = "a007328f261e8d5596fee87cf541d0886bd1d644fb545fbb05fca683d8f8e33a";
+       version = "0.9.1.1";
+       sha256 = "6e085faa1a8ecab076ffdec61b97b6e7c8fff7eb18a9a4cf3538c26b7b99c724";
+       revision = "1";
+       editedCabalFile = "d3ac72d1b11dd6ebf86076237d8ffab3b87e8b6f04d2af1b28a2c5506faa82c5";
        libraryHaskellDepends = [
-         aeson attoparsec base base64-bytestring bytestring exceptions
-         http-api-data http-client http-client-tls http-media http-types
-         network-uri safe servant string-conversions text transformers
-         transformers-compat
+         aeson attoparsec base base-compat base64-bytestring bytestring
+         exceptions http-api-data http-client http-client-tls http-media
+         http-types mtl network-uri safe servant string-conversions text
+         transformers transformers-compat
        ];
        testHaskellDepends = [
-         aeson base bytestring deepseq hspec http-client http-media
-         http-types HUnit network QuickCheck servant servant-server text
-         transformers transformers-compat wai warp
+         aeson base base-compat bytestring deepseq hspec http-api-data
+         http-client http-media http-types HUnit network QuickCheck servant
+         servant-server text transformers transformers-compat wai warp
        ];
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "automatical derivation of querying functions for servant webservices";
@@ -158978,24 +152794,23 @@ self: {
 
   "servant-docs" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring
-     , bytestring-conversion, case-insensitive, control-monad-omega
-     , hashable, hspec, http-media, http-types, lens, servant
-     , string-conversions, text, unordered-containers
+     , case-insensitive, control-monad-omega, hashable, hspec
+     , http-media, http-types, lens, servant, string-conversions, text
+     , unordered-containers
      }:
      mkDerivation {
        pname = "servant-docs";
-       version = "0.8.1";
-       sha256 = "5a68ef0248da54fddf2fbba0a209a2bbba4144a576c681545b8019041645868d";
+       version = "0.9.1.1";
+       sha256 = "7c4205d25caa926355221e62842c3e58337d05022b1e4341045ac385e568bc79";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring bytestring-conversion
-         case-insensitive control-monad-omega hashable http-media http-types
-         lens servant string-conversions text unordered-containers
+         aeson aeson-pretty base bytestring case-insensitive
+         control-monad-omega hashable http-media http-types lens servant
+         string-conversions text unordered-containers
        ];
        executableHaskellDepends = [
-         aeson base bytestring-conversion lens servant string-conversions
-         text
+         aeson base lens servant string-conversions text
        ];
        testHaskellDepends = [
          aeson base hspec lens servant string-conversions
@@ -159003,7 +152818,6 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-docs_0_10" = callPackage
@@ -159101,7 +152915,6 @@ self: {
        homepage = "http://github.com/mattjbray/servant-elm#readme";
        description = "Automatically derive Elm functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-examples" = callPackage
@@ -159132,8 +152945,8 @@ self: {
     ({ mkDerivation, base, hspec, http-types, lens, servant, text }:
      mkDerivation {
        pname = "servant-foreign";
-       version = "0.8.1";
-       sha256 = "dd70baa384b353912663b7845fb8698d20350eff389b19e6c6d45181ab7b3171";
+       version = "0.9.1.1";
+       sha256 = "da9baf46c97b3ef3009a69c8d1ca40e188409c0027490c9e173b9ebd3da7c9ca";
        libraryHaskellDepends = [ base http-types lens servant text ];
        testHaskellDepends = [ base hspec ];
        description = "Helpers for generating clients for servant APIs in any programming language";
@@ -159245,27 +153058,6 @@ self: {
      }) {};
 
   "servant-js" = callPackage
-    ({ mkDerivation, base, base-compat, charset, hspec
-     , hspec-expectations, language-ecmascript, lens, servant
-     , servant-foreign, text
-     }:
-     mkDerivation {
-       pname = "servant-js";
-       version = "0.8.1";
-       sha256 = "5f60d692953f9f5f1570c7fd6b1c8c524545e588b3f1c63669ef219dde8c0363";
-       libraryHaskellDepends = [
-         base base-compat charset lens servant servant-foreign text
-       ];
-       testHaskellDepends = [
-         base base-compat hspec hspec-expectations language-ecmascript lens
-         servant text
-       ];
-       homepage = "http://haskell-servant.readthedocs.org/";
-       description = "Automatically derive javascript functions to query servant webservices";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-js_0_9_1" = callPackage
     ({ mkDerivation, base, base-compat, charset, hspec
      , hspec-expectations, language-ecmascript, lens, QuickCheck
      , servant, servant-foreign, text
@@ -159286,7 +153078,6 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "Automatically derive javascript functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-lucid" = callPackage
@@ -159451,31 +153242,6 @@ self: {
      }) {};
 
   "servant-purescript" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, http-types, lens, mainland-pretty, purescript-bridge
-     , servant, servant-foreign, servant-server, servant-subscriber
-     , text
-     }:
-     mkDerivation {
-       pname = "servant-purescript";
-       version = "0.3.1.5";
-       sha256 = "3bf4363b2154c7fb3e6da4eb9f5ef227c5e15d4cc6048342086d77426f74b9d5";
-       libraryHaskellDepends = [
-         aeson base bytestring containers directory filepath http-types lens
-         mainland-pretty purescript-bridge servant servant-foreign
-         servant-server servant-subscriber text
-       ];
-       testHaskellDepends = [
-         aeson base containers lens mainland-pretty purescript-bridge
-         servant servant-foreign servant-subscriber text
-       ];
-       homepage = "https://github.com/eskimor/servant-purescript#readme";
-       description = "Generate PureScript accessor functions for you servant API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "servant-purescript_0_6_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, http-types, lens, mainland-pretty, purescript-bridge
      , servant, servant-foreign, servant-server, servant-subscriber
@@ -159500,6 +153266,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-pushbullet-client" = callPackage
+    ({ mkDerivation, aeson, base, http-api-data, http-client
+     , http-client-tls, microlens, microlens-th, scientific, servant
+     , servant-client, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "servant-pushbullet-client";
+       version = "0.0.3.0";
+       sha256 = "f6374498a3f6cfd59b8562cd506408dcbd6805cb107d2a756c1e3700aef09b9d";
+       libraryHaskellDepends = [
+         aeson base http-api-data http-client http-client-tls microlens
+         microlens-th scientific servant servant-client text time
+         unordered-containers
+       ];
+       description = "Bindings to the Pushbullet API using servant-client";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "servant-quickcheck" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring
      , case-insensitive, clock, data-default-class, hspec, hspec-core
@@ -159584,18 +153368,19 @@ self: {
 
   "servant-server" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat
-     , base64-bytestring, bytestring, bytestring-conversion, containers
-     , directory, doctest, exceptions, filemanip, filepath, hspec
-     , hspec-wai, http-api-data, http-types, mtl, network, network-uri
-     , parsec, QuickCheck, safe, servant, should-not-typecheck, split
-     , string-conversions, system-filepath, temporary, text
-     , transformers, transformers-compat, wai, wai-app-static, wai-extra
-     , warp, word8
+     , base64-bytestring, bytestring, containers, directory, doctest
+     , exceptions, filemanip, filepath, hspec, hspec-wai, http-api-data
+     , http-types, mtl, network, network-uri, parsec, QuickCheck, safe
+     , servant, should-not-typecheck, split, string-conversions
+     , system-filepath, temporary, text, transformers
+     , transformers-compat, wai, wai-app-static, wai-extra, warp, word8
      }:
      mkDerivation {
        pname = "servant-server";
-       version = "0.8.1";
-       sha256 = "2a662864df00ce431eb1a6d01245d65c1483847c6228c540e6374108fe84a2b2";
+       version = "0.9.1.1";
+       sha256 = "1e0683557ece1f7a8a7b11e5c7cd1fd042783777157d95a67e28a0518c91bdd1";
+       revision = "1";
+       editedCabalFile = "0fd5137ad4ab43f5a6fde1a944eb23ce6d75c42fb909e4a82b579ab1c3739771";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -159606,11 +153391,11 @@ self: {
        ];
        executableHaskellDepends = [ aeson base servant text wai warp ];
        testHaskellDepends = [
-         aeson base base-compat base64-bytestring bytestring
-         bytestring-conversion directory doctest exceptions filemanip
-         filepath hspec hspec-wai http-types mtl network parsec QuickCheck
-         safe servant should-not-typecheck string-conversions temporary text
-         transformers transformers-compat wai wai-extra warp
+         aeson base base-compat base64-bytestring bytestring directory
+         doctest exceptions filemanip filepath hspec hspec-wai http-types
+         mtl network parsec QuickCheck safe servant should-not-typecheck
+         string-conversions temporary text transformers transformers-compat
+         wai wai-extra warp
        ];
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "A family of combinators for defining webservices APIs and serving them";
@@ -162035,24 +155820,6 @@ self: {
      }) {};
 
   "simple-log" = callPackage
-    ({ mkDerivation, async, base, containers, deepseq, directory
-     , exceptions, filepath, mtl, SafeSemaphore, text, time
-     , transformers
-     }:
-     mkDerivation {
-       pname = "simple-log";
-       version = "0.4.0";
-       sha256 = "548c444505f70beb02b14b5b1e0c647acaa1879edc5699ef365ec516a9b55aa5";
-       libraryHaskellDepends = [
-         async base containers deepseq directory exceptions filepath mtl
-         SafeSemaphore text time transformers
-       ];
-       homepage = "http://github.com/mvoidex/simple-log";
-       description = "Simple log for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "simple-log_0_5_1" = callPackage
     ({ mkDerivation, async, base, containers, deepseq, directory
      , exceptions, filepath, mtl, SafeSemaphore, text, time
      , transformers
@@ -162068,7 +155835,6 @@ self: {
        homepage = "http://github.com/mvoidex/simple-log";
        description = "Simple log for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-log-syslog" = callPackage
@@ -163574,24 +157340,6 @@ self: {
      }) {};
 
   "smsaero" = callPackage
-    ({ mkDerivation, aeson, base, containers, http-api-data
-     , http-client, servant, servant-client, servant-docs, text, time
-     }:
-     mkDerivation {
-       pname = "smsaero";
-       version = "0.6.2";
-       sha256 = "32f2dcbde9d588e11cebba3149a5e3a9e915cb47e13de8a4466690a171d490ec";
-       libraryHaskellDepends = [
-         aeson base containers http-api-data http-client servant
-         servant-client servant-docs text time
-       ];
-       homepage = "https://github.com/GetShopTV/smsaero";
-       description = "SMSAero API and HTTP client based on servant library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "smsaero_0_7_1" = callPackage
     ({ mkDerivation, aeson, base, containers, http-api-data
      , http-client, servant, servant-client, servant-docs, text, time
      }:
@@ -164011,16 +157759,16 @@ self: {
      }) {};
 
   "snap-error-collector" = callPackage
-    ({ mkDerivation, async, base, containers, monad-loops
-     , MonadCatchIO-transformers, snap, stm, time, transformers
+    ({ mkDerivation, async, base, containers, lifted-base, monad-loops
+     , snap, stm, time, transformers
      }:
      mkDerivation {
        pname = "snap-error-collector";
-       version = "1.1.1";
-       sha256 = "9dadb634f69f0a9549c951c18c24c176db7c1b8024594563c55dfe00e6d21cac";
+       version = "1.1.2";
+       sha256 = "8c313ebefaa89447d6193d3346d37d46e198279fe4eb7218228da03fb3ba485c";
        libraryHaskellDepends = [
-         async base containers monad-loops MonadCatchIO-transformers snap
-         stm time transformers
+         async base containers lifted-base monad-loops snap stm time
+         transformers
        ];
        homepage = "http://github.com/ocharles/snap-error-collector";
        description = "Collect errors in batches and dispatch them";
@@ -165086,12 +158834,12 @@ self: {
     ({ mkDerivation, array, base, binary, bytestring, snappy }:
      mkDerivation {
        pname = "snappy-framing";
-       version = "0.1.0";
-       sha256 = "62c960bbe61da6afb89a7e78dacab87e19e0f627f39c76c211f045a42d99ffd4";
+       version = "0.1.1";
+       sha256 = "f01b99cfa2e8d2c677e45e1852e0ae0a00034b8318e69d84b1857936c8c24be5";
        libraryHaskellDepends = [ array base binary bytestring snappy ];
        homepage = "https://github.com/kim/snappy-framing";
        description = "Snappy Framing Format in Haskell";
-       license = "unknown";
+       license = stdenv.lib.licenses.mpl20;
      }) {};
 
   "snappy-iteratee" = callPackage
@@ -165423,19 +159171,6 @@ self: {
      }) {};
 
   "socket" = callPackage
-    ({ mkDerivation, async, base, bytestring, tasty, tasty-hunit }:
-     mkDerivation {
-       pname = "socket";
-       version = "0.6.1.0";
-       sha256 = "c010f5b5c705483f52a8c1d45f07f57b49e8b61c07187bc3e50d658c72c409e6";
-       libraryHaskellDepends = [ base bytestring ];
-       testHaskellDepends = [ async base bytestring tasty tasty-hunit ];
-       homepage = "https://github.com/lpeterse/haskell-socket";
-       description = "An extensible socket library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "socket_0_7_0_0" = callPackage
     ({ mkDerivation, async, base, bytestring, QuickCheck, tasty
      , tasty-hunit, tasty-quickcheck
      }:
@@ -165450,7 +159185,6 @@ self: {
        homepage = "https://github.com/lpeterse/haskell-socket";
        description = "An extensible socket library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "socket-activation" = callPackage
@@ -165471,8 +159205,8 @@ self: {
      }:
      mkDerivation {
        pname = "socket-io";
-       version = "1.3.6";
-       sha256 = "6ec1577c7f701253bc85a9df03379d77ae99c33d1db5ee4f7e6b06972701fb1a";
+       version = "1.3.7";
+       sha256 = "bbd92d2a6711e950e6bb2da8342a3e103c66638cad2207820c5cb6d8090fef0a";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring engine-io mtl stm text
          transformers unordered-containers vector
@@ -165610,30 +159344,6 @@ self: {
      }) {};
 
   "solga" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, hashable
-     , hspec, hspec-wai, hspec-wai-json, http-types, QuickCheck
-     , resourcet, safe-exceptions, scientific, text
-     , unordered-containers, vector, wai, wai-extra
-     }:
-     mkDerivation {
-       pname = "solga";
-       version = "0.1.0.1";
-       sha256 = "4949717429b3698d619bca644fedb340b8f0eaac50e3e9b0b55007d9eb1db8ba";
-       libraryHaskellDepends = [
-         aeson base bytestring containers http-types resourcet
-         safe-exceptions text wai wai-extra
-       ];
-       testHaskellDepends = [
-         aeson base bytestring hashable hspec hspec-wai hspec-wai-json
-         http-types QuickCheck scientific text unordered-containers vector
-         wai wai-extra
-       ];
-       homepage = "https://github.com/chpatrick/solga";
-       description = "Simple typesafe web routing";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "solga_0_1_0_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hashable
      , hspec, hspec-wai, hspec-wai-json, http-types, QuickCheck
      , resourcet, safe-exceptions, scientific, text
@@ -165655,7 +159365,6 @@ self: {
        homepage = "https://github.com/chpatrick/solga";
        description = "Simple typesafe web routing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "solga-swagger" = callPackage
@@ -166032,8 +159741,8 @@ self: {
 
   "sparkle" = callPackage
     ({ mkDerivation, base, binary, bytestring, choice
-     , distributed-closure, filepath, jni, jvm, process, regex-tdfa
-     , singletons, streaming, text, vector, zip-archive
+     , distributed-closure, filepath, jni, jvm, jvm-streaming, process
+     , regex-tdfa, singletons, streaming, text, vector, zip-archive
      }:
      mkDerivation {
        pname = "sparkle";
@@ -166043,7 +159752,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring choice distributed-closure jni jvm
-         singletons streaming text vector
+         jvm-streaming singletons streaming text vector
        ];
        executableHaskellDepends = [
          base bytestring filepath process regex-tdfa text zip-archive
@@ -166332,23 +160041,6 @@ self: {
      }) {};
 
   "speedy-slice" = callPackage
-    ({ mkDerivation, base, containers, lens, mcmc-types
-     , mwc-probability, pipes, primitive, transformers
-     }:
-     mkDerivation {
-       pname = "speedy-slice";
-       version = "0.1.5";
-       sha256 = "d072049b142e1df47a2a6b269dc7a9fc754a1ecd62ed5c6a6e8fb4122dd02441";
-       libraryHaskellDepends = [
-         base lens mcmc-types mwc-probability pipes primitive transformers
-       ];
-       testHaskellDepends = [ base containers mwc-probability ];
-       homepage = "http://github.com/jtobin/speedy-slice";
-       description = "Speedy slice sampling";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "speedy-slice_0_3_0" = callPackage
     ({ mkDerivation, base, containers, kan-extensions, lens, mcmc-types
      , mwc-probability, pipes, primitive, transformers
      }:
@@ -166364,7 +160056,6 @@ self: {
        homepage = "http://github.com/jtobin/speedy-slice";
        description = "Speedy slice sampling";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "spelling-suggest" = callPackage
@@ -166884,8 +160575,8 @@ self: {
      }:
      mkDerivation {
        pname = "sproxy2";
-       version = "1.94.0";
-       sha256 = "3affef81be078269b7acbfa761d2e1fde761ee7b4e4fe6182a67e7278ae4a2cb";
+       version = "1.94.1";
+       sha256 = "be00dbeb5a81ecd38034ea549772eb3f3c94c8185a26c2f7de86c17084586e21";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -167495,32 +161186,6 @@ self: {
      }) {};
 
   "stache" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, deepseq
-     , directory, exceptions, file-embed, filepath, hspec
-     , hspec-megaparsec, megaparsec, mtl, template-haskell, text
-     , unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "stache";
-       version = "0.1.8";
-       sha256 = "a8617924e087b02c3afb3308a8a1102828e352dba7545648703e5d0c2c3c35b2";
-       revision = "2";
-       editedCabalFile = "293e587834fd528a8f1869027b1de5f3ea492597350688a86db36c18453757d9";
-       libraryHaskellDepends = [
-         aeson base bytestring containers deepseq directory exceptions
-         filepath megaparsec mtl template-haskell text unordered-containers
-         vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers file-embed hspec hspec-megaparsec
-         megaparsec text yaml
-       ];
-       homepage = "https://github.com/stackbuilders/stache";
-       description = "Mustache templates for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "stache_0_2_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , directory, exceptions, file-embed, filepath, hspec
      , hspec-megaparsec, megaparsec, mtl, template-haskell, text
@@ -167544,7 +161209,6 @@ self: {
        homepage = "https://github.com/stackbuilders/stache";
        description = "Mustache templates for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack" = callPackage
@@ -167814,52 +161478,6 @@ self: {
      }) {};
 
   "stackage-curator" = callPackage
-    ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
-     , base, base16-bytestring, blaze-html, byteable, bytestring, Cabal
-     , classy-prelude-conduit, conduit, conduit-extra, containers
-     , cryptohash, cryptohash-conduit, data-default-class, directory
-     , exceptions, filepath, hashable, hspec, html-conduit, http-client
-     , http-client-tls, http-conduit, lucid, mime-types, monad-unlift
-     , monad-unlift-ref, mono-traversable, mtl, old-locale
-     , optparse-applicative, optparse-simple, process, QuickCheck
-     , resourcet, safe, semigroups, stm, store, streaming-commons, syb
-     , system-fileio, system-filepath, tar, temporary, text, time
-     , transformers, unix-compat, unordered-containers, utf8-string
-     , vector, xml-conduit, xml-types, yaml, zlib
-     }:
-     mkDerivation {
-       pname = "stackage-curator";
-       version = "0.14.3";
-       sha256 = "ce868f0bc6c385d23672421df9a8613c418e50e793a9ffbb16a2e0a4003ba8fa";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson amazonka amazonka-core amazonka-s3 async base
-         base16-bytestring blaze-html byteable bytestring Cabal
-         classy-prelude-conduit conduit conduit-extra containers cryptohash
-         cryptohash-conduit data-default-class directory exceptions filepath
-         hashable html-conduit http-client http-client-tls http-conduit
-         lucid mime-types monad-unlift monad-unlift-ref mono-traversable mtl
-         old-locale process resourcet safe semigroups stm store
-         streaming-commons syb system-fileio system-filepath tar temporary
-         text time transformers unix-compat unordered-containers utf8-string
-         vector xml-conduit xml-types yaml zlib
-       ];
-       executableHaskellDepends = [
-         aeson base http-client http-client-tls optparse-applicative
-         optparse-simple system-filepath text
-       ];
-       testHaskellDepends = [
-         base Cabal classy-prelude-conduit containers directory hspec
-         http-client http-client-tls QuickCheck text yaml
-       ];
-       homepage = "https://github.com/fpco/stackage-curator";
-       description = "Tools for curating Stackage bundles";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "stackage-curator_0_14_5" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
      , base, base16-bytestring, blaze-html, byteable, bytestring, Cabal
      , classy-prelude-conduit, conduit, conduit-extra, containers
@@ -169284,46 +162902,6 @@ self: {
      }) {};
 
   "store" = callPackage
-    ({ mkDerivation, array, base, base-orphans, base64-bytestring
-     , bytestring, cereal, cereal-vector, conduit, containers, criterion
-     , cryptohash, deepseq, directory, fail, filepath, ghc-prim
-     , hashable, hspec, hspec-smallcheck, integer-gmp, lifted-base
-     , monad-control, mono-traversable, primitive, resourcet, safe
-     , semigroups, smallcheck, store-core, syb, template-haskell, text
-     , th-lift, th-lift-instances, th-orphans, th-reify-many
-     , th-utilities, time, transformers, unordered-containers, vector
-     , vector-binary-instances, void, weigh
-     }:
-     mkDerivation {
-       pname = "store";
-       version = "0.2.1.2";
-       sha256 = "5accb9a9aa79fd5dbc315b398a926722dee424935271c9a6cb90aea84f3e1cad";
-       libraryHaskellDepends = [
-         array base base-orphans base64-bytestring bytestring conduit
-         containers cryptohash deepseq directory fail filepath ghc-prim
-         hashable hspec hspec-smallcheck integer-gmp lifted-base
-         monad-control mono-traversable primitive resourcet safe semigroups
-         smallcheck store-core syb template-haskell text th-lift
-         th-lift-instances th-orphans th-reify-many th-utilities time
-         transformers unordered-containers vector void
-       ];
-       testHaskellDepends = [
-         array base base-orphans base64-bytestring bytestring cereal
-         cereal-vector conduit containers criterion cryptohash deepseq
-         directory fail filepath ghc-prim hashable hspec hspec-smallcheck
-         integer-gmp lifted-base monad-control mono-traversable primitive
-         resourcet safe semigroups smallcheck store-core syb
-         template-haskell text th-lift th-lift-instances th-orphans
-         th-reify-many th-utilities time transformers unordered-containers
-         vector vector-binary-instances void weigh
-       ];
-       homepage = "https://github.com/fpco/store#readme";
-       description = "Fast binary serialization";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "store_0_3" = callPackage
     ({ mkDerivation, array, async, base, base-orphans
      , base64-bytestring, bytestring, cereal, cereal-vector, conduit
      , containers, criterion, cryptohash, deepseq, directory, filepath
@@ -169367,22 +162945,6 @@ self: {
      }) {};
 
   "store-core" = callPackage
-    ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "store-core";
-       version = "0.2.0.2";
-       sha256 = "025f6d186f96329d1f0b76e2e2753e78852413896d19917856c096bf22e6420e";
-       libraryHaskellDepends = [
-         base bytestring fail ghc-prim primitive text transformers
-       ];
-       homepage = "https://github.com/fpco/store#readme";
-       description = "Fast and lightweight binary serialization";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "store-core_0_3" = callPackage
     ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text
      , transformers
      }:
@@ -169396,7 +162958,6 @@ self: {
        homepage = "https://github.com/fpco/store#readme";
        description = "Fast and lightweight binary serialization";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "str" = callPackage
@@ -169418,34 +162979,6 @@ self: {
      }) {};
 
   "stratosphere" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
-     , hlint, lens, tasty, tasty-hspec, template-haskell, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "stratosphere";
-       version = "0.1.6";
-       sha256 = "16f6aefde00cb48105506b8f396f61d32947a36456a29a377da512d40b81aae1";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring lens template-haskell text
-         unordered-containers
-       ];
-       executableHaskellDepends = [
-         aeson aeson-pretty base bytestring lens template-haskell text
-         unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty base bytestring directory hlint lens tasty
-         tasty-hspec template-haskell text unordered-containers
-       ];
-       homepage = "https://github.com/frontrowed/stratosphere#readme";
-       description = "EDSL for AWS CloudFormation";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "stratosphere_0_4_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
      , hashable, hlint, lens, tasty, tasty-hspec, template-haskell, text
      , unordered-containers
@@ -169465,7 +162998,6 @@ self: {
        homepage = "https://github.com/frontrowed/stratosphere#readme";
        description = "EDSL for AWS CloudFormation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stratum-tool" = callPackage
@@ -169986,6 +163518,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "strict-writer" = callPackage
+    ({ mkDerivation, base, doctest, mtl }:
+     mkDerivation {
+       pname = "strict-writer";
+       version = "0.4.0.0";
+       sha256 = "bae1b58384f96a61eb491dc432d5fe6551fe2d5cfb0f0c3c736a819a12844caa";
+       libraryHaskellDepends = [ base mtl ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "https://github.com/oisdk/strict-writer";
+       description = "A stricter writer, which uses StateT in order to avoid space leaks";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "strictify" = callPackage
     ({ mkDerivation, base, directory, filepath, process, unix }:
      mkDerivation {
@@ -170304,8 +163849,8 @@ self: {
      }:
      mkDerivation {
        pname = "stripe-core";
-       version = "2.1.0";
-       sha256 = "74d48a1db4244258b1850e2e657cb53fabe1d280638530a1f730e46538973ce5";
+       version = "2.2.0";
+       sha256 = "ca694e710f1670ea844e8f65ab483b9acb24e27dc26de1f8500b11d8f13af559";
        libraryHaskellDepends = [
          aeson base bytestring mtl text time transformers
          unordered-containers
@@ -170319,8 +163864,8 @@ self: {
     ({ mkDerivation, base, stripe-core, stripe-http-streams }:
      mkDerivation {
        pname = "stripe-haskell";
-       version = "2.1.0";
-       sha256 = "83f88fe7c264ee30b7da8e0630f0efeee722677d745705cc2059ea9ba3d82775";
+       version = "2.2.0";
+       sha256 = "f69fe32fd135a802587339d5043411f030cb2e2627df739193252f3015e971a0";
        libraryHaskellDepends = [ base stripe-core stripe-http-streams ];
        homepage = "https://github.com/dmjio/stripe";
        description = "Stripe API for Haskell";
@@ -170334,8 +163879,8 @@ self: {
      }:
      mkDerivation {
        pname = "stripe-http-streams";
-       version = "2.1.0";
-       sha256 = "053e696d1f2d671594bd0ffe70e473f54fb551bee0bdf040222e7a995174301e";
+       version = "2.2.0";
+       sha256 = "83b86304a51975625196dfac2db567e82e93ae437ef4fdd26204061c360ac07a";
        libraryHaskellDepends = [
          aeson base bytestring HsOpenSSL http-streams io-streams stripe-core
          text
@@ -170347,7 +163892,25 @@ self: {
        description = "Stripe API for Haskell - http-streams backend";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {stripe-tests = null;};
+     }) {};
+
+  "stripe-tests" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, free, hspec, hspec-core
+     , mtl, random, stripe-core, text, time, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "stripe-tests";
+       version = "2.2.0";
+       sha256 = "7a7c5771408807509ed5708ed7e9e6f7d10d8e6d39ecaf7a1fce0b61b73b4913";
+       libraryHaskellDepends = [
+         aeson base bytestring free hspec hspec-core mtl random stripe-core
+         text time transformers unordered-containers
+       ];
+       homepage = "https://github.com/dmjio/stripe-haskell";
+       description = "Tests for Stripe API bindings for Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
 
   "strips" = callPackage
     ({ mkDerivation, base, containers, hspec, mtl }:
@@ -170574,35 +164137,6 @@ self: {
      }) {};
 
   "stylish-haskell" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative
-     , strict, syb, test-framework, test-framework-hunit, yaml
-     }:
-     mkDerivation {
-       pname = "stylish-haskell";
-       version = "0.6.1.0";
-       sha256 = "eef85fe3940779e092c3a3ffa26c17ae6c96625a5fa606f0c816a37fce357b0d";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers directory filepath
-         haskell-src-exts mtl syb yaml
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring containers directory filepath
-         haskell-src-exts mtl optparse-applicative strict syb yaml
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers directory filepath
-         haskell-src-exts HUnit mtl syb test-framework test-framework-hunit
-         yaml
-       ];
-       homepage = "https://github.com/jaspervdj/stylish-haskell";
-       description = "Haskell code prettifier";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "stylish-haskell_0_7_1_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative
      , strict, syb, test-framework, test-framework-hunit, yaml
@@ -170629,7 +164163,6 @@ self: {
        homepage = "https://github.com/jaspervdj/stylish-haskell";
        description = "Haskell code prettifier";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stylized" = callPackage
@@ -171190,23 +164723,6 @@ self: {
      }) {};
 
   "svg-tree" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers
-     , JuicyPixels, lens, linear, mtl, scientific, text, transformers
-     , vector, xml
-     }:
-     mkDerivation {
-       pname = "svg-tree";
-       version = "0.5.1.2";
-       sha256 = "0c285cf21203555c7d7179e6c3924c0ba1b5e03ed42dacf596ff891317893da0";
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers JuicyPixels lens linear mtl
-         scientific text transformers vector xml
-       ];
-       description = "SVG file loader and serializer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "svg-tree_0_6" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , JuicyPixels, lens, linear, mtl, scientific, text, transformers
      , vector, xml
@@ -171221,7 +164737,6 @@ self: {
        ];
        description = "SVG file loader and serializer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "svg2q" = callPackage
@@ -171338,23 +164853,6 @@ self: {
      }) {};
 
   "swagger" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, tasty, tasty-hunit, text
-     , time, transformers
-     }:
-     mkDerivation {
-       pname = "swagger";
-       version = "0.2.2";
-       sha256 = "19ffcf443fd03a87258fb4b3225166315d0fd835a7539ea70d7992619329ecc2";
-       libraryHaskellDepends = [
-         aeson base bytestring text time transformers
-       ];
-       testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ];
-       description = "Implementation of swagger data model";
-       license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "swagger_0_3_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, tasty, tasty-hunit, text
      , time, transformers
      }:
@@ -173654,6 +167152,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tasty-auto_0_1_0_2" = callPackage
+    ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "tasty-auto";
+       version = "0.1.0.2";
+       sha256 = "d76076b780cce1a83b50b4602928d3756a5df72f4294e50b5f1499c5f6381a1c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [
+         base directory filepath tasty tasty-hspec tasty-hunit
+         tasty-quickcheck tasty-smallcheck
+       ];
+       homepage = "https://github.com/minad/tasty-auto#readme";
+       description = "Auto discovery for Tasty with support for ingredients and test tree generation";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-dejafu" = callPackage
     ({ mkDerivation, base, dejafu, tagged, tasty }:
      mkDerivation {
@@ -173984,6 +167504,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-stats" = callPackage
+    ({ mkDerivation, base, containers, directory, process, stm, tagged
+     , tasty, time
+     }:
+     mkDerivation {
+       pname = "tasty-stats";
+       version = "0.2.0.0";
+       sha256 = "73a1e34f30eeddf2e855c1c8813338ae4aa23f29ea74f4c0272f0e6de5007e9d";
+       libraryHaskellDepends = [
+         base containers directory process stm tagged tasty time
+       ];
+       homepage = "https://github.com/minad/tasty-stats#readme";
+       description = "Collect statistics of your Tasty testsuite in a CSV file";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "tasty-tap" = callPackage
     ({ mkDerivation, base, containers, directory, stm, tasty
      , tasty-golden, tasty-hunit
@@ -174135,30 +167671,6 @@ self: {
      }) {};
 
   "tcp-streams" = callPackage
-    ({ mkDerivation, base, bytestring, data-default-class, HsOpenSSL
-     , HsOpenSSL-x509-system, HUnit, io-streams, network, openssl, pem
-     , QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, tls, x509, x509-store, x509-system
-     }:
-     mkDerivation {
-       pname = "tcp-streams";
-       version = "0.4.0.0";
-       sha256 = "e6ada5a4c34cb8653bd03c5db43229f8f954bc0eda60e8169b4fd1c4156a0824";
-       libraryHaskellDepends = [
-         base bytestring data-default-class HsOpenSSL HsOpenSSL-x509-system
-         io-streams network pem tls x509 x509-store x509-system
-       ];
-       librarySystemDepends = [ openssl ];
-       testHaskellDepends = [
-         base bytestring HUnit io-streams network QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2
-       ];
-       description = "One stop solution for tcp client and server with tls support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) openssl;};
-
-  "tcp-streams_0_6_0_0" = callPackage
     ({ mkDerivation, base, bytestring, data-default-class, directory
      , HUnit, io-streams, network, pem, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2, tls, x509
@@ -174785,26 +168297,6 @@ self: {
      }) {};
 
   "terminal-progress-bar" = callPackage
-    ({ mkDerivation, base, base-unicode-symbols, HUnit, stm, stm-chans
-     , test-framework, test-framework-hunit
-     }:
-     mkDerivation {
-       pname = "terminal-progress-bar";
-       version = "0.0.1.4";
-       sha256 = "a36b3a305c58def80aa01fc2df46f4c15ea411a4531dd1723784e839448cbb51";
-       libraryHaskellDepends = [
-         base base-unicode-symbols stm stm-chans
-       ];
-       testHaskellDepends = [
-         base base-unicode-symbols HUnit test-framework test-framework-hunit
-       ];
-       homepage = "https://github.com/roelvandijk/terminal-progress-bar";
-       description = "A simple progress bar in the terminal";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "terminal-progress-bar_0_1_1" = callPackage
     ({ mkDerivation, base, HUnit, stm, stm-chans, test-framework
      , test-framework-hunit
      }:
@@ -174947,24 +168439,6 @@ self: {
      }) {};
 
   "test-fixture" = callPackage
-    ({ mkDerivation, base, data-default, hspec, hspec-discover, mtl
-     , template-haskell, th-to-exp, transformers
-     }:
-     mkDerivation {
-       pname = "test-fixture";
-       version = "0.4.2.0";
-       sha256 = "4c07ffa83b70dd44cd5b4824629fa021e9971360e29ed05baa8708eb7954981a";
-       libraryHaskellDepends = [ base data-default mtl template-haskell ];
-       testHaskellDepends = [
-         base hspec hspec-discover mtl template-haskell th-to-exp
-         transformers
-       ];
-       homepage = "http://github.com/cjdev/test-fixture#readme";
-       description = "Test monadic side-effects";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "test-fixture_0_5_0_0" = callPackage
     ({ mkDerivation, base, data-default, haskell-src-exts
      , haskell-src-meta, hspec, hspec-discover, mtl, template-haskell
      , th-orphans, th-to-exp, transformers
@@ -174984,7 +168458,6 @@ self: {
        homepage = "http://github.com/cjdev/test-fixture#readme";
        description = "Test monadic side-effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "test-framework" = callPackage
@@ -175503,27 +168976,6 @@ self: {
      }) {};
 
   "texmath" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
-     , utf8-string, xml
-     }:
-     mkDerivation {
-       pname = "texmath";
-       version = "0.8.6.7";
-       sha256 = "9e5fd9571a7257bdc8cfa6e0da077b16e867011a9f813065d68dd046bd358c88";
-       libraryHaskellDepends = [
-         base containers mtl pandoc-types parsec syb xml
-       ];
-       testHaskellDepends = [
-         base bytestring directory filepath process split temporary text
-         utf8-string xml
-       ];
-       homepage = "http://github.com/jgm/texmath";
-       description = "Conversion between formats used to represent mathematics";
-       license = "GPL";
-     }) {};
-
-  "texmath_0_9_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , mtl, pandoc-types, parsec, process, split, syb, temporary, text
      , utf8-string, xml
@@ -175542,7 +168994,6 @@ self: {
        homepage = "http://github.com/jgm/texmath";
        description = "Conversion between formats used to represent mathematics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "texrunner" = callPackage
@@ -175927,19 +169378,6 @@ self: {
      }) {};
 
   "text-metrics" = callPackage
-    ({ mkDerivation, base, hspec, QuickCheck, text }:
-     mkDerivation {
-       pname = "text-metrics";
-       version = "0.1.0";
-       sha256 = "b7af083250d9debefa2ef85b53aeab2e90b4939705f5f14df8af5b173d679b4f";
-       libraryHaskellDepends = [ base text ];
-       testHaskellDepends = [ base hspec QuickCheck text ];
-       homepage = "https://github.com/mrkkrp/text-metrics";
-       description = "Calculate various string metrics efficiently";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "text-metrics_0_2_0" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck, text }:
      mkDerivation {
        pname = "text-metrics";
@@ -175950,7 +169388,6 @@ self: {
        homepage = "https://github.com/mrkkrp/text-metrics";
        description = "Calculate various string metrics efficiently";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-normal" = callPackage
@@ -176086,37 +169523,6 @@ self: {
      }) {};
 
   "text-show" = callPackage
-    ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
-     , bytestring, bytestring-builder, containers, contravariant
-     , deriving-compat, generic-deriving, ghc-boot-th, ghc-prim, hspec
-     , integer-gmp, nats, QuickCheck, quickcheck-instances, semigroups
-     , tagged, template-haskell, text, th-lift, transformers
-     , transformers-compat, void
-     }:
-     mkDerivation {
-       pname = "text-show";
-       version = "3.4";
-       sha256 = "ce8a7adcca87617766a4c988808ff41fee20a2c84ac5442d6f3d8c5cec55d7c7";
-       libraryHaskellDepends = [
-         array base base-compat bifunctors bytestring bytestring-builder
-         containers contravariant generic-deriving ghc-boot-th ghc-prim
-         integer-gmp nats semigroups tagged template-haskell text th-lift
-         transformers transformers-compat void
-       ];
-       testHaskellDepends = [
-         array base base-compat base-orphans bifunctors bytestring
-         bytestring-builder containers contravariant deriving-compat
-         generic-deriving ghc-boot-th ghc-prim hspec integer-gmp nats
-         QuickCheck quickcheck-instances semigroups tagged template-haskell
-         text th-lift transformers transformers-compat void
-       ];
-       homepage = "https://github.com/RyanGlScott/text-show";
-       description = "Efficient conversion of values into Text";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "text-show_3_4_1_1" = callPackage
     ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
      , bytestring, bytestring-builder, containers, contravariant
      , deriving-compat, generic-deriving, ghc-boot-th, ghc-prim, hspec
@@ -176148,40 +169554,6 @@ self: {
      }) {};
 
   "text-show-instances" = callPackage
-    ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring
-     , containers, directory, generic-deriving, ghc-boot, ghc-prim
-     , haskeline, hoopl, hpc, hspec, old-locale, old-time, pretty
-     , QuickCheck, quickcheck-instances, random, semigroups, tagged
-     , template-haskell, terminfo, text, text-show, th-orphans, time
-     , transformers, transformers-compat, unix, unordered-containers
-     , vector, xhtml
-     }:
-     mkDerivation {
-       pname = "text-show-instances";
-       version = "3.4";
-       sha256 = "bf2e9e4a8ed01481024cce33a611daf52d733527e2ceb2ef2a576cf79ace6322";
-       libraryHaskellDepends = [
-         base base-compat bifunctors binary bytestring containers directory
-         ghc-boot haskeline hoopl hpc old-locale old-time pretty random
-         semigroups tagged template-haskell terminfo text text-show time
-         transformers transformers-compat unix unordered-containers vector
-         xhtml
-       ];
-       testHaskellDepends = [
-         base base-compat bifunctors binary bytestring containers directory
-         generic-deriving ghc-boot ghc-prim haskeline hoopl hpc hspec
-         old-locale old-time pretty QuickCheck quickcheck-instances random
-         semigroups tagged template-haskell terminfo text text-show
-         th-orphans time transformers transformers-compat unix
-         unordered-containers vector xhtml
-       ];
-       homepage = "https://github.com/RyanGlScott/text-show-instances";
-       description = "Additional instances for text-show";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "text-show-instances_3_5" = callPackage
     ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring
      , containers, directory, generic-deriving, ghc-boot-th, ghc-prim
      , haskeline, hoopl, hpc, hspec, old-locale, old-time, pretty
@@ -177492,8 +170864,8 @@ self: {
      }:
      mkDerivation {
        pname = "tibetan-utils";
-       version = "0.1.0.4";
-       sha256 = "64fe33564b370cb906fa877d5f130c25618800351c12bc6fb6fed77edd3af1ae";
+       version = "0.1.1.0";
+       sha256 = "008b976ca9b9bbd5ebe620e64bddccde31e0eed95ddcda20378cac96d3ca8115";
        libraryHaskellDepends = [
          base composition either megaparsec text text-show
        ];
@@ -177697,8 +171069,8 @@ self: {
      }:
      mkDerivation {
        pname = "tighttp";
-       version = "0.0.0.9";
-       sha256 = "8b73c5ae1f631621b3e67f9665e5b1dc886c60b16f608f3f929653c21dae1b96";
+       version = "0.0.0.10";
+       sha256 = "bf75164be06ef3de8c3b8bd8b915864b940ac8511ff0860fd5868553ed390160";
        libraryHaskellDepends = [
          base bytestring handle-like monads-tf old-locale papillon
          simple-pipe time
@@ -179650,12 +173022,15 @@ self: {
      }) {};
 
   "transformers-eff" = callPackage
-    ({ mkDerivation, base, free, mmorph, pipes, transformers }:
+    ({ mkDerivation, base, free, list-transformer, mmorph, transformers
+     }:
      mkDerivation {
        pname = "transformers-eff";
-       version = "0.1.0.0";
-       sha256 = "577f7ce07459239b1039d9f8c2935c02cc55bc585a5a4d21f5a81ac758f20037";
-       libraryHaskellDepends = [ base free mmorph pipes transformers ];
+       version = "0.2.0.0";
+       sha256 = "16be6a4fcb355a9295b62853106c947ae690221eee140f779faee905d77e48d9";
+       libraryHaskellDepends = [
+         base free list-transformer mmorph transformers
+       ];
        homepage = "https://github.com/ocharles/transformers-eff";
        description = "An approach to managing composable effects, ala mtl/transformers/extensible-effects/Eff";
        license = stdenv.lib.licenses.bsd3;
@@ -179898,17 +173273,6 @@ self: {
      }) {};
 
   "tree-view" = callPackage
-    ({ mkDerivation, base, containers, mtl }:
-     mkDerivation {
-       pname = "tree-view";
-       version = "0.4";
-       sha256 = "f64de6b9461d125fa4755fc98b6921a7a53cb4f096f88692fe86dd68cde5fe57";
-       libraryHaskellDepends = [ base containers mtl ];
-       description = "Render trees as foldable HTML and Unicode art";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tree-view_0_5" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
        pname = "tree-view";
@@ -179919,7 +173283,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "Render trees as foldable HTML and Unicode art";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "treemap" = callPackage
@@ -180411,30 +173774,6 @@ self: {
      }) {};
 
   "tttool" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, containers
-     , directory, executable-path, filepath, hashable, haskeline, HPDF
-     , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec
-     , process, random, split, spool, template-haskell, time, vector
-     , yaml, zlib
-     }:
-     mkDerivation {
-       pname = "tttool";
-       version = "1.6.1.2";
-       sha256 = "8f5f05c91ea4f50e43924618090f7806e0649dc83edd8c1af0e05d9032098384";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson base binary bytestring containers directory executable-path
-         filepath hashable haskeline HPDF JuicyPixels mtl natural-sort
-         optparse-applicative parsec process random split spool
-         template-haskell time vector yaml zlib
-       ];
-       homepage = "https://github.com/entropia/tip-toi-reveng";
-       description = "Working with files for the Tiptoi® pen";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tttool_1_7_0_1" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
      , directory, executable-path, filepath, hashable, haskeline, HPDF
      , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec
@@ -180456,7 +173795,6 @@ self: {
        homepage = "https://github.com/entropia/tip-toi-reveng";
        description = "Working with files for the Tiptoi® pen";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tubes" = callPackage
@@ -180711,26 +174049,6 @@ self: {
      }) {};
 
   "turtle" = callPackage
-    ({ mkDerivation, async, base, clock, directory, doctest, foldl
-     , hostname, managed, optional-args, optparse-applicative, process
-     , stm, system-fileio, system-filepath, temporary, text, time
-     , transformers, unix
-     }:
-     mkDerivation {
-       pname = "turtle";
-       version = "1.2.8";
-       sha256 = "798e4047773877323eb35e610e709db70880d2913ff652ff676a97902a6fbb01";
-       libraryHaskellDepends = [
-         async base clock directory foldl hostname managed optional-args
-         optparse-applicative process stm system-fileio system-filepath
-         temporary text time transformers unix
-       ];
-       testHaskellDepends = [ base doctest ];
-       description = "Shell programming, Haskell-style";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "turtle_1_3_1" = callPackage
     ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
      , directory, doctest, foldl, hostname, managed, optional-args
      , optparse-applicative, process, stm, system-fileio
@@ -180750,7 +174068,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "turtle-options" = callPackage
@@ -181828,19 +175145,6 @@ self: {
      }) {};
 
   "type-spec" = callPackage
-    ({ mkDerivation, base, pretty, show-type }:
-     mkDerivation {
-       pname = "type-spec";
-       version = "0.2.0.0";
-       sha256 = "8203f98c53d9d533da9e20e6e3c74ed5d144fad2ee21f58d8b3addd78cd172fa";
-       libraryHaskellDepends = [ base pretty show-type ];
-       testHaskellDepends = [ base ];
-       homepage = "https://github.com/sheyll/type-spec#readme";
-       description = "Type Level Specification by Example";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "type-spec_0_3_0_1" = callPackage
     ({ mkDerivation, base, pretty }:
      mkDerivation {
        pname = "type-spec";
@@ -181851,7 +175155,6 @@ self: {
        homepage = "https://github.com/sheyll/type-spec#readme";
        description = "Type Level Specification by Example";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-spine" = callPackage
@@ -182818,21 +176121,6 @@ self: {
      }) {};
 
   "unfoldable" = callPackage
-    ({ mkDerivation, base, ghc-prim, QuickCheck, random, transformers
-     }:
-     mkDerivation {
-       pname = "unfoldable";
-       version = "0.8.4";
-       sha256 = "af86e863625d4ae45820d1942a49de00559e4d4ee25db20610859d0a19cc1683";
-       libraryHaskellDepends = [
-         base ghc-prim QuickCheck random transformers
-       ];
-       homepage = "https://github.com/sjoerdvisscher/unfoldable";
-       description = "Class of data structures that can be unfolded";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "unfoldable_0_9_2" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, one-liner, QuickCheck
      , random, transformers
      }:
@@ -182846,7 +176134,6 @@ self: {
        homepage = "https://github.com/sjoerdvisscher/unfoldable";
        description = "Class of data structures that can be unfolded";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unfoldable-restricted" = callPackage
@@ -183080,19 +176367,6 @@ self: {
      }) {};
 
   "unicode-transforms" = callPackage
-    ({ mkDerivation, base, bytestring, split, text }:
-     mkDerivation {
-       pname = "unicode-transforms";
-       version = "0.1.0.1";
-       sha256 = "5fe607ec91e1cf25db1842e7409d4ed0e1bb6829409e846e010db25b2c75cb0b";
-       libraryHaskellDepends = [ base bytestring text ];
-       testHaskellDepends = [ base split text ];
-       homepage = "http://github.com/harendra-kumar/unicode-transforms";
-       description = "Unicode transforms (normalization NFC/NFD/NFKC/NFKD)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "unicode-transforms_0_2_1" = callPackage
     ({ mkDerivation, base, bitarray, bytestring, deepseq
      , getopt-generics, QuickCheck, split, text
      }:
@@ -183107,7 +176381,6 @@ self: {
        homepage = "http://github.com/harendra-kumar/unicode-transforms";
        description = "Unicode normalization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unicoder" = callPackage
@@ -183251,6 +176524,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "uniq-deep" = callPackage
+    ({ mkDerivation, base, bytestring, containers }:
+     mkDerivation {
+       pname = "uniq-deep";
+       version = "1.1.0.0";
+       sha256 = "f8953f91cbf90c5073ca90d4e9235dbe0a399ff811709d051b037a8a7db0d38e";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base bytestring containers ];
+       homepage = "https://github.com/ncaq/uniq-deep";
+       description = "uniq-deep";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "unique" = callPackage
     ({ mkDerivation, base, ghc-prim, hashable }:
      mkDerivation {
@@ -183423,6 +176710,46 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "unitym" = callPackage
+    ({ mkDerivation, base, text, transformers }:
+     mkDerivation {
+       pname = "unitym";
+       version = "0.1.0.2";
+       sha256 = "5a22f2e26ba053af73d9c92d37fa41bae147f59ac49a4c412fb725e5c5d93b9b";
+       libraryHaskellDepends = [ base text transformers ];
+       homepage = "https://github.com/bhurt/unitym#readme";
+       description = "A monad type class shared between web services";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "unitym-servant" = callPackage
+    ({ mkDerivation, base, mtl, servant-server, text, transformers
+     , unitym
+     }:
+     mkDerivation {
+       pname = "unitym-servant";
+       version = "0.1.0.0";
+       sha256 = "3394f5c1568116c3ad3283cece89e2c2ece74b93c3a644e4b2ba481ceeb0acf0";
+       libraryHaskellDepends = [
+         base mtl servant-server text transformers unitym
+       ];
+       homepage = "https://github.com/bhurt/unitym#readme";
+       description = "Implementaation of unitym for Servant servers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "unitym-yesod" = callPackage
+    ({ mkDerivation, base, unitym, yesod }:
+     mkDerivation {
+       pname = "unitym-yesod";
+       version = "0.1.0.2";
+       sha256 = "dc0fef13cc5142c8bf9df62916f3284ab34dcc1dcca56efc9f05fbc1398ee0e1";
+       libraryHaskellDepends = [ base unitym yesod ];
+       homepage = "https://github.com/bhurt/unitym#readme";
+       description = "Implementation of the unity monad for the Yesod framework";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "universal-binary" = callPackage
     ({ mkDerivation, base, binary, bytestring }:
      mkDerivation {
@@ -184068,6 +177395,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "update-repos" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath, hspec
+     , monad-parallel, process, QuickCheck, split, text
+     }:
+     mkDerivation {
+       pname = "update-repos";
+       version = "0.0.1";
+       sha256 = "5bdba9fecbeb9aee916fdb38a6c8586d9a389544700c50515e243ad51a7ab47b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring directory filepath monad-parallel process split
+         text
+       ];
+       executableHaskellDepends = [
+         base directory filepath monad-parallel split
+       ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/pedrovgs/update-repos";
+       description = "Update all your git repositories with just one command";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "uploadcare" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, cryptohash
      , hex, http-conduit, http-types, old-locale, time
@@ -185445,22 +178795,6 @@ self: {
      }) {};
 
   "varying" = callPackage
-    ({ mkDerivation, base, hspec, QuickCheck, time, transformers }:
-     mkDerivation {
-       pname = "varying";
-       version = "0.5.0.3";
-       sha256 = "a1eff74bb76c4a6b6af64f4490621f3c8a24deec7d44032dfb90e02fc2c73039";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base transformers ];
-       executableHaskellDepends = [ base time transformers ];
-       testHaskellDepends = [ base hspec QuickCheck time transformers ];
-       homepage = "https://github.com/schell/varying";
-       description = "FRP through value streams and monadic splines";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "varying_0_7_0_3" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck, time, transformers }:
      mkDerivation {
        pname = "varying";
@@ -185474,7 +178808,6 @@ self: {
        homepage = "https://github.com/schell/varying";
        description = "FRP through value streams and monadic splines";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vault" = callPackage
@@ -185990,22 +179323,6 @@ self: {
      }) {};
 
   "vector-instances" = callPackage
-    ({ mkDerivation, base, comonad, keys, pointed, semigroupoids
-     , semigroups, vector
-     }:
-     mkDerivation {
-       pname = "vector-instances";
-       version = "3.3.1";
-       sha256 = "68c7f154fe4ad53e29433e150c8718b0e74b4cf4c45a79af89940fff83868c59";
-       libraryHaskellDepends = [
-         base comonad keys pointed semigroupoids semigroups vector
-       ];
-       homepage = "http://github.com/ekmett/vector-instances";
-       description = "Orphan Instances for 'Data.Vector'";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vector-instances_3_4" = callPackage
     ({ mkDerivation, base, comonad, hashable, keys, pointed
      , semigroupoids, semigroups, vector
      }:
@@ -186019,7 +179336,6 @@ self: {
        homepage = "http://github.com/ekmett/vector-instances";
        description = "Orphan Instances for 'Data.Vector'";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-instances-collections" = callPackage
@@ -186912,42 +180228,6 @@ self: {
      }) {inherit (pkgs.gnome2) vte;};
 
   "vty" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
-     , data-default, deepseq, directory, filepath, hashable, HUnit
-     , microlens, microlens-mtl, microlens-th, mtl, parallel, parsec
-     , QuickCheck, quickcheck-assertions, random, smallcheck, stm
-     , string-qq, terminfo, test-framework, test-framework-hunit
-     , test-framework-smallcheck, text, transformers, unix, utf8-string
-     , vector
-     }:
-     mkDerivation {
-       pname = "vty";
-       version = "5.11.3";
-       sha256 = "0ee3fc39e8e5219b551bfc26ee38e9342e38b028480dacc2e6ac87fab5380232";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base blaze-builder bytestring containers data-default deepseq
-         directory filepath hashable microlens microlens-mtl microlens-th
-         mtl parallel parsec stm terminfo text transformers unix utf8-string
-         vector
-       ];
-       executableHaskellDepends = [
-         base containers data-default microlens microlens-mtl mtl
-       ];
-       testHaskellDepends = [
-         base blaze-builder bytestring Cabal containers data-default deepseq
-         HUnit microlens microlens-mtl mtl QuickCheck quickcheck-assertions
-         random smallcheck stm string-qq terminfo test-framework
-         test-framework-hunit test-framework-smallcheck text unix
-         utf8-string vector
-       ];
-       homepage = "https://github.com/coreyoconnor/vty";
-       description = "A simple terminal UI library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vty_5_15" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
      , deepseq, directory, filepath, hashable, HUnit, microlens
      , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
@@ -186980,7 +180260,6 @@ self: {
        homepage = "https://github.com/jtdaugherty/vty";
        description = "A simple terminal UI library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vty-examples" = callPackage
@@ -187818,36 +181097,6 @@ self: {
      }) {};
 
   "wai-middleware-content-type" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring
-     , clay, exceptions, hashable, hspec, hspec-wai, http-media
-     , http-types, lucid, mmorph, monad-control, monad-logger, mtl
-     , pandoc, pandoc-types, resourcet, shakespeare, tasty, tasty-hspec
-     , text, transformers, transformers-base, unordered-containers
-     , urlpath, wai, wai-transformers, warp
-     }:
-     mkDerivation {
-       pname = "wai-middleware-content-type";
-       version = "0.4.1";
-       sha256 = "99dcd8ae5da77650d31a1cd91d43d93c1a18687cd8947a3ea32cb1424229743e";
-       libraryHaskellDepends = [
-         aeson base blaze-builder blaze-html bytestring clay exceptions
-         hashable http-media http-types lucid mmorph monad-control
-         monad-logger mtl pandoc resourcet shakespeare text transformers
-         transformers-base unordered-containers urlpath wai wai-transformers
-       ];
-       testHaskellDepends = [
-         aeson base blaze-builder blaze-html bytestring clay exceptions
-         hashable hspec hspec-wai http-media http-types lucid mmorph
-         monad-control monad-logger mtl pandoc pandoc-types resourcet
-         shakespeare tasty tasty-hspec text transformers transformers-base
-         unordered-containers urlpath wai wai-transformers warp
-       ];
-       description = "Route to different middlewares based on the incoming Accept header";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "wai-middleware-content-type_0_5_0_1" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring
      , clay, exceptions, hashable, hspec, hspec-wai, http-media
      , http-types, lucid, mmorph, monad-control, monad-logger, mtl
@@ -188834,6 +182083,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wavefront_0_7_0_3" = callPackage
+    ({ mkDerivation, attoparsec, base, dlist, filepath, mtl, text
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "wavefront";
+       version = "0.7.0.3";
+       sha256 = "7e6ee21fa04410c4c01f0b86fa0acdc3d4d64d3167614e2cb58ce7528bbd0d65";
+       libraryHaskellDepends = [
+         attoparsec base dlist filepath mtl text transformers vector
+       ];
+       homepage = "https://github.com/phaazon/wavefront";
+       description = "Wavefront OBJ loader";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wavefront-obj" = callPackage
     ({ mkDerivation, attoparsec, base, containers, hspec, linear, text
      , transformers
@@ -189653,32 +182919,6 @@ self: {
      }) {};
 
   "websockets" = callPackage
-    ({ mkDerivation, attoparsec, base, base64-bytestring, binary
-     , blaze-builder, bytestring, case-insensitive, containers, entropy
-     , HUnit, network, QuickCheck, random, SHA, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text
-     }:
-     mkDerivation {
-       pname = "websockets";
-       version = "0.9.8.2";
-       sha256 = "09ec17dfbf9f07da27575ce7853b0c80d87ad959c2b271f27be4c4e54615eca2";
-       libraryHaskellDepends = [
-         attoparsec base base64-bytestring binary blaze-builder bytestring
-         case-insensitive containers entropy network random SHA text
-       ];
-       testHaskellDepends = [
-         attoparsec base base64-bytestring binary blaze-builder bytestring
-         case-insensitive containers entropy HUnit network QuickCheck random
-         SHA test-framework test-framework-hunit test-framework-quickcheck2
-         text
-       ];
-       doCheck = false;
-       homepage = "http://jaspervdj.be/websockets";
-       description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "websockets_0_10_0_0" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, binary
      , blaze-builder, bytestring, case-insensitive, containers, entropy
      , HUnit, network, QuickCheck, random, SHA, test-framework
@@ -189702,7 +182942,6 @@ self: {
        homepage = "http://jaspervdj.be/websockets";
        description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "websockets-snap" = callPackage
@@ -189792,6 +183031,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "weighted" = callPackage
+    ({ mkDerivation, base, mtl, semiring-num, transformers }:
+     mkDerivation {
+       pname = "weighted";
+       version = "0.3.0.0";
+       sha256 = "6d30cf0d4a833f82ed2e44e22c81658e55744f53308a25a895eaf7bc940131cb";
+       libraryHaskellDepends = [ base mtl semiring-num transformers ];
+       homepage = "https://github.com/oisdk/weighted";
+       description = "Writer monad which uses semiring constraint";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "weighted-regexp" = callPackage
     ({ mkDerivation, array, base, happy }:
      mkDerivation {
@@ -190033,12 +183284,14 @@ self: {
      }) {};
 
   "wide-word" = callPackage
-    ({ mkDerivation, base, bytestring, ghc-prim, hspec, QuickCheck }:
+    ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hspec
+     , QuickCheck
+     }:
      mkDerivation {
        pname = "wide-word";
-       version = "0.1.0.1";
-       sha256 = "d822ae64cf7edae19d7893d6b57e1d3fe6acf28a5c077e00b47bb865058df4cb";
-       libraryHaskellDepends = [ base ghc-prim ];
+       version = "0.1.0.2";
+       sha256 = "c5fa2df76b8391b34f5671c6280bedecd56ee6600db260bd4942bc91cacb41fb";
+       libraryHaskellDepends = [ base deepseq ghc-prim ];
        testHaskellDepends = [ base bytestring ghc-prim hspec QuickCheck ];
        homepage = "https://github.com/erikd/wide-word";
        description = "Data types for large but fixed width signed and unsigned integers";
@@ -190060,23 +183313,6 @@ self: {
      }) {};
 
   "wikicfp-scraper" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec
-     , scalpel, text, time
-     }:
-     mkDerivation {
-       pname = "wikicfp-scraper";
-       version = "0.1.0.7";
-       sha256 = "1e76ab2361c54b4f68dbe9c099f1e36144b405927abd69e6ee09c2292f65c582";
-       libraryHaskellDepends = [
-         attoparsec base bytestring scalpel text time
-       ];
-       testHaskellDepends = [ base bytestring filepath hspec time ];
-       homepage = "https://github.com/debug-ito/wikicfp-scraper";
-       description = "Scrape WikiCFP web site";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wikicfp-scraper_0_1_0_8" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec
      , scalpel-core, text, time
      }:
@@ -190091,7 +183327,6 @@ self: {
        homepage = "https://github.com/debug-ito/wikicfp-scraper";
        description = "Scrape WikiCFP web site";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wikipedia4epub" = callPackage
@@ -190171,8 +183406,8 @@ self: {
      }:
      mkDerivation {
        pname = "wild-bind-x11";
-       version = "0.1.0.5";
-       sha256 = "655f263a134e26a45b1001f7ea861743dbdbd30e69ea4808050c5d3178d557e1";
+       version = "0.1.0.6";
+       sha256 = "1e144b2833acee00da55cab3b28b57bc5347186f761cb1d7375532cfca38e4b4";
        libraryHaskellDepends = [
          base containers fold-debounce stm text transformers wild-bind X11
        ];
@@ -192170,34 +185405,6 @@ self: {
      }) {};
 
   "xlsx" = callPackage
-    ({ mkDerivation, base, base64-bytestring, binary-search, bytestring
-     , conduit, containers, data-default, Diff, errors, extra, filepath
-     , groom, lens, mtl, mtl-compat, network-uri, old-locale
-     , raw-strings-qq, safe, smallcheck, tasty, tasty-hunit
-     , tasty-smallcheck, text, time, transformers, vector, xml-conduit
-     , zip-archive, zlib
-     }:
-     mkDerivation {
-       pname = "xlsx";
-       version = "0.2.4";
-       sha256 = "e0b424417fb04d885b78eccde94d10bd28be59184b0bbbedf321fc15a2f23d40";
-       libraryHaskellDepends = [
-         base base64-bytestring binary-search bytestring conduit containers
-         data-default errors extra filepath lens mtl mtl-compat network-uri
-         old-locale safe text time transformers vector xml-conduit
-         zip-archive zlib
-       ];
-       testHaskellDepends = [
-         base bytestring containers Diff groom lens mtl raw-strings-qq
-         smallcheck tasty tasty-hunit tasty-smallcheck time vector
-         xml-conduit
-       ];
-       homepage = "https://github.com/qrilka/xlsx";
-       description = "Simple and incomplete Excel file parser/writer";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "xlsx_0_4_2" = callPackage
     ({ mkDerivation, base, base64-bytestring, binary-search, bytestring
      , conduit, containers, data-default, Diff, errors, extra, filepath
      , groom, lens, mtl, mtl-compat, network-uri, old-locale
@@ -192223,27 +185430,9 @@ self: {
        homepage = "https://github.com/qrilka/xlsx";
        description = "Simple and incomplete Excel file parser/writer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xlsx-tabular" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, data-default
-     , lens, text, xlsx
-     }:
-     mkDerivation {
-       pname = "xlsx-tabular";
-       version = "0.1.0.1";
-       sha256 = "29efb942a99bd0afe4ffda1856a51354b9ffa44253574b307f51bb2f05cf539a";
-       libraryHaskellDepends = [
-         aeson base bytestring containers data-default lens text xlsx
-       ];
-       testHaskellDepends = [ base ];
-       homepage = "http://github.com/kkazuo/xlsx-tabular#readme";
-       description = "Xlsx table decode utility";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "xlsx-tabular_0_2_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, data-default
      , lens, text, xlsx
      }:
@@ -192258,7 +185447,6 @@ self: {
        homepage = "https://github.com/kkazuo/xlsx-tabular";
        description = "Xlsx table cell value extraction utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xlsx-templater" = callPackage
@@ -192328,30 +185516,6 @@ self: {
      }) {};
 
   "xml-conduit" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, bytestring, conduit, conduit-extra, containers
-     , data-default, deepseq, hspec, HUnit, monad-control, resourcet
-     , text, transformers, xml-types
-     }:
-     mkDerivation {
-       pname = "xml-conduit";
-       version = "1.3.5";
-       sha256 = "25635a066b6a17a0d6c038ddf974a48b6d455d8fa14989f99341703da344dc83";
-       libraryHaskellDepends = [
-         attoparsec base blaze-builder blaze-html blaze-markup bytestring
-         conduit conduit-extra containers data-default deepseq monad-control
-         resourcet text transformers xml-types
-       ];
-       testHaskellDepends = [
-         base blaze-markup bytestring conduit containers hspec HUnit
-         resourcet text transformers xml-types
-       ];
-       homepage = "http://github.com/snoyberg/xml";
-       description = "Pure-Haskell utilities for dealing with XML with the conduit package";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "xml-conduit_1_4_0_3" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, bytestring, conduit, conduit-extra, containers
      , data-default, deepseq, hspec, HUnit, monad-control, resourcet
@@ -192373,7 +185537,6 @@ self: {
        homepage = "http://github.com/snoyberg/xml";
        description = "Pure-Haskell utilities for dealing with XML with the conduit package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-conduit-decode" = callPackage
@@ -192542,6 +185705,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "xml-html-qq" = callPackage
+    ({ mkDerivation, base, blaze-markup, conduit, data-default, doctest
+     , from-sum, Glob, heterocephalus, html-conduit, resourcet, tasty
+     , tasty-hunit, template-haskell, text, th-lift, th-lift-instances
+     , xml-conduit
+     }:
+     mkDerivation {
+       pname = "xml-html-qq";
+       version = "0.1.0.1";
+       sha256 = "1a2ebb1f4ca58a4f442c470db6d3271e6b1069d41860f8683b5da9082329235a";
+       libraryHaskellDepends = [
+         base blaze-markup conduit data-default from-sum heterocephalus
+         html-conduit resourcet template-haskell text th-lift
+         th-lift-instances xml-conduit
+       ];
+       testHaskellDepends = [
+         base doctest Glob tasty tasty-hunit text xml-conduit
+       ];
+       homepage = "https://github.com/cdepillabout/xml-html-qq";
+       description = "Quasi-quoters for XML and HTML Documents";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "xml-isogen" = callPackage
     ({ mkDerivation, base, dom-parser, lens, mtl, QuickCheck
      , semigroups, template-haskell, text, xml-conduit-writer
@@ -193008,8 +186194,8 @@ self: {
      }:
      mkDerivation {
        pname = "xmonad";
-       version = "0.12";
-       sha256 = "e8f649dbd4a8d5f75fdac9ceb5ee38b64fd351910ade81c188f5dd7bc21dfdd7";
+       version = "0.13";
+       sha256 = "f9f81b63569f18c777a939741024ec3ae34e4ec84015e5cc50f6622034a303ca";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -193051,19 +186237,17 @@ self: {
      }) {};
 
   "xmonad-contrib" = callPackage
-    ({ mkDerivation, base, containers, directory, extensible-exceptions
-     , filepath, mtl, old-locale, old-time, process, random, unix
-     , utf8-string, X11, X11-xft, xmonad
+    ({ mkDerivation, base, bytestring, containers, directory
+     , extensible-exceptions, filepath, mtl, old-locale, old-time
+     , process, random, unix, utf8-string, X11, X11-xft, xmonad
      }:
      mkDerivation {
        pname = "xmonad-contrib";
-       version = "0.12";
-       sha256 = "131d31c471ac02ece9c7e920497b4839a45df786a2096f56adb1f2de1221f311";
-       revision = "2";
-       editedCabalFile = "8a17b7fe46dc9d7435538a0db3997bcb2a125e71923ecd401024d84081a41807";
+       version = "0.13";
+       sha256 = "a760827fe5b1f99d783f52ccbb72b272d02d53daa26757363cde3ceba014476e";
        libraryHaskellDepends = [
-         base containers directory extensible-exceptions filepath mtl
-         old-locale old-time process random unix utf8-string X11 X11-xft
+         base bytestring containers directory extensible-exceptions filepath
+         mtl old-locale old-time process random unix utf8-string X11 X11-xft
          xmonad
        ];
        homepage = "http://xmonad.org/";
@@ -193601,25 +186785,6 @@ self: {
      }) {};
 
   "yahoo-finance-api" = callPackage
-    ({ mkDerivation, aeson, base, doctest, Glob, http-api-data
-     , http-client, lens, lens-aeson, mtl, servant, servant-client, text
-     , time, transformers
-     }:
-     mkDerivation {
-       pname = "yahoo-finance-api";
-       version = "0.1.0.0";
-       sha256 = "d7e8f52d8549fc2084698a520dcb17681e1917c2ca5ca63d3bda67522fdc5182";
-       libraryHaskellDepends = [
-         aeson base http-api-data http-client lens lens-aeson mtl servant
-         servant-client text time transformers
-       ];
-       testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/cdepillabout/yahoo-finance-api";
-       description = "Read quotes from Yahoo Finance API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "yahoo-finance-api_0_2_0_1" = callPackage
     ({ mkDerivation, aeson, base, doctest, either, Glob, hspec
      , http-api-data, http-client, http-client-tls, mtl, safe, servant
      , servant-client, text, time, transformers, vector
@@ -193639,7 +186804,6 @@ self: {
        homepage = "https://github.com/cdepillabout/yahoo-finance-api";
        description = "Read quotes from Yahoo Finance API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yahoo-finance-conduit" = callPackage
@@ -194409,32 +187573,6 @@ self: {
      }) {};
 
   "yesod-auth-hashdb" = callPackage
-    ({ mkDerivation, base, basic-prelude, bytestring, containers
-     , cryptohash, hspec, http-conduit, http-types, monad-logger
-     , network-uri, persistent, persistent-sqlite, pwstore-fast
-     , resourcet, text, wai-extra, yesod, yesod-auth, yesod-core
-     , yesod-form, yesod-persistent, yesod-test
-     }:
-     mkDerivation {
-       pname = "yesod-auth-hashdb";
-       version = "1.5.1.3";
-       sha256 = "ea455c6cb2c60de6254860ed1b8d29f8e73154c24db3e2edbfc0090f728b051a";
-       libraryHaskellDepends = [
-         base bytestring cryptohash persistent pwstore-fast text yesod-auth
-         yesod-core yesod-form yesod-persistent
-       ];
-       testHaskellDepends = [
-         base basic-prelude bytestring containers hspec http-conduit
-         http-types monad-logger network-uri persistent-sqlite resourcet
-         text wai-extra yesod yesod-auth yesod-core yesod-test
-       ];
-       homepage = "https://github.com/paul-rouse/yesod-auth-hashdb";
-       description = "Authentication plugin for Yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "yesod-auth-hashdb_1_6_0_1" = callPackage
     ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
      , hspec, http-conduit, http-types, monad-logger, network-uri
      , persistent, persistent-sqlite, pwstore-fast, resourcet, text
@@ -194693,12 +187831,16 @@ self: {
      }) {};
 
   "yesod-colonnade" = callPackage
-    ({ mkDerivation, base, colonnade, text, yesod-core }:
+    ({ mkDerivation, base, blaze-html, blaze-markup, colonnade, text
+     , yesod-core
+     }:
      mkDerivation {
        pname = "yesod-colonnade";
-       version = "0.2";
-       sha256 = "92a36ab103779aa8a541910456899fae8e8df6f4da27524200b54134c4b26a21";
-       libraryHaskellDepends = [ base colonnade text yesod-core ];
+       version = "0.4";
+       sha256 = "3cdb1f10dee36cdf4adebc5799fb108e4112065659051aed025ef4359b3509d7";
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup colonnade text yesod-core
+       ];
        homepage = "https://github.com/andrewthad/colonnade#readme";
        description = "Helper functions for using yesod with colonnade";
        license = stdenv.lib.licenses.bsd3;
@@ -196055,42 +189197,6 @@ self: {
      }) {};
 
   "yi" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
-     , data-default, directory, dlist, dynamic-state, dyre, exceptions
-     , filepath, glib, gtk, hashable, Hclip, hint, HUnit, lens, mtl
-     , old-locale, oo-prototypes, pango, parsec, pointedlist, process
-     , QuickCheck, random, safe, semigroups, split, stm, tasty
-     , tasty-hunit, tasty-quickcheck, template-haskell, text, text-icu
-     , time, transformers-base, unix, unix-compat, unordered-containers
-     , vty, word-trie, xdg-basedir, yi-language, yi-rope
-     }:
-     mkDerivation {
-       pname = "yi";
-       version = "0.12.6";
-       sha256 = "886bbac8634a251d9872fbcc47350df3e84cf881e42cb7408d1a1e92614205d8";
-       configureFlags = [ "-fpango" "-fvty" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base binary bytestring Cabal containers data-default
-         directory dlist dynamic-state dyre exceptions filepath glib gtk
-         hashable Hclip hint lens mtl old-locale oo-prototypes pango parsec
-         pointedlist process QuickCheck random safe semigroups split stm
-         template-haskell text text-icu time transformers-base unix
-         unix-compat unordered-containers vty word-trie xdg-basedir
-         yi-language yi-rope
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base directory filepath HUnit lens QuickCheck semigroups tasty
-         tasty-hunit tasty-quickcheck text yi-language yi-rope
-       ];
-       homepage = "https://yi-editor.github.io";
-       description = "The Haskell-Scriptable Editor";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi_0_13_5" = callPackage
     ({ mkDerivation, base, microlens-platform, mtl
      , optparse-applicative, yi-core, yi-frontend-pango, yi-frontend-vty
      , yi-keymap-emacs, yi-keymap-vim, yi-misc-modes, yi-mode-haskell
@@ -196111,7 +189217,6 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Yi editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-contrib" = callPackage
@@ -196220,24 +189325,6 @@ self: {
      }) {};
 
   "yi-fuzzy-open" = callPackage
-    ({ mkDerivation, base, binary, containers, data-default, directory
-     , filepath, mtl, text, transformers-base, vector, yi, yi-language
-     , yi-rope
-     }:
-     mkDerivation {
-       pname = "yi-fuzzy-open";
-       version = "0.1.0.1";
-       sha256 = "92eda3ac60f57509716f8473c840d6a46b1be52f3713b27c1a5d0aa70978b02a";
-       libraryHaskellDepends = [
-         base binary containers data-default directory filepath mtl text
-         transformers-base vector yi yi-language yi-rope
-       ];
-       homepage = "https://github.com/yi-editor/yi-fuzzy-open";
-       description = "Fuzzy open plugin for Yi";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi-fuzzy-open_0_13_5" = callPackage
     ({ mkDerivation, base, binary, containers, data-default, directory
      , filepath, mtl, text, transformers-base, vector, yi-core
      , yi-language, yi-rope
@@ -196253,7 +189340,6 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Fuzzy open plugin for yi";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-gtk" = callPackage
@@ -196352,32 +189438,6 @@ self: {
      }) {};
 
   "yi-language" = callPackage
-    ({ mkDerivation, alex, array, base, binary, containers
-     , data-default, filepath, hashable, hspec, microlens-platform
-     , oo-prototypes, pointedlist, QuickCheck, regex-base, regex-tdfa
-     , template-haskell, transformers-base, unordered-containers
-     }:
-     mkDerivation {
-       pname = "yi-language";
-       version = "0.2.1";
-       sha256 = "58153110fa9fad0c873a8376e73bb21b9ebdbb32357d23b29e1bd6d901cffacd";
-       libraryHaskellDepends = [
-         array base binary containers data-default hashable
-         microlens-platform oo-prototypes pointedlist regex-base regex-tdfa
-         template-haskell transformers-base unordered-containers
-       ];
-       libraryToolDepends = [ alex ];
-       testHaskellDepends = [
-         array base binary containers data-default filepath hashable hspec
-         microlens-platform pointedlist QuickCheck regex-base regex-tdfa
-         template-haskell transformers-base unordered-containers
-       ];
-       homepage = "https://github.com/yi-editor/yi-language";
-       description = "Collection of language-related Yi libraries";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi-language_0_13_5" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers
      , data-default, hashable, microlens-platform, oo-prototypes
      , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec
@@ -196403,7 +189463,6 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Collection of language-related Yi libraries";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-misc-modes" = callPackage
@@ -196487,26 +189546,6 @@ self: {
      }) {};
 
   "yi-rope" = callPackage
-    ({ mkDerivation, base, binary, bytestring, charsetdetect-ae
-     , data-default, deepseq, fingertree, hspec, QuickCheck
-     , quickcheck-instances, text, text-icu
-     }:
-     mkDerivation {
-       pname = "yi-rope";
-       version = "0.7.0.2";
-       sha256 = "e05df2d905460723c62dba6f5201964504bf8214b3db9db11c1378dc0f08ca9d";
-       libraryHaskellDepends = [
-         base binary bytestring charsetdetect-ae data-default deepseq
-         fingertree text text-icu
-       ];
-       testHaskellDepends = [
-         base hspec QuickCheck quickcheck-instances text
-       ];
-       description = "A rope data structure used by Yi";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi-rope_0_8" = callPackage
     ({ mkDerivation, base, binary, bytestring, charsetdetect-ae
      , data-default, deepseq, fingertree, hspec, QuickCheck
      , quickcheck-instances, text, text-icu
@@ -196524,7 +189563,6 @@ self: {
        ];
        description = "A rope data structure used by Yi";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-snippet" = callPackage
@@ -197231,8 +190269,8 @@ self: {
      }:
      mkDerivation {
        pname = "zip";
-       version = "0.1.5";
-       sha256 = "92ea1f4b28f89f77e065046095f0d7c1fedadef402ccd4f04ee09bac68556974";
+       version = "0.1.7";
+       sha256 = "8b7e4f597e926db852397bb2cbad04d05c718a222702076fbbdfcccb62679c9e";
        libraryHaskellDepends = [
          base bytestring bzlib-conduit case-insensitive cereal conduit
          conduit-extra containers digest exceptions filepath mtl path
@@ -197663,6 +190701,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "zstd" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, ghc-prim, QuickCheck
+     , test-framework, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "zstd";
+       version = "0.1.0.0";
+       sha256 = "0875840799d987cf8f8dd5e0a7686978084b3088c07123e66f6f88561f474bff";
+       libraryHaskellDepends = [ base bytestring deepseq ghc-prim ];
+       testHaskellDepends = [
+         base bytestring QuickCheck test-framework
+         test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/facebookexperimental/hs-zstd";
+       description = "Haskell bindings to the Zstandard compression algorithm";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ztail" = callPackage
     ({ mkDerivation, array, base, bytestring, filepath, hinotify
      , process, regex-posix, time, unix, unordered-containers
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0bd5f1e490d..02fca8d0d1e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5067,7 +5067,7 @@ with pkgs;
 
   haskell = callPackage ./haskell-packages.nix { };
 
-  haskellPackages = haskell.packages.ghc801.override {
+  haskellPackages = haskell.packages.ghc802.override {
     overrides = config.haskellPackageOverrides or (self: super: {});
   };
 

From 958b1008274847f6b4297204f84bb12641ca493e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 12 Feb 2017 13:29:28 +0100
Subject: [PATCH 852/899] haskell-common: drop overrides that have become
 obsolete with LTS 8.x

---
 .../haskell-modules/configuration-common.nix  | 82 ++-----------------
 1 file changed, 8 insertions(+), 74 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 81eff1d4250..31410f58e21 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -392,7 +392,6 @@ self: super: {
 
   # https://ghc.haskell.org/trac/ghc/ticket/9625
   vty = dontCheck super.vty;
-  vty_5_15 = dontCheck super.vty_5_15;
 
   # https://github.com/vincenthz/hs-crypto-pubkey/issues/20
   crypto-pubkey = dontCheck super.crypto-pubkey;
@@ -472,11 +471,6 @@ self: super: {
     preConfigure = "sed -i -e 's,time .* < 1.6,time >= 1.5,' -e 's,haddock-library >= 1.1 && < 1.3,haddock-library >= 1.1,' pandoc.cabal";
   });
 
-  # Requires bower-json >= 1.0.0.1 && < 1.1
-  purescript_0_10_5 = super.purescript_0_10_5.overrideScope (self: super: {
-    bower-json = self.bower-json_1_0_0_1;
-  });
-
   # https://github.com/tych0/xcffib/issues/37
   xcffib = dontCheck super.xcffib;
 
@@ -497,41 +491,6 @@ self: super: {
   # https://github.com/anton-k/csound-expression-dynamic/issues/1
   csound-expression-dynamic = dontHaddock super.csound-expression-dynamic;
 
-  # Packages of the diagrams ecosystem that require:
-  #   diagrams-core ==1.4.*
-  #   diagrams-lib ==1.4.*
-  #   optparse-applicative ==0.13.*
-  diagrams_1_4 = super.diagrams_1_4.overrideScope (self: super: {
-    diagrams-contrib = self.diagrams-contrib_1_4_0_1;
-    diagrams-core = self.diagrams-core_1_4;
-    diagrams-lib = self.diagrams-lib_1_4_0_1;
-    diagrams-svg = self.diagrams-svg_1_4_1;
-    optparse-applicative = self.optparse-applicative_0_13_0_0;
-  });
-  diagrams-contrib_1_4_0_1 = super.diagrams-contrib_1_4_0_1.overrideScope (self: super: {
-    diagrams-core = self.diagrams-core_1_4;
-    diagrams-lib = self.diagrams-lib_1_4_0_1;
-  });
-  diagrams-lib_1_4_0_1 = super.diagrams-lib_1_4_0_1.overrideScope (self: super: {
-    diagrams-core = self.diagrams-core_1_4;
-    optparse-applicative = self.optparse-applicative_0_13_0_0;
-  });
-  diagrams-pgf = super.diagrams-pgf.overrideScope (self: super: {
-    diagrams-core = self.diagrams-core_1_4;
-    diagrams-lib = self.diagrams-lib_1_4_0_1;
-    optparse-applicative = self.optparse-applicative_0_13_0_0;
-  });
-  diagrams-rasterific_1_4 = super.diagrams-rasterific_1_4.overrideScope (self: super: {
-    diagrams-core = self.diagrams-core_1_4;
-    diagrams-lib = self.diagrams-lib_1_4_0_1;
-    optparse-applicative = self.optparse-applicative_0_13_0_0;
-  });
-  diagrams-svg_1_4_1 = super.diagrams-svg_1_4_1.overrideScope (self: super: {
-    diagrams-core = self.diagrams-core_1_4;
-    diagrams-lib = self.diagrams-lib_1_4_0_1;
-    optparse-applicative = self.optparse-applicative_0_13_0_0;
-  });
-
   # Test suite won't compile against tasty-hunit 0.9.x.
   zlib = dontCheck super.zlib;
 
@@ -744,15 +703,14 @@ 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_5;
-    http-client-tls = self.http-client-tls_0_3_3_1;
-    http-conduit = self.http-conduit_2_2_3;
-    optparse-applicative = dontCheck self.optparse-applicative_0_13_0_0;
-    criterion = super.criterion.override { inherit (super) optparse-applicative; };
-    aeson = self.aeson_1_0_2_1;
-    hpack = self.hpack_0_15_0;
-  });
+  # stack = super.stack.overrideScope (self: super: {
+  #   http-client = self.http-client_0_5_5;
+  #   http-client-tls = self.http-client-tls_0_3_3_1;
+  #   http-conduit = self.http-conduit_2_2_3;
+  #   criterion = super.criterion.override { inherit (super) optparse-applicative; };
+  #   aeson = self.aeson_1_0_2_1;
+  #   hpack = self.hpack_0_15_0;
+  # });
 
   # The latest Hoogle needs versions not yet in LTS Haskell 7.x.
   hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_19_1; };
@@ -776,9 +734,6 @@ self: super: {
   # Needs new version.
   haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_19_1; };
 
-  # Test suite fails a QuickCheck property.
-  optparse-applicative_0_13_0_0 = dontCheck super.optparse-applicative_0_13_0_0;
-
   # https://github.com/Philonous/hs-stun/pull/1
   # Remove if a version > 0.1.0.1 ever gets released.
   stunclient = overrideCabal super.stunclient (drv: {
@@ -800,10 +755,6 @@ self: super: {
   # https://github.com/bos/math-functions/issues/25
   math-functions = dontCheck super.math-functions;
 
-  # http-api-data_0.3.x requires QuickCheck > 2.9, but overriding that version
-  # is hard because of transitive dependencies, so we just disable tests.
-  http-api-data_0_3_5 = dontCheck super.http-api-data_0_3_5;
-
   # Fix build for latest versions of servant and servant-client.
   servant_0_10 = super.servant_0_10.overrideScope (self: super: {
     http-api-data = self.http-api-data_0_3_5;
@@ -842,16 +793,9 @@ self: super: {
   # https://github.com/plow-technologies/servant-auth/issues/20
   servant-auth = dontCheck super.servant-auth;
 
-  servant-auth-server = super.servant-auth-server.overrideScope (self: super: {
-    jose = super.jose_0_5_0_2;
-  });
-
   # https://github.com/pontarius/pontarius-xmpp/issues/105
   pontarius-xmpp = dontCheck super.pontarius-xmpp;
 
-  # Use proper store-core version.
-  store_0_3 = super.store_0_3.overrideScope (self: super: { store-core = self.store-core_0_3; });
-
   # https://github.com/bmillwood/applicative-quoters/issues/6
   applicative-quoters = doJailbreak super.applicative-quoters;
 
@@ -885,21 +829,11 @@ self: super: {
   # https://github.com/josefs/STMonadTrans/issues/4
   STMonadTrans = dontCheck super.STMonadTrans;
 
-  socket_0_7_0_0 = super.socket_0_7_0_0.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_9_2; });
-
-  # requires most recent vty
-  brick = super.brick.overrideScope (self: super: { vty = self.vty_5_15; });
-
-  turtle_1_3_1 = super.turtle_1_3_1.overrideScope (self: super: {
-    optparse-applicative = self.optparse-applicative_0_13_0_0;
-  });
-
   # No upstream issue tracker
   hspec-expectations-pretty-diff = dontCheck super.hspec-expectations-pretty-diff;
 
   lentil = super.lentil.overrideScope (self: super: {
     pipes = self.pipes_4_3_2;
-    optparse-applicative = self.optparse-applicative_0_13_0_0;
     # https://github.com/roelvandijk/terminal-progress-bar/issues/14
     terminal-progress-bar = doJailbreak self.terminal-progress-bar_0_1_1;
   });

From 29a1db9a97872f7eb791aa7ffe26b2098835dc5e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 12 Feb 2017 13:48:58 +0100
Subject: [PATCH 853/899] haskell-lifted-base: jailbreak to work around
 https://github.com/basvandijk/lifted-base/issues/34

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 31410f58e21..da305345b5a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -837,4 +837,8 @@ self: super: {
     # https://github.com/roelvandijk/terminal-progress-bar/issues/14
     terminal-progress-bar = doJailbreak self.terminal-progress-bar_0_1_1;
   });
+
+  # https://github.com/basvandijk/lifted-base/issues/34
+  lifted-base = doJailbreak super.lifted-base;
+
 }

From 7b96859cab5302cab206ff1825495900cac5a814 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 12 Feb 2017 13:51:33 +0100
Subject: [PATCH 854/899] haskell-parsec: jailbreak to work around
 https://github.com/aslatter/parsec/issues/68

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index da305345b5a..5b548550bf0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -841,4 +841,7 @@ self: super: {
   # https://github.com/basvandijk/lifted-base/issues/34
   lifted-base = doJailbreak super.lifted-base;
 
+  # https://github.com/aslatter/parsec/issues/68
+  parsec = doJailbreak super.parsec;
+
 }

From 0583ffb7c275d82eb447fab91c80c80a225240c8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 12 Feb 2017 13:59:12 +0100
Subject: [PATCH 855/899] haskell-system-filepath: disable test suite to remove
 dependency on chell-quickcheck

chell-quickcheck does not support recent versions of QuickCheck and
therefore does not compile in LTS 8.x.
---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 5b548550bf0..87645b5abf0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -844,4 +844,8 @@ self: super: {
   # https://github.com/aslatter/parsec/issues/68
   parsec = doJailbreak super.parsec;
 
+  # Don't depend on chell-quickcheck, which doesn't compile due to restricting
+  # QuickCheck to versions ">=2.3 && <2.9".
+  system-filepath = dontCheck super.system-filepath;
+
 }

From 8968bff4614899fa0b851d33d72b5df8f97d2931 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 12 Feb 2017 14:08:26 +0100
Subject: [PATCH 856/899] haskell-case-insensitive: jailbreak to work around
 https://github.com/basvandijk/case-insensitive/issues/24

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 87645b5abf0..0733a2ff31b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -848,4 +848,7 @@ self: super: {
   # QuickCheck to versions ">=2.3 && <2.9".
   system-filepath = dontCheck super.system-filepath;
 
+  # https://github.com/basvandijk/case-insensitive/issues/24
+  case-insensitive = doJailbreak super.case-insensitive;
+
 }

From 30b762a9776282333628d5d708783dd11a880f5a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 12 Feb 2017 14:13:53 +0100
Subject: [PATCH 857/899] haskell-vector: disable the test suite to work around
 https://github.com/haskell/vector/issues/138

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0733a2ff31b..9c9a7379725 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -139,9 +139,9 @@ self: super: {
   # https://github.com/techtangents/ablist/issues/1
   ABList = dontCheck super.ABList;
 
-  # https://github.com/haskell/vector/issues/47
-  # https://github.com/haskell/vector/issues/138
-  vector = doJailbreak (if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector);
+  # sse2 flag due to https://github.com/haskell/vector/issues/47.
+  # dontCheck due to https://github.com/haskell/vector/issues/138
+  vector = dontCheck (if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector);
 
   # Fix Darwin build.
   halive = if pkgs.stdenv.isDarwin

From 7a6648f20ef5e0125fa2d1fa9cb45c0976f8ab20 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 12 Feb 2017 14:39:00 +0100
Subject: [PATCH 858/899] haskell-uuid{,-types}: jailbreak to work around
 https://github.com/hvr/uuid/issues/28

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9c9a7379725..5a508e9137a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -851,4 +851,8 @@ self: super: {
   # https://github.com/basvandijk/case-insensitive/issues/24
   case-insensitive = doJailbreak super.case-insensitive;
 
+  # https://github.com/hvr/uuid/issues/28
+  uuid-types = doJailbreak super.uuid-types;
+  uuid = doJailbreak super.uuid;
+
 }

From c37e51fa681f24be68629eb63a637a44119ab83c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 12 Feb 2017 15:27:40 +0100
Subject: [PATCH 859/899] haskell-stack: jailbreak to work around
 https://github.com/commercialhaskell/stack/issues/3001

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 5a508e9137a..89a248cb717 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -702,15 +702,8 @@ 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_5;
-  #   http-client-tls = self.http-client-tls_0_3_3_1;
-  #   http-conduit = self.http-conduit_2_2_3;
-  #   criterion = super.criterion.override { inherit (super) optparse-applicative; };
-  #   aeson = self.aeson_1_0_2_1;
-  #   hpack = self.hpack_0_15_0;
-  # });
+  # https://github.com/commercialhaskell/stack/issues/3001
+  stack = doJailbreak super.stack;
 
   # The latest Hoogle needs versions not yet in LTS Haskell 7.x.
   hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_19_1; };

From e60992354b27fb54ef688fef7ca0230cdf17f67c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 12 Feb 2017 15:35:08 +0100
Subject: [PATCH 860/899] haskell-hspec-contrib: disable test suite due to
 https://github.com/hspec/hspec/issues/307

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 89a248cb717..ce6e97d5cc2 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -848,4 +848,7 @@ self: super: {
   uuid-types = doJailbreak super.uuid-types;
   uuid = doJailbreak super.uuid;
 
+  # https://github.com/hspec/hspec/issues/307
+  hspec-contrib = dontCheck super.hspec-contrib;
+
 }

From 216d277095869c2013b87db81b466f41c8bee0e4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 12 Feb 2017 17:27:04 +0100
Subject: [PATCH 861/899] haskell-servant: update hash for the documentation
 download

---
 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 ce6e97d5cc2..20668d229f3 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -768,7 +768,7 @@ self: super: {
           owner = "haskell-servant";
           repo = "servant";
           rev = "v${ver}";
-          sha256 = "0fynv77m7rk79pdp535c2a2bd44csgr32zb4wqavbalr7grpxg4q";
+          sha256 = "09kjinnarf9q9l8irs46gcrai8bprq39n8pj43bmdv47hl38csa0";
         }}/doc";
         buildInputs = with pkgs.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ];
         makeFlags = "html";

From 8821b3899ec2d1dc89d3a8347c5af8173ab90c81 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 12 Feb 2017 18:04:17 +0100
Subject: [PATCH 862/899] haskell-lens: disable doctest suite to work around
 https://github.com/ekmett/lens/issues/713

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 20668d229f3..2dbcbdff4c7 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -851,4 +851,7 @@ self: super: {
   # https://github.com/hspec/hspec/issues/307
   hspec-contrib = dontCheck super.hspec-contrib;
 
+  # https://github.com/ekmett/lens/issues/713
+  lens = disableCabalFlag super.lens "test-doctests";
+
 }

From b2fcf9fec58086a97a7740921369d1bc2a83f932 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 13 Feb 2017 12:49:08 +0100
Subject: [PATCH 863/899] love_0_10: 0.10.1 -> 0.10.2

---
 pkgs/development/interpreters/love/0.10.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix
index ed5aa1e60de..04b574d4559 100644
--- a/pkgs/development/interpreters/love/0.10.nix
+++ b/pkgs/development/interpreters/love/0.10.nix
@@ -5,7 +5,7 @@
 
 let
   pname = "love";
-  version = "0.10.1";
+  version = "0.10.2";
 in
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     owner = "rude";
     repo = "love";
     rev = "${version}";
-    sha256 = "10a2kkyx7x9jkcj9xrqgmvp0b6gbapjqjx9fib9f6a0nbz0xaswj";
+    sha256 = "19yfmlcx6w8yi4ndm5lni8lrsvnn77bxw5py0dc293nzzlaqa9ym";
   };
 
   buildInputs = [

From b4cd251c54e8a07cfcb8cb46c53083f2f6c7a573 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Mon, 13 Feb 2017 11:44:22 +0000
Subject: [PATCH 864/899] Manual: document users.users.<name>.hashedPassword

---
 nixos/doc/manual/configuration/user-mgmt.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml
index 829e5b9ea84..2bd9cca5622 100644
--- a/nixos/doc/manual/configuration/user-mgmt.xml
+++ b/nixos/doc/manual/configuration/user-mgmt.xml
@@ -36,7 +36,10 @@ to set a password, which is retained across invocations of
 and /etc/group will be congruent to your NixOS configuration. For instance,
 if you remove a user from users.extraUsers and run nixos-rebuild, the user
 account will cease to exist. Also, imperative commands for managing users
-and groups, such as useradd, are no longer available.</para>
+and groups, such as useradd, are no longer available. Passwords may still be
+assigned by setting the user's <literal>hashedPassword</literal> option. A
+hashed password can be generated using <command>mkpasswd -m sha-512</command>
+after installing the <literal>mkpasswd</literal> package.</para>
 
 <para>A user ID (uid) is assigned automatically.  You can also specify
 a uid manually by adding

From b7d65f8af0fa6422b1f6fae492ed02aeca633825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Mon, 13 Feb 2017 00:53:20 +0100
Subject: [PATCH 865/899] vim.vam: fix filetype detection

According to https://github.com/MarcWeber/vim-addon-manager/blob/master/doc/vim-addon-manager-additional-documentation.txt#L1310
`filetype on` must be called after all VAM plugins are initialized.
Otherwise vim set `conf` filetype for some files containing hash tags.
---
 pkgs/misc/vim-plugins/vim-utils.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index 3ce88320ddf..d714b290a90 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -65,8 +65,8 @@ See vimHelpTags sample code below.
 
 CONTRIBUTING AND CUSTOMIZING
 ============================
-The example file pkgs/misc/vim-plugins/default.nix provides both: 
-* manually mantained plugins 
+The example file pkgs/misc/vim-plugins/default.nix provides both:
+* manually mantained plugins
 * plugins created by VAM's nix#ExportPluginsForNix implementation
 
 I highly recommend to lookup vim plugin attribute names at the [vim-pi] project
@@ -105,7 +105,7 @@ Then ":source %" it.
 
 nix#ExportPluginsForNix is provided by ./vim2nix
 
-A buffer will open containing the plugin derivation lines as well list 
+A buffer will open containing the plugin derivation lines as well list
 fitting the vimrcConfig.vam.pluginDictionaries option.
 
 Thus the most simple usage would be:
@@ -125,7 +125,7 @@ Thus the most simple usage would be:
       vimrcConfig.vam.knownPlugins = vimPlugins;
       vimrcConfig.vam.pluginDictionaries = [
           # the plugin list form ~/.vim-scripts turned into nix format added to
-          # the buffer created by the nix#ExportPluginsForNix 
+          # the buffer created by the nix#ExportPluginsForNix
       ];
     }
 
@@ -262,13 +262,14 @@ let
   in writeText "vimrc" ''
   " minimal setup, generated by NIX
   set nocompatible
-  filetype indent plugin on | syn on
 
   ${vamImpl}
   ${pathogenImpl}
   ${vundleImpl}
   ${neobundleImpl}
 
+  filetype indent plugin on | syn on
+
   ${customRC}
   '';
 

From b059f63c6e10d864c641ebcc43cbd850b62d0f58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Thu, 9 Feb 2017 14:02:00 +0100
Subject: [PATCH 866/899] pythonPackages.libasyncns: init at 0.7.1

---
 .../development/python-modules/libasyncns.nix | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/libasyncns.nix

diff --git a/pkgs/development/python-modules/libasyncns.nix b/pkgs/development/python-modules/libasyncns.nix
new file mode 100644
index 00000000000..de0d6ea610d
--- /dev/null
+++ b/pkgs/development/python-modules/libasyncns.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchurl
+, libasyncns, pkgconfig }:
+
+buildPythonPackage rec {
+  name = "libasyncns-python-${version}";
+  version = "0.7.1";
+
+  src = fetchurl {
+    url = "https://launchpad.net/libasyncns-python/trunk/${version}/+download/libasyncns-python-${version}.tar.bz2";
+    sha256 = "1q4l71b2h9q756x4pjynp6kczr2d8c1jvbdp982hf7xzv7w5gxqg";
+  };
+
+  buildInputs = [ libasyncns ];
+  nativeBuildInputs = [ pkgconfig ];
+  doCheck = false; # requires network access
+
+  meta = with stdenv.lib; {
+    description = "libasyncns-python is a python binding for the asynchronous name service query library";
+    license = licenses.lgpl21;
+    maintainers = [ maintainers.mic92 ];
+    homepage = https://launchpad.net/libasyncns-python;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 40201bc6047..92f5ccc2070 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28092,6 +28092,10 @@ EOF
     buildInputs = with self; [ pytest pkgs.glibcLocales ];
   };
 
+  libasyncns = callPackage ../development/python-modules/libasyncns.nix {
+    inherit (pkgs) libasyncns pkgconfig;
+  };
+
   pybrowserid = buildPythonPackage rec {
     name = "PyBrowserID-${version}";
     version = "0.9.2";

From 8ed1d3f8d8264aab302f5f0e6fe8cd00f801bffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Thu, 9 Feb 2017 14:02:47 +0100
Subject: [PATCH 867/899] gajim: use libasyncns as resolver

---
 .../instant-messengers/gajim/default.nix      | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index f0652bf4a1e..d78bd759ea6 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -2,7 +2,7 @@
 , ldns, pythonPackages
 
 # Test requirements
-, xvfb_run, dnsutils
+, xvfb_run
 
 , enableJingle ? true, farstream ? null, gst_plugins_bad ? null
 ,                      libnice ? null
@@ -63,9 +63,8 @@ stdenv.mkDerivation rec {
         }$GST_PLUGIN_PATH"'"
     }' scripts/gajim.in
 
-    sed -i -e 's/return helpers.is_in_path('"'"'drill.*/return True/' \
-      src/features_window.py
-    sed -i -e "s|'drill'|'${ldns}/bin/drill'|" src/common/resolver.py
+    # requires network access
+    echo "" > test/integration/test_resolver.py
 
     # We want to run tests in installCheckPhase rather than checkPhase to test
     # whether the *installed* version of Gajim works rather than just whether it
@@ -83,19 +82,20 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook pythonPackages.wrapPython intltool pkgconfig
     # Test dependencies
-    xvfb_run dnsutils
+    xvfb_run
   ];
 
   autoreconfPhase = ''
     sed -e 's/which/type -P/;s,\./configure,:,' autogen.sh | bash
   '';
 
-  propagatedBuildInputs = [
-    pythonPackages.pygobject2 pythonPackages.pyGtkGlade
-    pythonPackages.pyasn1
-    pythonPackages.pyxdg
-    pythonPackages.nbxmpp
-    pythonPackages.pyopenssl pythonPackages.dbus-python
+  propagatedBuildInputs = with pythonPackages; [
+    libasyncns
+    pygobject2 pyGtkGlade
+    pyasn1
+    pyxdg
+    nbxmpp
+    pyopenssl dbus-python
   ] ++ optional enableE2E pythonPackages.pycrypto
     ++ optional enableRST pythonPackages.docutils
     ++ optional enableNotifications pythonPackages.notify

From c71a893334ddecb0c29470e1ad3b906dfbec574b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 13 Feb 2017 14:37:30 +0100
Subject: [PATCH 868/899] Revert "Use looser 9pfs caching in VM tests/builds"

This reverts commit bbd03e236a58e9344c91861513699e070186a3c5.
---
 pkgs/os-specific/linux/kernel/patches.nix | 9 ---------
 pkgs/top-level/all-packages.nix           | 1 -
 2 files changed, 10 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 1f528f9412b..7e1ec3b9941 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -175,13 +175,4 @@ rec {
       };
     };
 
-  p9_caching_4_4 = rec
-    { name = "9p-caching.patch";
-      patch = fetchpatch {
-        inherit name;
-        url = https://github.com/edolstra/linux/commit/d522582553368b9564e2d88a8d7b1d469bf98c65.patch;
-        sha256 = "01h7461pdgavd6ghd6w9wg136hkaca0mrmmzhy6s3phksksimbc2";
-      };
-    };
-
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 02fca8d0d1e..a6bd01b2467 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11282,7 +11282,6 @@ with pkgs;
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
         kernelPatches.cpu-cgroup-v2."4.4"
-        kernelPatches.p9_caching_4_4
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu

From d5c4737c2dd87384c4e548b5e9c8dce40101997c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 12 Feb 2017 12:01:35 +0100
Subject: [PATCH 869/899] pythonPackages.aws_shell: cleanup

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b4ad21ffb5f..b3ec73f251c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1600,10 +1600,10 @@ in {
         sha256 = "1pw9lrdjl24n6lrs6lnqpyiyic8bdxgvhyqvb2rx6kkbjrfhhgv5";
         url = "mirror://pypi/a/aws-shell/aws-shell-${version}.tar.gz";
       };
+
     # Why does it propagate packages that are used for testing?
     propagatedBuildInputs = with self; [
-      configobj prompt_toolkit awscli boto3 pygments mock pytest
-      pytestcov unittest2 tox
+      awscli prompt_toolkit boto3 configobj pygments
     ];
 
     #Checks are failing due to missing TTY, which won't exist.

From 6891c9291d41058451b05a96bb5f6eded966b0f4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 12 Feb 2017 12:28:48 +0100
Subject: [PATCH 870/899] pythonPackages.unittest2: no need to depend on
 argparse

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b3ec73f251c..243fe400ce9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26328,14 +26328,17 @@ in {
     # # 1.0.0 and up create a circle dependency with traceback2/pbr
     doCheck = false;
 
-    patchPhase = ''
+    postPatch = ''
+      # argparse is needed for python < 2.7, which we do not support anymore.
+      substituteInPlace setup.py --replace "argparse"
+
       # # fixes a transient error when collecting tests, see https://bugs.launchpad.net/python-neutronclient/+bug/1508547
       sed -i '510i\        return None, False' unittest2/loader.py
       # https://github.com/pypa/packaging/pull/36
       sed -i 's/version=VERSION/version=str(VERSION)/' setup.py
     '';
 
-    propagatedBuildInputs = with self; [ six argparse traceback2 ];
+    propagatedBuildInputs = with self; [ six traceback2 ];
 
     meta = {
       description = "A backport of the new features added to the unittest testing framework";

From c2e2a4d2c5bdf4937c8a08e4e374b471fa44b0f9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 12 Feb 2017 12:32:49 +0100
Subject: [PATCH 871/899] Python: remove 2.6

---
 .../python/cpython/2.6/default.nix            | 228 ------------------
 .../python/cpython/2.6/nix-store-mtime.patch  |  12 -
 .../2.6/python2.6-fix-parallel-make.patch     |  37 ---
 .../python/cpython/2.6/search-path.patch      |  27 ---
 .../python/cpython/2.6/setup-hook.sh          |  15 --
 .../python/cpython/docs/2.6-html.nix          |  18 --
 .../python/cpython/docs/2.6-pdf-a4.nix        |  18 --
 .../python/cpython/docs/2.6-pdf-letter.nix    |  18 --
 .../python/cpython/docs/2.6-text.nix          |  18 --
 .../python/cpython/docs/default.nix           |  12 -
 pkgs/top-level/all-packages.nix               |  11 +-
 11 files changed, 1 insertion(+), 413 deletions(-)
 delete mode 100644 pkgs/development/interpreters/python/cpython/2.6/default.nix
 delete mode 100644 pkgs/development/interpreters/python/cpython/2.6/nix-store-mtime.patch
 delete mode 100644 pkgs/development/interpreters/python/cpython/2.6/python2.6-fix-parallel-make.patch
 delete mode 100644 pkgs/development/interpreters/python/cpython/2.6/search-path.patch
 delete mode 100644 pkgs/development/interpreters/python/cpython/2.6/setup-hook.sh
 delete mode 100644 pkgs/development/interpreters/python/cpython/docs/2.6-html.nix
 delete mode 100644 pkgs/development/interpreters/python/cpython/docs/2.6-pdf-a4.nix
 delete mode 100644 pkgs/development/interpreters/python/cpython/docs/2.6-pdf-letter.nix
 delete mode 100644 pkgs/development/interpreters/python/cpython/docs/2.6-text.nix

diff --git a/pkgs/development/interpreters/python/cpython/2.6/default.nix b/pkgs/development/interpreters/python/cpython/2.6/default.nix
deleted file mode 100644
index 9a4c2d5b398..00000000000
--- a/pkgs/development/interpreters/python/cpython/2.6/default.nix
+++ /dev/null
@@ -1,228 +0,0 @@
-{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false
-, sqlite, tcl, tk, xlibsWrapper, openssl, readline, db, ncurses, gdbm, self, callPackage
-# For the Python package set
-, pkgs, packageOverrides ? (self: super: {})
-}:
-
-assert zlibSupport -> zlib != null;
-
-with stdenv.lib;
-
-let
-  majorVersion = "2.6";
-  minorVersion = "9";
-  minorVersionSuffix = "";
-  pythonVersion = majorVersion;
-  version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
-  libPrefix = "python${majorVersion}";
-
-  src = fetchurl {
-    url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
-    sha256 = "0hbfs2691b60c7arbysbzr0w9528d5pl8a4x7mq5psh6a2cvprya";
-  };
-
-  patches =
-    [ # Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff.
-      ./search-path.patch
-
-      # Python recompiles a Python if the mtime stored *in* the
-      # pyc/pyo file differs from the mtime of the source file.  This
-      # doesn't work in Nix because Nix changes the mtime of files in
-      # the Nix store to 1.  So treat that as a special case.
-      ./nix-store-mtime.patch
-
-      # http://bugs.python.org/issue10013
-      ./python2.6-fix-parallel-make.patch
-    ];
-    
-  preConfigure = ''
-      # Purity.
-      for i in /usr /sw /opt /pkg; do
-        substituteInPlace ./setup.py --replace $i /no-such-path
-      done
-    '' + optionalString (stdenv ? cc && stdenv.cc.libc != null) ''
-      for i in Lib/plat-*/regen; do
-        substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/
-      done
-    '' + optionalString stdenv.isCygwin ''
-      # On Cygwin, `make install' tries to read this Makefile.
-      mkdir -p $out/lib/python${majorVersion}/config
-      touch $out/lib/python${majorVersion}/config/Makefile
-      mkdir -p $out/include/python${majorVersion}
-      touch $out/include/python${majorVersion}/pyconfig.h
-    '';
-
-  configureFlags = "--enable-shared --with-threads --enable-unicode=ucs4";
-
-  buildInputs =
-    optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++
-    [ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline xlibsWrapper tcl tk sqlite ]
-    ++ optional zlibSupport zlib;
-
-  mkPaths = paths: {
-    C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths;
-    LIBRARY_PATH = makeLibraryPath paths;
-  };
-
-  # Build the basic Python interpreter without modules that have
-  # external dependencies.
-  python = stdenv.mkDerivation {
-    name = "python${if includeModules then "" else "-minimal"}-${version}";
-    pythonVersion = majorVersion;
-
-    inherit majorVersion version src patches buildInputs preConfigure
-            configureFlags;
-
-    inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH;
-
-    NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2";
-
-    setupHook = ./setup-hook.sh;
-
-    postInstall =
-      ''
-        # needed for some packages, especially packages that backport
-        # functionality to 2.x from 3.x
-        for item in $out/lib/python${majorVersion}/test/*; do
-          if [[ "$item" != */test_support.py* ]]; then
-            rm -rf "$item"
-          fi
-        done
-        touch $out/lib/python${majorVersion}/test/__init__.py
-        ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb
-        ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion}
-        mv $out/share/man/man1/{python.1,python2.6.1}
-        ln -s $out/share/man/man1/{python2.6.1,python.1}
-
-        paxmark E $out/bin/python${majorVersion}
-
-        # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484
-        echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py
-
-        ${ optionalString includeModules "$out/bin/python ./setup.py build_ext"}
-      '';
-
-    passthru = let
-      pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
-    in rec {
-      inherit libPrefix;
-      inherit zlibSupport;
-      isPy2 = true;
-      isPy26 = true;
-      buildEnv = callPackage ../../wrapper.nix { python = self; };
-      withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
-      pkgs = pythonPackages;
-      executable = libPrefix;
-      sitePackages = "lib/${libPrefix}/site-packages";
-      interpreter = "${self}/bin/${executable}";
-    };
-
-    enableParallelBuilding = true;
-
-    meta = {
-      homepage = "http://python.org";
-      description = "A high-level dynamically-typed programming language";
-      longDescription = ''
-        Python is a remarkably powerful dynamic programming language that
-        is used in a wide variety of application domains. Some of its key
-        distinguishing features include: clear, readable syntax; strong
-        introspection capabilities; intuitive object orientation; natural
-        expression of procedural code; full modularity, supporting
-        hierarchical packages; exception-based error handling; and very
-        high level dynamic data types.
-      '';
-      license = stdenv.lib.licenses.psfl;
-      platforms = stdenv.lib.platforms.all;
-      maintainers = with stdenv.lib.maintainers; [ chaoflow domenkozar ];
-      # If you want to use Python 2.6, remove "broken = true;" at your own
-      # risk.  Python 2.6 has known security vulnerabilities is not receiving
-      # security updates as of October 2013.
-      broken = true;
-    };
-  };
-
-
-  # This function builds a Python module included in the main Python
-  # distribution in a separate derivation.
-  buildInternalPythonModule =
-    { moduleName
-    , internalName ? "_" + moduleName
-    , deps
-    }:
-    if includeModules then null else stdenv.mkDerivation rec {
-      name = "python-${moduleName}-${python.version}";
-
-      inherit src patches preConfigure configureFlags;
-
-      buildInputs = [ python ] ++ deps;
-
-      inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH;
-
-      buildPhase =
-        ''
-          substituteInPlace setup.py --replace 'self.extensions = extensions' \
-            'self.extensions = [ext for ext in self.extensions if ext.name in ["${internalName}"]]'
-
-          python ./setup.py build_ext
-          [ -z "$(find build -name '*_failed.so' -print)" ]
-        '';
-
-      installPhase =
-        ''
-          dest=$out/lib/${python.libPrefix}/site-packages
-          mkdir -p $dest
-          cp -p $(find . -name "*.${if stdenv.isCygwin then "dll" else "so"}") $dest/
-        '';
-    };
-
-
-  # The Python modules included in the main Python distribution, built
-  # as separate derivations.
-  modules = {
-
-    bsddb = buildInternalPythonModule {
-      moduleName = "bsddb";
-      deps = [ db ];
-    };
-
-    crypt = buildInternalPythonModule {
-      moduleName = "crypt";
-      internalName = "crypt";
-      deps = optional (stdenv ? glibc) stdenv.glibc;
-    };
-
-    curses = buildInternalPythonModule {
-      moduleName = "curses";
-      deps = [ ncurses ];
-    };
-
-    curses_panel = buildInternalPythonModule {
-      moduleName = "curses_panel";
-      deps = [ ncurses modules.curses ];
-    };
-
-    gdbm = buildInternalPythonModule {
-      moduleName = "gdbm";
-      internalName = "gdbm";
-      deps = [ gdbm ];
-    };
-
-    sqlite3 = buildInternalPythonModule {
-      moduleName = "sqlite3";
-      deps = [ sqlite ];
-    };
-
-    tkinter = buildInternalPythonModule {
-      moduleName = "tkinter";
-      deps = [ tcl tk xlibsWrapper ];
-    };
-
-    readline = buildInternalPythonModule {
-      moduleName = "readline";
-      internalName = "readline";
-      deps = [ readline ];
-    };
-
-  };
-
-in python // { inherit modules; }
diff --git a/pkgs/development/interpreters/python/cpython/2.6/nix-store-mtime.patch b/pkgs/development/interpreters/python/cpython/2.6/nix-store-mtime.patch
deleted file mode 100644
index 83f3fea1931..00000000000
--- a/pkgs/development/interpreters/python/cpython/2.6/nix-store-mtime.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru -x '*~' Python-2.7.1-orig/Python/import.c Python-2.7.1/Python/import.c
---- Python-2.7.1-orig/Python/import.c	2010-05-20 20:37:55.000000000 +0200
-+++ Python-2.7.1/Python/import.c	2011-01-04 15:55:11.000000000 +0100
-@@ -751,7 +751,7 @@
-         return NULL;
-     }
-     pyc_mtime = PyMarshal_ReadLongFromFile(fp);
--    if (pyc_mtime != mtime) {
-+    if (pyc_mtime != mtime && mtime != 1) {
-         if (Py_VerboseFlag)
-             PySys_WriteStderr("# %s has bad mtime\n", cpathname);
-         fclose(fp);
diff --git a/pkgs/development/interpreters/python/cpython/2.6/python2.6-fix-parallel-make.patch b/pkgs/development/interpreters/python/cpython/2.6/python2.6-fix-parallel-make.patch
deleted file mode 100644
index c43e141f9af..00000000000
--- a/pkgs/development/interpreters/python/cpython/2.6/python2.6-fix-parallel-make.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -up Python-2.7/Makefile.pre.in.fix-parallel-make Python-2.7/Makefile.pre.in
---- Python-2.7/Makefile.pre.in.fix-parallel-make	2010-07-22 15:01:39.567996932 -0400
-+++ Python-2.7/Makefile.pre.in	2010-07-22 15:47:02.437998509 -0400
-@@ -207,6 +207,7 @@ SIGNAL_OBJS=	@SIGNAL_OBJS@
- 
- ##########################################################################
- # Grammar
-+GRAMMAR_STAMP=	$(srcdir)/grammar-stamp
- GRAMMAR_H=	$(srcdir)/Include/graminit.h
- GRAMMAR_C=	$(srcdir)/Python/graminit.c
- GRAMMAR_INPUT=	$(srcdir)/Grammar/Grammar
-@@ -530,10 +531,24 @@ Modules/getpath.o: $(srcdir)/Modules/get
- Modules/python.o: $(srcdir)/Modules/python.c
- 	$(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c
- 
-+# GNU "make" interprets rules with two dependents as two copies of the rule.
-+# 
-+# In a parallel build this can lead to pgen being run twice, once for each of
-+# GRAMMAR_H and GRAMMAR_C, leading to race conditions in which the compiler
-+# reads a partially-overwritten copy of one of these files, leading to syntax
-+# errors (or linker errors if the fragment happens to be syntactically valid C)
-+#
-+# See http://www.gnu.org/software/hello/manual/automake/Multiple-Outputs.html
-+# for more information
-+#
-+# Introduce ".grammar-stamp" as a contrived single output from PGEN to avoid
-+# this:
-+$(GRAMMAR_H) $(GRAMMAR_C): $(GRAMMAR_STAMP)
- 
--$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
-+$(GRAMMAR_STAMP): $(PGEN) $(GRAMMAR_INPUT)
- 		-@$(INSTALL) -d Include
- 		-$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
-+		touch $(GRAMMAR_STAMP)
- 
- $(PGEN):	$(PGENOBJS)
- 		$(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
diff --git a/pkgs/development/interpreters/python/cpython/2.6/search-path.patch b/pkgs/development/interpreters/python/cpython/2.6/search-path.patch
deleted file mode 100644
index 2e7b7526c0c..00000000000
--- a/pkgs/development/interpreters/python/cpython/2.6/search-path.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -rc Python-2.4.4-orig/setup.py Python-2.4.4/setup.py
-*** Python-2.4.4-orig/setup.py	2006-10-08 19:41:25.000000000 +0200
---- Python-2.4.4/setup.py	2007-05-27 16:04:54.000000000 +0200
-***************
-*** 279,288 ****
-          # Check for AtheOS which has libraries in non-standard locations
-          if platform == 'atheos':
-              lib_dirs += ['/system/libs', '/atheos/autolnk/lib']
--             lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
-              inc_dirs += ['/system/include', '/atheos/autolnk/include']
--             inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
-  
-          # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
-          if platform in ['osf1', 'unixware7', 'openunix8']:
-              lib_dirs += ['/usr/ccs/lib']
---- 279,289 ----
-          # Check for AtheOS which has libraries in non-standard locations
-          if platform == 'atheos':
-              lib_dirs += ['/system/libs', '/atheos/autolnk/lib']
-              inc_dirs += ['/system/include', '/atheos/autolnk/include']
-  
-+         lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
-+         inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
-+         
-          # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
-          if platform in ['osf1', 'unixware7', 'openunix8']:
-              lib_dirs += ['/usr/ccs/lib']
diff --git a/pkgs/development/interpreters/python/cpython/2.6/setup-hook.sh b/pkgs/development/interpreters/python/cpython/2.6/setup-hook.sh
deleted file mode 100644
index 4caff9c9d84..00000000000
--- a/pkgs/development/interpreters/python/cpython/2.6/setup-hook.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-addPythonPath() {
-    addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python2.6/site-packages
-}
-
-toPythonPath() {
-    local paths="$1"
-    local result=
-    for i in $paths; do
-        p="$i/lib/python2.6/site-packages"
-        result="${result}${result:+:}$p"
-    done
-    echo $result
-}
-
-envHooks+=(addPythonPath)
diff --git a/pkgs/development/interpreters/python/cpython/docs/2.6-html.nix b/pkgs/development/interpreters/python/cpython/docs/2.6-html.nix
deleted file mode 100644
index 2b41f122fa9..00000000000
--- a/pkgs/development/interpreters/python/cpython/docs/2.6-html.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was generated and will be overwritten by ./generate.sh
-
-{ stdenv, fetchurl, lib }:
-
-stdenv.mkDerivation rec {
-  name = "python26-docs-html-2.6.8";
-  src = fetchurl {
-    url = http://docs.python.org/ftp/python/doc/2.6.8/python-2.6.8-docs-html.tar.bz2;
-    sha256 = "09kznik9ahmnrqw9gkr7mjv3b3zr258f2fm27n12hrrwwsaszkni";
-  };
-  installPhase = ''
-    mkdir -p $out/share/doc/python26
-    cp -R ./ $out/share/doc/python26/html
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.chaoflow ];
-  };
-}
diff --git a/pkgs/development/interpreters/python/cpython/docs/2.6-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/2.6-pdf-a4.nix
deleted file mode 100644
index ec031821a03..00000000000
--- a/pkgs/development/interpreters/python/cpython/docs/2.6-pdf-a4.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was generated and will be overwritten by ./generate.sh
-
-{ stdenv, fetchurl, lib }:
-
-stdenv.mkDerivation rec {
-  name = "python26-docs-pdf-a4-2.6.8";
-  src = fetchurl {
-    url = http://docs.python.org/ftp/python/doc/2.6.8/python-2.6.8-docs-pdf-a4.tar.bz2;
-    sha256 = "07k8n9zhd59s1yn8ahsizkaqnv969p0f2c2acxgxrxhhyy842pp8";
-  };
-  installPhase = ''
-    mkdir -p $out/share/doc/python26
-    cp -R ./ $out/share/doc/python26/pdf-a4
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.chaoflow ];
-  };
-}
diff --git a/pkgs/development/interpreters/python/cpython/docs/2.6-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/2.6-pdf-letter.nix
deleted file mode 100644
index 7cacf777834..00000000000
--- a/pkgs/development/interpreters/python/cpython/docs/2.6-pdf-letter.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was generated and will be overwritten by ./generate.sh
-
-{ stdenv, fetchurl, lib }:
-
-stdenv.mkDerivation rec {
-  name = "python26-docs-pdf-letter-2.6.8";
-  src = fetchurl {
-    url = http://docs.python.org/ftp/python/doc/2.6.8/python-2.6.8-docs-pdf-letter.tar.bz2;
-    sha256 = "01r87m8hb7f9ql4j9zcjcrr9150nsk23sj8cy02vygr83sc1ldmq";
-  };
-  installPhase = ''
-    mkdir -p $out/share/doc/python26
-    cp -R ./ $out/share/doc/python26/pdf-letter
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.chaoflow ];
-  };
-}
diff --git a/pkgs/development/interpreters/python/cpython/docs/2.6-text.nix b/pkgs/development/interpreters/python/cpython/docs/2.6-text.nix
deleted file mode 100644
index eb394a3f3e2..00000000000
--- a/pkgs/development/interpreters/python/cpython/docs/2.6-text.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was generated and will be overwritten by ./generate.sh
-
-{ stdenv, fetchurl, lib }:
-
-stdenv.mkDerivation rec {
-  name = "python26-docs-text-2.6.8";
-  src = fetchurl {
-    url = http://docs.python.org/ftp/python/doc/2.6.8/python-2.6.8-docs-text.tar.bz2;
-    sha256 = "05wsdh6ilgkclgak09fq7fsx5kflkmqq8dyxi2rpydx289cw3a8c";
-  };
-  installPhase = ''
-    mkdir -p $out/share/doc/python26
-    cp -R ./ $out/share/doc/python26/text
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.chaoflow ];
-  };
-}
diff --git a/pkgs/development/interpreters/python/cpython/docs/default.nix b/pkgs/development/interpreters/python/cpython/docs/default.nix
index 8f5fc810fb7..89e60f961f6 100644
--- a/pkgs/development/interpreters/python/cpython/docs/default.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/default.nix
@@ -10,9 +10,6 @@ pythonDocs = {
     python27 = import ./2.7-html.nix {
       inherit stdenv fetchurl lib;
     };
-    python26 = import ./2.6-html.nix {
-      inherit stdenv fetchurl lib;
-    };
   };
   pdf_a4 = {
     recurseForDerivations = true;
@@ -22,9 +19,6 @@ pythonDocs = {
     python27 = import ./2.7-pdf-a4.nix {
       inherit stdenv fetchurl lib;
     };
-    python26 = import ./2.6-pdf-a4.nix {
-      inherit stdenv fetchurl lib;
-    };
   };
   pdf_letter = {
     recurseForDerivations = true;
@@ -34,9 +28,6 @@ pythonDocs = {
     python27 = import ./2.7-pdf-letter.nix {
       inherit stdenv fetchurl lib;
     };
-    python26 = import ./2.6-pdf-letter.nix {
-      inherit stdenv fetchurl lib;
-    };
   };
   text = {
     recurseForDerivations = true;
@@ -46,8 +37,5 @@ pythonDocs = {
     python27 = import ./2.7-text.nix {
       inherit stdenv fetchurl lib;
     };
-    python26 = import ./2.6-text.nix {
-      inherit stdenv fetchurl lib;
-    };
   };
 }; in pythonDocs
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a6bd01b2467..59b8e4e0f75 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5845,7 +5845,6 @@ with pkgs;
   # These are for compatibility and should not be used inside Nixpkgs.
   pythonFull = python.override{x11Support=true;};
   python2Full = python2.override{x11Support=true;};
-  python26Full = python26.override{includeModules=true;self=python26Full;};
   python27Full = python27.override{x11Support=true;};
   python3Full = python3.override{x11Support=true;};
   python33Full = python33.override{x11Support=true;};
@@ -5858,10 +5857,6 @@ with pkgs;
   python2Packages = python27Packages;
   python3Packages = python35Packages;
 
-  python26 = callPackage ../development/interpreters/python/cpython/2.6 {
-    db = db4;
-    self = python26;
-  };
   python27 = callPackage ../development/interpreters/python/cpython/2.7 {
     self = python27;
     inherit (darwin) CF configd;
@@ -10165,11 +10160,7 @@ with pkgs;
 
   ### DEVELOPMENT / PYTHON MODULES
 
-  # `nix-env -i python-nose` installs for 2.7, the default python.
-  # Therefore we do not recurse into attributes here, in contrast to
-  # python27Packages. `nix-env -iA python26Packages.nose` works
-  # regardless.
-  python26Packages = python26.pkgs;
+  # Python package sets.
 
   python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs);
 

From ccf4d5e3d514eb8706b8aa89a3710c07a21b3483 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 12 Feb 2017 12:34:11 +0100
Subject: [PATCH 872/899] cudatoolkit5: remove this ancient version

---
 pkgs/development/compilers/cudatoolkit/default.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index f74815a3b95..927a1bcdf0b 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python26, python27, zlib
+{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python27, zlib
 , xorg, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc
 }:
 
@@ -85,13 +85,6 @@ let
 
 in {
 
-  cudatoolkit5 = common {
-    version = "5.5.22";
-    url = http://developer.download.nvidia.com/compute/cuda/5_5/rel/installers/cuda_5.5.22_linux_64.run;
-    sha256 = "b997e1dbe95704e0e806e0cedc5fd370a385351fef565c7bae0917baf3a29aa4";
-    python = python26;
-  };
-
   cudatoolkit6 = common {
     version = "6.0.37";
     url = http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run;

From 5d00edcf4f018d80dbed9e55e431d2054faf7078 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Feb 2017 14:45:18 +0100
Subject: [PATCH 873/899] cudatoolkit5 fixup, fixes eval

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59b8e4e0f75..7f5e8abeb4b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1309,7 +1309,6 @@ with pkgs;
   cron = callPackage ../tools/system/cron { };
 
   inherit (callPackages ../development/compilers/cudatoolkit { })
-    cudatoolkit5
     cudatoolkit6
     cudatoolkit65
     cudatoolkit7

From 0b87efacb14425f65e75c489e26b21952ece805c Mon Sep 17 00:00:00 2001
From: symphorien <symphorien@users.noreply.github.com>
Date: Mon, 13 Feb 2017 14:53:15 +0100
Subject: [PATCH 874/899] grub: add grub.useOSProber option (#22558)

---
 nixos/modules/system/boot/loader/grub/grub.nix     | 14 ++++++++++++--
 .../system/boot/loader/grub/install-grub.pl        |  9 ++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 294fc1988e9..23b970186a3 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -53,12 +53,14 @@ let
       inherit (args) devices;
       inherit (efi) canTouchEfiVariables;
       inherit (cfg)
-        version extraConfig extraPerEntryConfig extraEntries forceInstall 
+        version extraConfig extraPerEntryConfig extraEntries forceInstall useOSProber
         extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels
         default fsIdentifier efiSupport efiInstallAsRemovable gfxmodeEfi gfxmodeBios;
       path = (makeBinPath ([
         pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfs-progs
-        pkgs.utillinux ] ++ (if cfg.efiSupport && (cfg.version == 2) then [pkgs.efibootmgr ] else [])
+        pkgs.utillinux ]
+        ++ (optional (cfg.efiSupport && (cfg.version == 2)) pkgs.efibootmgr)
+        ++ (optionals cfg.useOSProber [pkgs.busybox pkgs.os-prober])
       )) + ":" + (makeSearchPathOutput "bin" "sbin" [
         pkgs.mdadm pkgs.utillinux
       ]);
@@ -265,6 +267,14 @@ in
         '';
       };
 
+      useOSProber = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          If set to true, append entries for other OSs detected by os-prober.
+        '';
+      };
+
       splashImage = mkOption {
         type = types.nullOr types.path;
         example = literalExample "./my-background.png";
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index f92b17720f6..74eb32d1fc1 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -424,10 +424,17 @@ if ($extraPrepareConfig ne "") {
   system((get("shell"), "-c", $extraPrepareConfig));
 }
 
-# Atomically update the GRUB config.
+# write the GRUB config.
 my $confFile = $grubVersion == 1 ? "$bootPath/grub/menu.lst" : "$bootPath/grub/grub.cfg";
 my $tmpFile = $confFile . ".tmp";
 writeFile($tmpFile, $conf);
+
+# Append entries detected by os-prober
+if (get("useOsprober") eq "true") {
+    system(get("shell"), "-c", "pkgdatadir=$grub/share/grub $grub/etc/grub.d/30_os-prober >> $tmpFile");
+}
+
+# Atomically switch to the new config
 rename $tmpFile, $confFile or die "cannot rename $tmpFile to $confFile\n";
 
 

From 1b02439b61f23b3c2b8f9da4c549dc28c84bab5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 13 Feb 2017 14:54:30 +0100
Subject: [PATCH 875/899] servant-server: disable testsuite

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2dbcbdff4c7..8e00386267b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -748,6 +748,9 @@ self: super: {
   # https://github.com/bos/math-functions/issues/25
   math-functions = dontCheck super.math-functions;
 
+  # broken test suite
+  servant-server = dontCheck super.servant-server;
+
   # Fix build for latest versions of servant and servant-client.
   servant_0_10 = super.servant_0_10.overrideScope (self: super: {
     http-api-data = self.http-api-data_0_3_5;

From af9f44dd575bdf6390e14b34b7a652f766b39db0 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 13 Feb 2017 14:54:30 +0100
Subject: [PATCH 876/899] grub: fix capitalisation

Missed this occurence while renaming the option
---
 nixos/modules/system/boot/loader/grub/install-grub.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 74eb32d1fc1..c9a51288747 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -430,7 +430,7 @@ my $tmpFile = $confFile . ".tmp";
 writeFile($tmpFile, $conf);
 
 # Append entries detected by os-prober
-if (get("useOsprober") eq "true") {
+if (get("useOSProber") eq "true") {
     system(get("shell"), "-c", "pkgdatadir=$grub/share/grub $grub/etc/grub.d/30_os-prober >> $tmpFile");
 }
 

From 99fdc8b65162da56c4d90f4a937f9f0cfdc89b69 Mon Sep 17 00:00:00 2001
From: georgewhewell <georgewhewell@users.noreply.github.com>
Date: Mon, 13 Feb 2017 14:03:59 +0000
Subject: [PATCH 877/899] pythonPackages.matplotlib: re-add Cocoa as buildInput
 on darwin (#22741)

---
 pkgs/development/python-modules/matplotlib/default.nix | 4 +++-
 pkgs/top-level/python-packages.nix                     | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index 9f85cb06d97..b917575e239 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -7,6 +7,7 @@
 , enableTk ? false, tcl ? null, tk ? null, tkinter ? null, libX11 ? null
 , enableQt ? false, pyqt4
 , libcxx
+, Cocoa
 }:
 
 assert enableGhostscript -> ghostscript != null;
@@ -32,7 +33,8 @@ buildPythonPackage rec {
   XDG_RUNTIME_DIR = "/tmp";
 
   buildInputs = [ python which sphinx stdenv ]
-    ++ stdenv.lib.optional enableGhostscript ghostscript;
+    ++ stdenv.lib.optional enableGhostscript ghostscript
+    ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ];
 
   propagatedBuildInputs =
     [ cycler dateutil nose numpy pyparsing tornado freetype
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 243fe400ce9..e7592ce69a2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14281,6 +14281,7 @@ in {
   matplotlib = callPackage ../development/python-modules/matplotlib/default.nix {
     stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv;
     enableGhostscript = true;
+    inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
   };
 
 

From 2e648bdacf5db569bc93a44eb7e5ae18adbbb1ec Mon Sep 17 00:00:00 2001
From: lufia <lufia@lufia.org>
Date: Mon, 13 Feb 2017 21:43:19 +0900
Subject: [PATCH 878/899] google-cloud-sdk: support x86_64-darwin

---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index dd8aada62fe..acc440b34ed 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -3,7 +3,7 @@
 with python27Packages;
 
 # other systems not supported yet
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
+assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin";
 
 stdenv.mkDerivation rec {
   name = "google-cloud-sdk-${version}";
@@ -15,6 +15,11 @@ stdenv.mkDerivation rec {
         url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz";
         sha256 = "1z2v4bg743qkdlmyyy0z2j5s0g10vbc1643gxrhyz491sk6sp616";
       }
+    else if stdenv.system == "x86_64-darwin" then
+      fetchurl {
+        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-darwin-x86_64.tar.gz";
+        sha256 = "efbe2074da5a544c09b6bf87a8ca045dc429ac38dfcd5380561987769491d5ba";
+      }
     else
       fetchurl {
         url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz";
@@ -58,6 +63,6 @@ stdenv.mkDerivation rec {
     license = licenses.free;
     homepage = "https://cloud.google.com/sdk/";
     maintainers = with maintainers; [stephenmw zimbatm];
-    platforms = platforms.linux;
+    platforms = with platforms; linux ++ darwin;
   };
 }

From 909a1dd569b214660769f75a79827d9267786fd5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 13 Feb 2017 15:24:29 +0100
Subject: [PATCH 879/899] tigervnc: 1.7.1 -> 1.8.0pre20170211

This allows to build with X.org server 1.19.1
---
 pkgs/tools/admin/tigervnc/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index 71c4ebd10a4..60d2b2bcd11 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -7,14 +7,14 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "1.7.1";
+  version = "1.8.0pre20170211";
   name = "tigervnc-${version}";
 
   src = fetchFromGitHub {
     owner = "TigerVNC";
     repo = "tigervnc";
-    sha256 = "0s2v1h24cl5ypnr35hima580xvvsh0cdqi501mvyvi7wz9cp33rj";
-    rev = "v1.7.1";
+    sha256 = "10bs6394ya953gmak8g2d3n133vyfrryq9zq6dc27g8s6lw0mrbh";
+    rev = "b6c46a1a99a402d5d17b1afafc4784ce0958d6ec";
   };
 
   inherit fontDirectories;
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   dontUseCmakeBuildDir = true;
 
   postBuild = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=int-to-pointer-cast"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=int-to-pointer-cast -Wno-error=pointer-to-int-cast"
     export CXXFLAGS="$CXXFLAGS -fpermissive"
     # Build Xvnc
     tar xf ${xorg.xorgserver.src}

From 1a55974cef94fb53f68cdcaf305405a8790af78a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 13 Feb 2017 15:47:08 +0100
Subject: [PATCH 880/899] lmdb: split outputs and add lmdb.pc

lmdb.a is removed, until someone needs it.
---
 pkgs/development/libraries/lmdb/default.nix | 24 ++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix
index a73a95000d6..6b3070a39aa 100644
--- a/pkgs/development/libraries/lmdb/default.nix
+++ b/pkgs/development/libraries/lmdb/default.nix
@@ -14,14 +14,28 @@ in stdenv.mkDerivation rec {
 
   postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb";
 
-  makeFlags = ["prefix=$(out)"]
-              ++ optional stdenv.cc.isClang "CC=clang";
+  outputs = [ "bin" "out" "dev" ];
+
+  makeFlags = [ "prefix=$(out)" "CC=cc" ];
 
   doCheck = true;
   checkPhase = "make test";
 
-  preInstall = ''
-    mkdir -p $out/{bin,lib,include}
+  postInstall = ''
+    moveToOutput bin "$bin"
+    moveToOutput "lib/*.a" REMOVE # until someone needs it
+  ''
+    # add lmdb.pc (dynamic only)
+    + ''
+    mkdir -p "$dev/lib/pkgconfig"
+    cat > "$dev/lib/pkgconfig/lmdb.pc" <<EOF
+    Name: lmdb
+    Description: ${meta.description}
+    Version: ${version}
+
+    Cflags: -I$dev/include
+    Libs: -L$out/lib -llmdb
+    EOF
   '';
 
   meta = with stdenv.lib; {
@@ -34,7 +48,7 @@ in stdenv.mkDerivation rec {
       limited to the size of the virtual address space.
     '';
     homepage = http://symas.com/mdb/;
-    maintainers = with maintainers; [ jb55 ];
+    maintainers = with maintainers; [ jb55 vcunat ];
     license = licenses.openldap;
     platforms = platforms.all;
   };

From 5b75338a50e5bf23f4175ffce28df51c54256156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 13 Feb 2017 16:37:52 +0100
Subject: [PATCH 881/899] knot-dns: use shared lmdb

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

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index cba21fbeb8e..af7d4d4c48c 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -16,15 +16,17 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    gnutls jansson liburcu libidn
+    gnutls jansson liburcu libidn lmdb
     nettle libedit
     libiconv
     # without sphinx &al. for developer documentation
   ]
     # Use embedded lmdb there for now, as detection is broken on Darwin somehow.
-    ++ stdenv.lib.optionals stdenv.isLinux [ libcap_ng systemd lmdb ]
+    ++ stdenv.lib.optionals stdenv.isLinux [ libcap_ng systemd ]
     ++ stdenv.lib.optional stdenv.isDarwin zlib; # perhaps due to gnutls
 
+  configureFlags = [ "--with-lmdb=${stdenv.lib.getLib lmdb}"/*not perfect*/ ];
+
   enableParallelBuilding = true;
 
   CFLAGS = [ "-O2" "-DNDEBUG" ];

From 935ede8a595aea3dfb875859dfa75de2d94d5094 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 13 Feb 2017 16:56:54 +0100
Subject: [PATCH 882/899] knot-resovler: use shared lmdb now

---
 pkgs/servers/dns/knot-resolver/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index b74f50beb61..10181de159f 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -23,8 +23,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig which makeWrapper hexdump ];
 
-  buildInputs = [ knot-dns luajit libuv gnutls ]
-    # TODO: lmdb needs lmdb.pc; embedded for now
+  buildInputs = [ knot-dns lmdb luajit libuv gnutls ]
     ## optional dependencies
     ++ optional doInstallCheck cmocka
     ++ optional stdenv.isLinux systemd # socket activation

From 7a0f1f44629d601ed201ae4e4441184398b14b85 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Sat, 11 Feb 2017 15:45:21 -0800
Subject: [PATCH 883/899] pytimeparse: 1.1.5 -> 1.1.6

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6ee8ad5ebd5..14aa08e182b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -331,8 +331,9 @@ in {
   pysideTools = callPackage ../development/python-modules/pyside/tools.nix { };
 
   pytimeparse = buildPythonPackage rec {
-    name = "pytimeparse-1.1.5";
-    disabled = isPy3k;
+    pname = "pytimeparse";
+    version = "1.1.6";
+    name = "${pname}-${version}";
 
     meta = {
       description = "A small Python library to parse various kinds of time expressions";
@@ -343,9 +344,9 @@ in {
 
     propagatedBuildInputs = with self; [ nose ];
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pytimeparse/${name}.tar.gz";
-      sha256 = "01xj31m5brydm4gvc6lwx26r74903wvm1jx3g05633k3mqlvvpcs";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "0imbb68i5n5fm704gv47if1blpxd4f8g16qmp5ar07cavgh2mibl";
     };
   };
 

From 5af946bd2cd1bb3285b973f31c969f776069a2c7 Mon Sep 17 00:00:00 2001
From: George Whewell <georgerw@gmail.com>
Date: Mon, 13 Feb 2017 16:36:40 +0000
Subject: [PATCH 884/899] skip failing tests on darwin

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6ee8ad5ebd5..c0908484325 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9447,8 +9447,8 @@ in {
 
     buildInputs = with self; [ nose sphinx numpydoc ];
 
-    # Failing test on Python 3.x
-    postPatch = '''' + optionalString isPy3k ''
+    # Failing test on Python 3.x and Darwin
+    postPatch = '''' + optionalString (isPy3k || stdenv.isDarwin) ''
       sed -i -e '70,84d' joblib/test/test_format_stack.py
       # test_nested_parallel_warnings: ValueError: Non-zero return code: -9.
       # Not sure why but it's nix-specific. Try removing for new joblib releases.

From 982520d771c398129ef74b542105693f0234d2c9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Feb 2017 21:16:07 +0100
Subject: [PATCH 885/899] pythonPackages.awesome-slugify: fix test runner

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6667ae2f99d..f93bc71109b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1544,6 +1544,10 @@ in {
 
     propagatedBuildInputs = with self; [ unidecode regex ];
 
+    checkPhase = ''
+      ${python.interpreter} -m unittest discover
+    '';
+
     meta = with stdenv.lib; {
       homepage = "https://github.com/dimka665/awesome-slugify";
       description = "Python flexible slugify function";

From 9298467923f129480cdd3beebcab4f08ad3229c8 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 13 Feb 2017 21:42:26 +0100
Subject: [PATCH 886/899] svtplay-dl: 1.9.1 -> 1.9.2

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

diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index eb7c89a382b..1713977d20a 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -5,13 +5,13 @@ let
   inherit (pythonPackages) python nose pycrypto requests2 mock;
 in stdenv.mkDerivation rec {
   name = "svtplay-dl-${version}";
-  version = "1.9.1";
+  version = "1.9.2";
 
   src = fetchFromGitHub {
     owner = "spaam";
     repo = "svtplay-dl";
     rev = version;
-    sha256 = "1xnafj87rp12b7mikvyi3b77vrrhnkjav9gn20fj9yi5p070vkf1";
+    sha256 = "1ajbflywfc3nfjqp95izbnxrbqjm4v56gx0am2mj0z0ypds2dvm5";
   };
 
   pythonPaths = [ pycrypto requests2 ];

From a2d2649a8fe84c00cc14df24611c9e2c907873ba Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 13 Feb 2017 21:44:59 +0100
Subject: [PATCH 887/899] perl-MooseX-Types: 0.46 -> 0.50

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f50d5dfe38d..6b3e7d99a98 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9136,13 +9136,13 @@ let self = _self // overrides; _self = with self; {
   };
 
   MooseXTypes = buildPerlPackage rec {
-    name = "MooseX-Types-0.46";
+    name = "MooseX-Types-0.50";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
-      sha256 = "e9e8c36284cf1adc6563c980c0a4f0a7df720dbaaece0dd6be66b975dde5db7a";
+      sha256 = "9cd87b3492cbf0be9d2df9317b2adf9fc30663770e69906654bea3f41b17cb08";
     };
-    buildInputs = [ ModuleBuildTiny Moose TestFatal TestRequires ];
-    propagatedBuildInputs = [ CarpClan Moose SubExporterForMethods SubName namespaceautoclean ];
+    buildInputs = [ ModuleBuildTiny TestFatal TestRequires self."if" ];
+    propagatedBuildInputs = [ CarpClan ModuleRuntime Moose SubExporter SubExporterForMethods SubInstall SubName namespaceautoclean ];
     meta = {
       homepage = https://github.com/moose/MooseX-Types;
       description = "Organise your Moose types in libraries";

From 4882e431c7523f7298bebfde5d494aceeb1529b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 13 Feb 2017 21:55:54 +0100
Subject: [PATCH 888/899] Revert "pythonPackages.unittest2: no need to depend
 on argparse"

This reverts commit 6891c9291d41058451b05a96bb5f6eded966b0f4.
Moving the mass rebuild to staging.
---
 pkgs/top-level/python-packages.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f93bc71109b..e7ee93e21fe 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26334,17 +26334,14 @@ in {
     # # 1.0.0 and up create a circle dependency with traceback2/pbr
     doCheck = false;
 
-    postPatch = ''
-      # argparse is needed for python < 2.7, which we do not support anymore.
-      substituteInPlace setup.py --replace "argparse"
-
+    patchPhase = ''
       # # fixes a transient error when collecting tests, see https://bugs.launchpad.net/python-neutronclient/+bug/1508547
       sed -i '510i\        return None, False' unittest2/loader.py
       # https://github.com/pypa/packaging/pull/36
       sed -i 's/version=VERSION/version=str(VERSION)/' setup.py
     '';
 
-    propagatedBuildInputs = with self; [ six traceback2 ];
+    propagatedBuildInputs = with self; [ six argparse traceback2 ];
 
     meta = {
       description = "A backport of the new features added to the unittest testing framework";

From 9775a26da39e72298bae1914ddec24799f80e33f Mon Sep 17 00:00:00 2001
From: Rongcui Dong <rongcuid@outlook.com>
Date: Sat, 11 Feb 2017 18:44:29 -0800
Subject: [PATCH 889/899] stlink: 1.1.0 -> 1.3.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Bjørn: Upstream moved from autotools to cmake.]
---
 .../development/tools/misc/stlink/default.nix | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix
index e52795bf5cd..de13f6709b2 100644
--- a/pkgs/development/tools/misc/stlink/default.nix
+++ b/pkgs/development/tools/misc/stlink/default.nix
@@ -1,30 +1,33 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, libusb1 }:
+{ stdenv, fetchurl, cmake, libusb1 }:
 
-# IMPORTANT: You need permissions to access the stlink usb devices. Here are
-# example udev rules for stlink v1 and v2 so you don't need to have root
-# permissions (copied from <stlink>/49-stlink*.rules):
-#
-# SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3744", MODE:="0666", SYMLINK+="stlinkv1_%n"
-# SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", MODE:="0666", SYMLINK+="stlinkv2_%n"
+# IMPORTANT: You need permissions to access the stlink usb devices. 
+# Add services.udev.pkgs = [ pkgs.stlink ] to your configuration.nix
 
 let
-  version = "1.1.0";
+  version = "1.3.0";
 in
 stdenv.mkDerivation {
   name = "stlink-${version}";
 
   src = fetchurl {
     url = "https://github.com/texane/stlink/archive/${version}.tar.gz";
-    sha256 = "0b38a32ids9dpnz5h892l279fz8y1zzqk1qsnyhl1nm03p7xzi1s";
+    sha256 = "3e8cba21744d2c38a0557f6835a05189e1b98202931bb0183d22efc462c893dd";
   };
 
-  buildInputs = [ autoconf automake libtool pkgconfig libusb1 ];
-  preConfigure = "./autogen.sh";
+  buildInputs = [ cmake libusb1 ];
+  patchPhase = ''
+    sed -i 's@/etc/udev/rules.d@$ENV{out}/etc/udev/rules.d@' CMakeLists.txt
+    sed -i 's@/etc/modprobe.d@$ENV{out}/etc/modprobe.d@' CMakeLists.txt
+  '';
+  preInstall = ''
+    mkdir -p $out/etc/udev/rules.d
+    mkdir -p $out/etc/modprobe.d
+  '';
 
   meta = with stdenv.lib; {
     description = "In-circuit debug and programming for ST-Link devices";
     license = licenses.bsd3;
     platforms = platforms.linux;
-    maintainers = [ maintainers.bjornfor ];
+    maintainers = [ maintainers.bjornfor maintainers.rongcuid ];
   };
 }

From be7a6eb70e7c305eed877850c9ebb6d50c52457e Mon Sep 17 00:00:00 2001
From: Matthias Herrmann <matthias.mh.herrmann@googlemail.com>
Date: Sun, 12 Feb 2017 20:22:35 +0100
Subject: [PATCH 890/899] sweethome3d: 5.2 -> 5.4

---
 pkgs/applications/misc/sweethome3d/default.nix | 9 ++++-----
 pkgs/applications/misc/sweethome3d/editors.nix | 1 +
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix
index 68dd69f385d..4a530a92781 100644
--- a/pkgs/applications/misc/sweethome3d/default.nix
+++ b/pkgs/applications/misc/sweethome3d/default.nix
@@ -6,9 +6,8 @@ let
   getDesktopFileName = drvName: (builtins.parseDrvName drvName).name;
 
   # TODO: Should we move this to `lib`? Seems like its would be useful in many cases.
-  extensionOf = filePath: 
-    lib.concatStringsSep "." (lib.tail (lib.splitString "." 
-      (builtins.baseNameOf filePath)));
+  extensionOf = filePath:
+    lib.concatStringsSep "." (lib.tail (lib.splitString "." (builtins.baseNameOf filePath)));
 
   installIcons = iconName: icons: lib.concatStringsSep "\n" (lib.mapAttrsToList (size: iconFile: ''
     mkdir -p "$out/share/icons/hicolor/${size}/apps"
@@ -68,14 +67,14 @@ let
 in rec {
 
   application = mkSweetHome3D rec {
-    version = "5.2";
+    version = "5.4";
     module = "SweetHome3D";
     name = stdenv.lib.toLower module + "-application-" + version;
     description = "Design and visualize your future home";
     license = stdenv.lib.licenses.gpl2Plus;
     src = fetchcvs {
       cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d";
-      sha256 = "0vws3lj5lgix5fz2hpqvz6p79py5gbfpkhmqpfb1knx1a12310bb";
+      sha256 = "09sk4svmaiw8dabcya3407iq5yjwxbss8pik1rzalrlds2428vyw";
       module = module;
       tag = "V_" + d2u version;
     };
diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix
index 61b47dcdd2a..7dbf1e8f2a3 100644
--- a/pkgs/applications/misc/sweethome3d/editors.nix
+++ b/pkgs/applications/misc/sweethome3d/editors.nix
@@ -30,6 +30,7 @@ let
 
     patchPhase = ''
       sed -i -e 's,../SweetHome3D,${application.src},g' build.xml
+      sed -i -e 's,lib/macosx/java3d-1.6/jogl-all.jar,lib/java3d-1.6/jogl-all.jar,g' build.xml
     '';
 
     buildPhase = ''

From 2ad8face66e73529bda21aac97e9a374c8d7deda Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Mon, 13 Feb 2017 22:20:49 +0100
Subject: [PATCH 891/899] wireguard: 0.0.20170115 -> 0.0.20170213 (#22759)

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

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 12c5eedcb96..8a2e6287364 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.18";
 let
   name = "wireguard-${version}";
 
-  version = "0.0.20170115";
+  version = "0.0.20170213";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "1s7zypgbwyf3mkh9any413p0awpny0dxix8d1plsrm52k539ypvy";
+    sha256 = "256a7d41cf228f2a88e1b03b3911746dc827fe7be5b982c60080e7f81998cc6d";
   };
 
   meta = with stdenv.lib; {

From 7b6a88c95e99c29e6d89ff4e34beac701c1f0681 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 13 Feb 2017 22:16:12 +0100
Subject: [PATCH 892/899] urh: init at 1.3.3

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

diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix
new file mode 100644
index 00000000000..713a36f1029
--- /dev/null
+++ b/pkgs/applications/misc/urh/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+  name = "urh-${version}";
+  version = "1.3.3";
+
+  src = fetchFromGitHub {
+    owner = "jopohl";
+    repo = "urh";
+    rev = "v${version}";
+    sha256 = "137dsxs4i0lmxwp31g8fzwpwv1i8rsiir9gxvs5cmnwsrbcrdvxh";
+  };
+
+  propagatedBuildInputs = with python3Packages; [ pyqt5 numpy psutil cython ];
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "Universal Radio Hacker: investigate wireless protocols like a boss";
+    license = licenses.asl20;
+    platform = platforms.all;
+    maintainers = with maintainers; [ fpletz ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96b56479d57..30694dc8740 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15354,6 +15354,8 @@ with pkgs;
 
   unpaper = callPackage ../tools/graphics/unpaper { };
 
+  urh = callPackage ../applications/misc/urh { };
+
   uucp = callPackage ../tools/misc/uucp { };
 
   uvccapture = callPackage ../applications/video/uvccapture { };

From 51592a3f495b032dbe53b0d97a2fe471c550e3d1 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Mon, 13 Feb 2017 22:38:36 +0100
Subject: [PATCH 893/899] ripgrep: 0.3.2 -> 0.4.0

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

diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix
index 8d7ffd3e477..7ba43e38f38 100644
--- a/pkgs/tools/text/ripgrep/default.nix
+++ b/pkgs/tools/text/ripgrep/default.nix
@@ -4,16 +4,16 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "ripgrep-${version}";
-  version = "0.3.2";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "ripgrep";
     rev = "${version}";
-    sha256 = "15j68bkkxpbh9c05f8l7j0y33da01y28kpg781lc0234h45535f3";
+    sha256 = "0y5d1n6hkw85jb3rblcxqas2fp82h3nghssa4xqrhqnz25l799pj";
   };
 
-  depsSha256 = "142h6pcf2mr4i7dg7di4299c18aqn0yvk9nr1mxnkb7wjcmrvcfg";
+  depsSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx";
 
   meta = with stdenv.lib; {
     description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep";

From 7e5424ac0913e1f890fb8227c8e4790dbf098cb0 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 13 Feb 2017 22:43:40 +0100
Subject: [PATCH 894/899] php: default to php71

---
 nixos/doc/manual/release-notes/rl-1703.xml | 4 ++++
 pkgs/top-level/all-packages.nix            | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 37173ccd744..51de93db92f 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -21,6 +21,10 @@ has the following highlights: </para>
       <literal>ati_unfree</literal> keeps forcing 1.17
       and <literal>amdgpu-pro</literal> starts forcing 1.18.</para>
   </listitem>
+
+  <listitem>
+    <para>PHP now defaults to PHP 7.1</para>
+  </listitem>
 </itemizedlist>
 
 <para>The following new services were added since the last release:</para>
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30694dc8740..33273481cd4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5792,7 +5792,7 @@ with pkgs;
 
   pachyderm = callPackage ../applications/networking/cluster/pachyderm { };
 
-  php = php70;
+  php = php71;
 
   phpPackages = php70Packages;
 

From 74041a42a929cefb9e88435b3857cc37f10166db Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 13 Feb 2017 16:02:14 -0600
Subject: [PATCH 895/899] shimbun: init at 20170203.647

---
 .../editors/emacs-modes/melpa-generated.nix   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index a47b5d69760..7a95620d727 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -60062,6 +60062,25 @@
           license = lib.licenses.free;
         };
       }) {};
+    shimbun = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "shimbun";
+        version = "20170203.647";
+        src = fetchcvs {
+          cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot";
+          module = "emacs-w3m";
+          sha256 = "ac08d29a884ac5e692a18fd47a7d3a43f1fe7464c3acb923e63da39201bf6453";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbb18b0db057b9cca78ae7280674fd1beb56443/recipes/shimbun";
+          sha256 = "05dxdyh8xvbpjmc19q733jmjd6kgv8rdahjd3bw5wwsb3smqig4x";
+          name = "shimbun";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/shimbun";
+          license = lib.licenses.free;
+        };
+      }) {};
     shm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shm";

From 549f5b7d139315e37d6cfa9cf2cb9ac356a7b749 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 13 Feb 2017 16:02:51 -0600
Subject: [PATCH 896/899] Update e-mail address for ttuegel

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 3753a6955c8..82f59e728ed 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -490,7 +490,7 @@
   travisbhartwell = "Travis B. Hartwell <nafai@travishartwell.net>";
   trino = "Hubert Mühlhans <muehlhans.hubert@ekodia.de>";
   tstrobel = "Thomas Strobel <4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains>";
-  ttuegel = "Thomas Tuegel <ttuegel@gmail.com>";
+  ttuegel = "Thomas Tuegel <ttuegel@mailbox.org>";
   tv = "Tomislav Viljetić <tv@shackspace.de>";
   tvestelind = "Tomas Vestelind <tomas.vestelind@fripost.org>";
   tvorog = "Marsel Zaripov <marszaripov@gmail.com>";

From cda4a4dcfce277b93b87be49945ed44f61483ee1 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 13 Feb 2017 23:11:40 +0100
Subject: [PATCH 897/899] nixos/grafana: Don't print password warning if no
 password has been set

---
 nixos/modules/services/monitoring/grafana.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index b9e4015c238..97806d5d83e 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ options, config, lib, pkgs, ... }:
 
 with lib;
 
@@ -232,9 +232,10 @@ in {
   };
 
   config = mkIf cfg.enable {
-    warnings = [
-      "Grafana passwords will be stored as plaintext in the Nix store!"
-    ];
+    warnings = optional (
+      cfg.database.password != options.services.grafana.database.password.default ||
+      cfg.security.adminPassword != options.services.grafana.security.adminPassword.default
+    ) "Grafana passwords will be stored as plaintext in the Nix store!";
 
     environment.systemPackages = [ cfg.package ];
 

From 2aad8590d71f433d7263c5ddb4e7540e7e308473 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Mon, 13 Feb 2017 22:53:08 +0100
Subject: [PATCH 898/899] sudo: 1.8.19p1 -> 1.8.19p2

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

diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index f2fede456d1..d360bd8b17e 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -4,14 +4,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sudo-1.8.19p1";
+  name = "sudo-1.8.19p2";
 
   src = fetchurl {
     urls =
       [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
         "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
       ];
-    sha256 = "14pwdwl03kdbbyjkvxrfx409x3c1fjqz8aqz2wgwddinhz7v3bxq";
+    sha256 = "1q2j3b1xqw66kdd5h8a6j62cz7xhk1qp1dx4rz59xm9agkk1hzi3";
   };
 
   configureFlags = [

From 486b9be579fc1f046671ddaf1157f084ba956bdd Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 13 Feb 2017 23:59:03 +0100
Subject: [PATCH 899/899] eclipse-plugin-scala: use stable download URL

Unfortunately, the latest release does not appear to be available
through a stable URL.
---
 pkgs/applications/editors/eclipse/plugins.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 68859a7ac41..76f6f4bcc48 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -388,7 +388,7 @@ rec {
     version = "4.4.1.201605041056";
 
     src = fetchzip {
-      url = "http://download.scala-ide.org/sdk/lithium/e44/scala211/stable/update-site.zip";
+      url = "http://download.scala-ide.org/sdk/lithium/e44/scala211/stable/base-20160504-1321.zip";
       sha256 = "13xgx2rwlll0l4bs0g6gyvrx5gcc0125vzn501fdj0wv2fqxn5lw";
     };