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 01/56] 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 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 02/56] 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 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 03/56] 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 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 04/56] 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 05/56] 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 ad6b79fc9760c5a79c9504b28ff342df87fb6437 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Sat, 28 Jan 2017 13:21:24 -0500
Subject: [PATCH 06/56] mosh: use ssh from nixpkgs

---
 pkgs/tools/networking/mosh/default.nix    |  8 +++++++-
 pkgs/tools/networking/mosh/ssh_path.patch | 13 +++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/networking/mosh/ssh_path.patch

diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix
index 8a4f7e2dbe6..7ef00197118 100644
--- a/pkgs/tools/networking/mosh/default.nix
+++ b/pkgs/tools/networking/mosh/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, zlib, protobuf, ncurses, pkgconfig, IOTty
-, makeWrapper, perl, openssl, autoreconfHook, fetchpatch }:
+, makeWrapper, perl, openssl, autoreconfHook, openssh }:
 
 stdenv.mkDerivation rec {
   name = "mosh-1.2.6";
@@ -11,6 +11,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ autoreconfHook protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ];
 
+  patches = [ ./ssh_path.patch ];
+  postPatch = ''
+    substituteInPlace scripts/mosh.pl \
+        --subst-var-by ssh "${openssh}/bin/ssh"
+  '';
+
   postInstall = ''
       wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB
   '';
diff --git a/pkgs/tools/networking/mosh/ssh_path.patch b/pkgs/tools/networking/mosh/ssh_path.patch
new file mode 100644
index 00000000000..cb2a650718a
--- /dev/null
+++ b/pkgs/tools/networking/mosh/ssh_path.patch
@@ -0,0 +1,13 @@
+diff --git i/scripts/mosh.pl w/scripts/mosh.pl
+index c511482..55bf5f3 100755
+--- i/scripts/mosh.pl
++++ w/scripts/mosh.pl
+@@ -66,7 +66,7 @@ my $use_remote_ip = 'proxy';
+ my $family = 'prefer-inet';
+ my $port_request = undef;
+ 
+-my @ssh = ('ssh');
++my @ssh = ('@ssh@');
+ 
+ my $term_init = 1;
+ 

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 07/56] 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 08/56] 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 09/56] 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 10/56] 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 82bcfef109ecf58ac1503e4cab15ae53dd524f4b Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@nbp.name>
Date: Sat, 14 Jan 2017 17:47:43 +0000
Subject: [PATCH 11/56] Make services.xserver.xkbDir conflict free when
 overriden.

---
 .../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, 11 insertions(+), 28 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index 7ea8b30d23d..615504bab15 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -64,10 +64,7 @@ in
 
     security.setuidPrograms = [ "e_freqset" ];
 
-    environment.etc = singleton
-      { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
-        target = "X11/xkb";
-      };
+    services.xserver.exportConfiguration = true;
 
     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 3aa4821a052..b551432bc27 100644
--- a/nixos/modules/services/x11/desktop-managers/kde4.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde4.nix
@@ -183,10 +183,7 @@ in
       GST_PLUGIN_SYSTEM_PATH = [ "/lib/gstreamer-0.10" ];
     };
 
-    environment.etc = singleton
-      { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
-        target = "X11/xkb";
-      };
+    services.xserver.exportConfiguration = true;
 
     # 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 8f081a1e9d2..ec85cf1d0bd 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -199,10 +199,7 @@ in
 
       environment.pathsToLink = [ "/share" ];
 
-      environment.etc = singleton {
-        source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
-        target = "X11/xkb";
-      };
+      services.xserver.exportConfiguration = true;
 
       environment.variables =
         {
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index f5ed5233818..8617a5fab03 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -465,23 +465,15 @@ in
         }
       ];
 
-    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";
-          }
-        ])
+    environment.etc = mkMerge [
+      (mkIf cfg.exportConfiguration {
+        "X11/xorg.conf".source = configFile;
+        "X11/xkb".source = cfg.xkbDir;
+      })
       # 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
-        [{
-          source = xorg.xf86inputevdev.out + "/share" + cfgPath;
-          target = cfgPath;
-        }]
-      );
+      (let cfgPath = "X11/xorg.conf.d/10-evdev.conf"; in
+        { "${cfgPath}".source = xorg.xf86inputevdev.out + "/share" + cfgPath; })
+    ];
 
     environment.systemPackages =
       [ xorg.xorgserver.out

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 12/56] 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 13/56] 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 14/56] 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 15/56] 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 16/56] 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 17/56] 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 18/56] 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 19/56] 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 20/56] 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 21/56] 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 22/56] 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 23/56] 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 24/56] 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 25/56] 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 26/56] 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 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 27/56] 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 28/56] 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 29/56] 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 30/56] 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 31/56] 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 32/56] 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 33/56] 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 34/56] 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 35/56] 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 36/56] 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 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 37/56] 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 38/56] 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 39/56] 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 40/56] 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 41/56] 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 42/56] 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 43/56] 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 44/56] 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 45/56] 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 46/56] 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 47/56] 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 48/56] 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 49/56] 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 50/56] 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 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 51/56] 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 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 52/56] 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 53/56] 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 54/56] 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 55/56] 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 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 56/56] 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